diff --git a/addons/account_payment/payment.py b/addons/account_payment/payment.py
index 7b110f8635a..23b0b40140e 100644
--- a/addons/account_payment/payment.py
+++ b/addons/account_payment/payment.py
@@ -438,7 +438,7 @@ class payment_line(osv.osv):
         if move_line_id:
             line = self.pool.get('account.move.line').browse(cr,uid,move_line_id)
             data['amount_currency']=line.amount_to_pay
-            res = self.onchange_amount(cr, uid, ids, data['amount_currency'], currency, company_currency, 
+            #res = self.onchange_amount(cr, uid, ids, data['amount_currency'], currency, company_currency, 
             if res:
                 data['amount'] = res['value']['amount']
             data['partner_id']=line.partner_id.id
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index a5d0c6f0500..2718dbefd7d 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -677,7 +677,7 @@
             <field name="view_type">form</field>
             <field name="view_id" eval="False"/>
         </record>
-        <menuitem action="mrp_procurement_action" id="menu_mrp_procurement_action" parent="mrp.menu_mrp_root"/>
+        <menuitem action="mrp_procurement_action" id="menu_mrp_procurement_action" parent="mrp.menu_mrp_root" groups="base.group_extended" />
         
         <record id="mrp_procurement_action2" model="ir.actions.act_window">
             <field name="name">Draft procurements</field>
@@ -706,7 +706,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','exception')]</field>
         </record>
-        <menuitem action="mrp_procurement_action5" id="menu_mrp_procurement_action5" parent="mrp.menu_mrp_procurement_action"/>
+        <menuitem action="mrp_procurement_action5" id="menu_mrp_procurement_action5" parent="stock.menu_stock_root"/>
         
         <record id="mrp_procurement_action4" model="ir.actions.act_window">
             <field name="name">Exceptions procurements to fix</field>
@@ -735,7 +735,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">form,tree</field>
         </record>
-        <menuitem action="mrp_procurement_new" id="menu_mrp_procurement_new" parent="mrp.menu_mrp_procurement_action5"/>
+        <menuitem action="mrp_procurement_new" id="menu_mrp_procurement_new" parent="mrp.menu_mrp_procurement_action"/>
         
         <!-- Order Point -->
         <record id="view_warehouse_orderpoint_tree" model="ir.ui.view">
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 7de48d9370c..b427a0588cb 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -214,7 +214,7 @@ class sale_order(osv.osv):
         'partner_shipping_id':fields.many2one('res.partner.address', 'Shipping Address', readonly=True, required=True, states={'draft':[('readonly',False)]}),
 
         'incoterm': fields.selection(_incoterm_get, 'Incoterm',size=3),
-        'picking_policy': fields.selection([('direct','Partial Delivery'),('one','Complete Delivery')], 'Packing Policy', required=True ),
+        'picking_policy': fields.selection([('direct','Partial Delivery'),('one','Complete Delivery')], 'Packing Policy', required=True),
         'order_policy': fields.selection([
             ('prepaid','Payment before delivery'),
             ('manual','Shipping & Manual Invoice'),
@@ -241,7 +241,7 @@ class sale_order(osv.osv):
         'amount_untaxed': fields.function(_amount_untaxed, method=True, string='Untaxed Amount'),
         'amount_tax': fields.function(_amount_tax, method=True, string='Taxes'),
         'amount_total': fields.function(_amount_total, method=True, string='Total'),
-        'invoice_quantity': fields.selection([('order','Ordered Quantities'),('procurement','Shipped Quantities')], 'Invoice on', help="The sale order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks."),
+        'invoice_quantity': fields.selection([('order','Ordered Quantities'),('procurement','Shipped Quantities')], 'Invoice on', help="The sale order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks.",required=True),
         'payment_term' : fields.many2one('account.payment.term', 'Payment Term'),
     }
     _defaults = {
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 13523bb86ed..d4b6f973de8 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -101,7 +101,6 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Sale Order">
-
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)" required="1" select="1"/>
                             <field domain="[('partner_id','=',partner_id)]" name="partner_order_id"/>
                             <field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id"/>
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index be96302c583..7647a7b2bfb 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -1,283 +1,295 @@
 <openerp>
 <data>
-	<record model="ir.ui.view" id="view_sale_journal_invoice_type_form">
-		<field name="name">sale_journal.invoice.type.form</field>
-		<field name="model">sale_journal.invoice.type</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Invoice Type">
-				<field name="name" select="1"/>
-				<field name="active" select="1"/>
-				<field name="invoicing_method" select="1"/>
-				<newline/>
-				<field name="note" colspan="4"/>
-			</form>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="view_sale_journal_invoice_type_tree">
-		<field name="name">sale_journal.invoice.type.tree</field>
-		<field name="model">sale_journal.invoice.type</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Invoice Type">
-				<field name="name"/>
-				<field name="invoicing_method"/>
-			</tree>
-		</field>
-	</record>
-	<record model="ir.actions.act_window" id="action_definition_journal_invoice_type">
-		<field name="res_model">sale_journal.invoice.type</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-	</record>
-	
-	<menuitem name="Invoicing Methods" id="menu_definition_journal_invoice_type" parent="sale.menu_shop_configuration" action="action_definition_journal_invoice_type"/>
+    <record model="ir.ui.view" id="view_sale_journal_invoice_type_form">
+        <field name="name">sale_journal.invoice.type.form</field>
+        <field name="model">sale_journal.invoice.type</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Invoice Type">
+                <field name="name" select="1"/>
+                <field name="active" select="1"/>
+                <field name="invoicing_method" select="1"/>
+                <newline/>
+                <field name="note" colspan="4"/>
+            </form>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_sale_journal_invoice_type_tree">
+        <field name="name">sale_journal.invoice.type.tree</field>
+        <field name="model">sale_journal.invoice.type</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Invoice Type">
+                <field name="name"/>
+                <field name="invoicing_method"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_definition_journal_invoice_type">
+        <field name="res_model">sale_journal.invoice.type</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+    
+    <menuitem name="Invoicing Methods" id="menu_definition_journal_invoice_type" parent="sale.menu_shop_configuration" action="action_definition_journal_invoice_type"/>
 
-	<record model="ir.ui.view" id="view_sale_journal_form">
-		<field name="name">sale_journal.sale.journal.form</field>
-		<field name="model">sale_journal.sale.journal</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Sale Journal">
-				<notebook>
-				<page string="Journal">
-					<separator string="Journal Information" colspan="4"/>
-					<field name="name" select="1"/>
-					<field name="code" select="1"/>
-					<field name="user_id" select="1"/>
-					<field name="date" select="1"/>
-					<field name="date_created" select="1"/>
-					<field name="date_validation" select="1"/>
-					<separator string="States" colspan="4"/>
-					<field name="state"/>
-					<group col="3" colspan="2">
-						<button name="button_open" string="Open Journal" states="draft" type="object"/>
-						<button name="button_close" string="Close Journal" states="open" type="object"/>
-						<button name="button_draft" string="Set to Draft" states="close,open" type="object"/>
-					</group>
-				</page>
-				<page string="Sales">
-					<button string="Confirm Sales" name="button_sale_confirm" states="draft,open" type="object"/>
-					<button string="Cancel Sales" name="button_sale_cancel" states="draft,open" type="object"/>
-					<newline/>
-					<field name="sale_stats_ids" colspan="4" nolabel="1">
-						<tree string="Sales">
-							<field name="name"/>
-							<field name="quantity"/>
-							<field name="price_total"/>
-							<field name="price_average"/>
-							<field name="count"/>
-							<field name="state"/>
-						</tree>
-					</field>
-				</page><page string="Notes">
-					<field name="note" colspan="4" nolabel="1"/>
-				</page>
-				</notebook>
-			</form>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="view_sale_journal_tree">
-		<field name="name">sale_journal.sale.journal.tree</field>
-		<field name="model">sale_journal.sale.journal</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Sale Journal">
-				<field name="name" select="1"/>
-				<field name="code" select="1"/>
-				<field name="user_id" select="1"/>
-				<field name="date" select="1"/>
-				<field name="state"/>
-			</tree>
-		</field>
-	</record>
-	<record model="ir.actions.act_window" id="action_definition_journal">
-		<field name="res_model">sale_journal.sale.journal</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-	</record>
-	
-	<menuitem name="Sales Journals" id="menu_definition_journal" parent="sale.menu_shop_configuration" action="action_definition_journal"/>
+    <record model="ir.ui.view" id="view_sale_journal_form">
+        <field name="name">sale_journal.sale.journal.form</field>
+        <field name="model">sale_journal.sale.journal</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Sale Journal">
+                <notebook>
+                <page string="Journal">
+                    <separator string="Journal Information" colspan="4"/>
+                    <field name="name" select="1"/>
+                    <field name="code" select="1"/>
+                    <field name="user_id" select="1"/>
+                    <field name="date" select="1"/>
+                    <field name="date_created" select="1"/>
+                    <field name="date_validation" select="1"/>
+                    <separator string="States" colspan="4"/>
+                    <field name="state"/>
+                    <group col="3" colspan="2">
+                        <button name="button_open" string="Open Journal" states="draft" type="object"/>
+                        <button name="button_close" string="Close Journal" states="open" type="object"/>
+                        <button name="button_draft" string="Set to Draft" states="close,open" type="object"/>
+                    </group>
+                </page>
+                <page string="Sales">
+                    <button string="Confirm Sales" name="button_sale_confirm" states="draft,open" type="object"/>
+                    <button string="Cancel Sales" name="button_sale_cancel" states="draft,open" type="object"/>
+                    <newline/>
+                    <field name="sale_stats_ids" colspan="4" nolabel="1">
+                        <tree string="Sales">
+                            <field name="name"/>
+                            <field name="quantity"/>
+                            <field name="price_total"/>
+                            <field name="price_average"/>
+                            <field name="count"/>
+                            <field name="state"/>
+                        </tree>
+                    </field>
+                </page><page string="Notes">
+                    <field name="note" colspan="4" nolabel="1"/>
+                </page>
+                </notebook>
+            </form>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_sale_journal_tree">
+        <field name="name">sale_journal.sale.journal.tree</field>
+        <field name="model">sale_journal.sale.journal</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Sale Journal">
+                <field name="name" select="1"/>
+                <field name="code" select="1"/>
+                <field name="user_id" select="1"/>
+                <field name="date" select="1"/>
+                <field name="state"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_definition_journal">
+        <field name="res_model">sale_journal.sale.journal</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+    
+    <menuitem name="Sales Journals" id="menu_definition_journal" parent="sale.menu_shop_configuration" action="action_definition_journal"/>
 
-	<record model="ir.actions.act_window" id="action_definition_journal_tree">
-		<field name="res_model">sale_journal.sale.journal</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-		<field name="domain">[]</field>
-	</record>
-	
-	<menuitem name="Sales by Journal" id="menu_definition_journal_sales" parent="sale.menu_sale_root" action="action_definition_journal_tree"/>
+    <record model="ir.actions.act_window" id="action_definition_journal_tree">
+        <field name="res_model">sale_journal.sale.journal</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="domain">[]</field>
+    </record>
+    
+    <menuitem name="Sales by Journal" id="menu_definition_journal_sales" parent="sale.menu_sale_root" action="action_definition_journal_tree"/>
 
-	<record model="ir.actions.act_window" id="action_definition_journal_tree_my">
-		<field name="name">My open journals</field>
-		<field name="res_model">sale_journal.sale.journal</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-		<field name="domain">[('user_id','=',uid),('state','=','open')]</field>
-	</record>
-	
-	<menuitem name="My Open Journals" id="menu_definition_journal_sales_my_open" parent="menu_definition_journal_sales" action="action_definition_journal_tree_my"/>
+    <record model="ir.actions.act_window" id="action_definition_journal_tree_my">
+        <field name="name">My open journals</field>
+        <field name="res_model">sale_journal.sale.journal</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="domain">[('user_id','=',uid),('state','=','open')]</field>
+    </record>
+    
+    <menuitem name="My Open Journals" id="menu_definition_journal_sales_my_open" parent="menu_definition_journal_sales" action="action_definition_journal_tree_my"/>
 
-	<record model="ir.actions.act_window" id="action_definition_journal_tree_all">
-		<field name="name">Open journals</field>
-		<field name="res_model">sale_journal.sale.journal</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-		<field name="domain">[('state','=','open')]</field>
-	</record>
-	
-	<menuitem name="All Open Journals" id="menu_definition_journal_sales_all_open" parent="menu_definition_journal_sales" action="action_definition_journal_tree_all"/>
+    <record model="ir.actions.act_window" id="action_definition_journal_tree_all">
+        <field name="name">Open journals</field>
+        <field name="res_model">sale_journal.sale.journal</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="domain">[('state','=','open')]</field>
+    </record>
+    
+    <menuitem name="All Open Journals" id="menu_definition_journal_sales_all_open" parent="menu_definition_journal_sales" action="action_definition_journal_tree_all"/>
 
-	<record model="ir.ui.view" id="sale_journal_sale_order">
-		<field name="name">sale.order.journal.view.form</field>
-		<field name="type">form</field>
-		<field name="model">sale.order</field>
-		<field name="inherit_id" ref="sale.view_order_form" />
-		<field name="arch" type="xml">
-			<field name="client_order_ref" position="after">
-				<field name="journal_id" select="1"/>
-				<field name="invoice_type_id" select="1"/>
-			</field>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="sale_journal_sale_order_tree">
-		<field name="name">sale.order.journal.view.tree</field>
-		<field name="type">tree</field>
-		<field name="model">sale.order</field>
-		<field name="inherit_id" ref="sale.view_order_tree" />
-		<field name="arch" type="xml">
-			<field name="state" position="after">
-				<field name="journal_id"/>
-				<field name="invoice_type_id"/>
-			</field>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="sale_journal_sale_order">
+        <field name="name">sale.order.journal.view.form</field>
+        <field name="type">form</field>
+        <field name="model">sale.order</field>
+        <field name="inherit_id" ref="sale.view_order_form" />
+        <field name="arch" type="xml">
+            <field name="client_order_ref" position="after">
+                <field name="journal_id" select="1"/>
+                <field name="invoice_type_id" select="1"/>
+            </field>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="sale_journal_sale_order_tree">
+        <field name="name">sale.order.journal.view.tree</field>
+        <field name="type">tree</field>
+        <field name="model">sale.order</field>
+        <field name="inherit_id" ref="sale.view_order_tree" />
+        <field name="arch" type="xml">
+            <field name="state" position="after">
+                <field name="journal_id"/>
+                <field name="invoice_type_id"/>
+            </field>
+        </field>
+    </record>
 
-	<record model="ir.ui.view" id="sale_journal_picking_order">
-		<field name="name">stock.picking.journal.view.form</field>
-		<field name="type">form</field>
-		<field name="model">stock.picking</field>
-		<field name="inherit_id" ref="stock.view_picking_form" />
-		<field name="arch" type="xml">
-			<field name="origin" position="after">
-				<field name="invoice_type_id" select="1"/>
-				<field name="sale_journal_id" select="1"/>
-				<field name="journal_id" select="1"/>
-			</field>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="sale_journal_picking_order">
+        <field name="name">stock.picking.journal.view.form</field>
+        <field name="type">form</field>
+        <field name="model">stock.picking</field>
+        <field name="inherit_id" ref="stock.view_picking_form" />
+        <field name="arch" type="xml">
+            <field name="origin" position="after">
+                <field name="invoice_type_id" select="1"/>
+                <field name="sale_journal_id" select="1"/>
+                <field name="journal_id" select="1"/>
+            </field>
+        </field>
+    </record>
 
-	<record model="ir.ui.view" id="sale_journal_picking_order_tree">
-		<field name="name">stock.picking.journal.view.tree</field>
-		<field name="type">tree</field>
-		<field name="model">stock.picking</field>
-		<field name="inherit_id" ref="stock.vpicktree" />
-		<field name="arch" type="xml">
-			<field name="invoice_state" position="after">
-				<field name="sale_journal_id" select="1"/>
-				<field name="invoice_type_id" select="1"/>
-				<field name="journal_id" select="1"/>
-			</field>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="sale_journal_picking_order_tree">
+        <field name="name">stock.picking.journal.view.tree</field>
+        <field name="type">tree</field>
+        <field name="model">stock.picking</field>
+        <field name="inherit_id" ref="stock.vpicktree" />
+        <field name="arch" type="xml">
+            <field name="invoice_state" position="after">
+                <field name="sale_journal_id" select="1"/>
+                <field name="invoice_type_id" select="1"/>
+                <field name="journal_id" select="1"/>
+            </field>
+        </field>
+    </record>
 
-	<record model="ir.ui.view" id="view_sale_journal_sale_stats_tree">
-		<field name="name">sale_journal.sale.stats.tree</field>
-		<field name="model">sale_journal.sale.stats</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Sales by Journal">
-				<field name="name"/>
-				<field name="state"/>
-				<field name="journal_id"/>
-				<field name="quantity"/>
-				<field name="count"/>
-				<field name="price_total"/>
-				<field name="price_average"/>
-			</tree>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="view_sale_journal_sale_stats_form">
-		<field name="name">sale_journal.sale.stats.form</field>
-		<field name="model">sale_journal.sale.stats</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Sales by Journal">
-				<field name="name" select="1"/>
-				<field name="state" select="1"/>
-				<field name="journal_id" select="1"/>
-				<field name="quantity"/>
-				<field name="count"/>
-				<field name="price_total"/>
-				<field name="price_average"/>
-			</form>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="view_sale_journal_sale_stats_tree">
+        <field name="name">sale_journal.sale.stats.tree</field>
+        <field name="model">sale_journal.sale.stats</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Sales by Journal">
+                <field name="name"/>
+                <field name="state"/>
+                <field name="journal_id"/>
+                <field name="quantity"/>
+                <field name="count"/>
+                <field name="price_total"/>
+                <field name="price_average"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_sale_journal_sale_stats_form">
+        <field name="name">sale_journal.sale.stats.form</field>
+        <field name="model">sale_journal.sale.stats</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Sales by Journal">
+                <field name="name" select="1"/>
+                <field name="state" select="1"/>
+                <field name="journal_id" select="1"/>
+                <field name="quantity"/>
+                <field name="count"/>
+                <field name="price_total"/>
+                <field name="price_average"/>
+            </form>
+        </field>
+    </record>
 
-	<record model="ir.actions.act_window" id="action_sale_sale_stats_open_menu_month">
-		<field name="name">Sales by journal (this month)</field>
-		<field name="res_model">sale_journal.sale.stats</field>
-		<field name="type">ir.actions.act_window</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-		<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
-	</record>
-	
-	<menuitem name="Reporting" id="menu_definition_report_sales" parent="sale.menu_sale_root"/>
-	<menuitem name="This Month" id="menu_definition_report_sales_this_month" parent="menu_definition_report_sales"/>
-	<menuitem name="Sales by Journal" id="menu_sale_sale_stats_open_menu" parent="menu_definition_report_sales_this_month" action="action_sale_sale_stats_open_menu_month"/>
+    <record model="ir.actions.act_window" id="action_sale_sale_stats_open_menu_month">
+        <field name="name">Sales by journal (this month)</field>
+        <field name="res_model">sale_journal.sale.stats</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
+    </record>
+    
+    <menuitem name="Reporting" id="menu_definition_report_sales" parent="sale.menu_sale_root"/>
+    <menuitem name="This Month" id="menu_definition_report_sales_this_month" parent="menu_definition_report_sales"/>
+    <menuitem name="Sales by Journal" id="menu_sale_sale_stats_open_menu" parent="menu_definition_report_sales_this_month" action="action_sale_sale_stats_open_menu_month"/>
 
-	<record model="ir.actions.act_window" id="action_sale_sale_stats_open_menu_all">
-		<field name="res_model">sale_journal.sale.stats</field>
-		<field name="type">ir.actions.act_window</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-	</record>
-	
-	<menuitem name="All Months" id="menu_definition_report_sales_all_month" parent="menu_definition_report_sales"/>
-	<menuitem name="Sales by Journal" id="menu_sale_sale_stats_open_all" parent="menu_definition_report_sales_all_month" action="action_sale_sale_stats_open_menu_all"/>
+    <record model="ir.actions.act_window" id="action_sale_sale_stats_open_menu_all">
+        <field name="res_model">sale_journal.sale.stats</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+    
+    <menuitem name="All Months" id="menu_definition_report_sales_all_month" parent="menu_definition_report_sales"/>
+    <menuitem name="Sales by Journal" id="menu_sale_sale_stats_open_all" parent="menu_definition_report_sales_all_month" action="action_sale_sale_stats_open_menu_all"/>
 
-	<act_window name="Monthly sales"
-		domain="[('journal_id', '=', active_id)]"
-		res_model="sale_journal.sale.stats"
-		src_model="sale_journal.sale.journal"
-		id="act_sale_journal_sale_journal_2_sale_journal_sale_stats"/>
+    <act_window name="Monthly sales"
+        domain="[('journal_id', '=', active_id)]"
+        res_model="sale_journal.sale.stats"
+        src_model="sale_journal.sale.journal"
+        id="act_sale_journal_sale_journal_2_sale_journal_sale_stats"/>
 
-	<act_window name="Assigned packings"
-		domain="[('journal_id', '=', active_id),('state', '=', 'assigned')]"
-		res_model="stock.picking"
-		src_model="sale_journal.picking.journal"
-		id="act_sale_journal_picking_journal_2_stock_picking_assigned"/>
+    <act_window name="Assigned packings"
+        domain="[('journal_id', '=', active_id),('state', '=', 'assigned')]"
+        res_model="stock.picking"
+        src_model="sale_journal.picking.journal"
+        id="act_sale_journal_picking_journal_2_stock_picking_assigned"/>
 
-	<act_window name="Confirmed packings"
-		domain="[('journal_id', '=', active_id),('state', '=', 'confirmed')]"
-		res_model="stock.picking"
-		src_model="sale_journal.picking.journal"
-		id="act_sale_journal_picking_journal_2_stock_picking_confirmed"/>
+    <act_window name="Confirmed packings"
+        domain="[('journal_id', '=', active_id),('state', '=', 'confirmed')]"
+        res_model="stock.picking"
+        src_model="sale_journal.picking.journal"
+        id="act_sale_journal_picking_journal_2_stock_picking_confirmed"/>
 
-	<act_window name="Assigned packings"
-		domain="[('sale_journal_id', '=', active_id),('state', '=', 'assigned')]"
-		res_model="stock.picking"
-		src_model="sale_journal.sale.journal"
-		id="act_sale_journal_sale_journal_2_stock_picking_assigned"/>
+    <act_window name="Assigned packings"
+        domain="[('sale_journal_id', '=', active_id),('state', '=', 'assigned')]"
+        res_model="stock.picking"
+        src_model="sale_journal.sale.journal"
+        id="act_sale_journal_sale_journal_2_stock_picking_assigned"/>
 
-	<act_window name="Confirmed packings"
-		domain="[('sale_journal_id', '=', active_id),('state', '=', 'confirmed')]"
-		res_model="stock.picking"
-		src_model="sale_journal.sale.journal"
-		id="act_sale_journal_sale_journal_2_stock_picking_confirmed"/>
+    <act_window name="Confirmed packings"
+        domain="[('sale_journal_id', '=', active_id),('state', '=', 'confirmed')]"
+        res_model="stock.picking"
+        src_model="sale_journal.sale.journal"
+        id="act_sale_journal_sale_journal_2_stock_picking_confirmed"/>
 
-	<act_window name="Draft sales"
-		domain="[('journal_id', '=', active_id),('state', '=', 'draft')]"
-		res_model="sale.order"
-		src_model="sale_journal.sale.journal"
-		id="act_sale_journal_sale_journal_2_sale_order_draft"/>
+    <act_window name="Draft sales"
+        domain="[('journal_id', '=', active_id),('state', '=', 'draft')]"
+        res_model="sale.order"
+        src_model="sale_journal.sale.journal"
+        id="act_sale_journal_sale_journal_2_sale_order_draft"/>
 
-	<act_window name="Approved sales"
-		domain="[('journal_id', '=', active_id),('state', '=', 'approved')]"
-		res_model="sale.order"
-		src_model="sale_journal.sale.journal"
-		id="act_sale_journal_sale_journal_2_sale_order_approved"/>
+    <act_window name="Approved sales"
+        domain="[('journal_id', '=', active_id),('state', '=', 'approved')]"
+        res_model="sale.order"
+        src_model="sale_journal.sale.journal"
+        id="act_sale_journal_sale_journal_2_sale_order_approved"/>
+
+    <record id="view_partner_property_form" model="ir.ui.view">
+        <field name="name">res.partner.journal.property.form.inherit</field>
+        <field name="model">res.partner</field>
+        <field name="type">form</field>
+        <field name="inherit_id" ref="base.view_partner_form"/>
+        <field name="arch" type="xml">
+            <field name="property_product_pricelist" position="after"/>
+                <field name="property_invoice_type"/>
+            </field>
+        </field>
+    </record>
 
 
 </data>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 54f46b5899c..04ad0cf745b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -563,7 +563,7 @@
                         <page string="Notes">
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
-                        <page string="Others info">
+                        <page string="Others info" groups="base.group_extended">
                             <field name="origin" select="2"/>
                             <field name="active" select="2"/>
                             <field name="auto_picking"/>
@@ -651,7 +651,7 @@
                         <page string="Notes">
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
-                        <page string="Others info">
+                        <page string="Others info" groups="base.group_extended">
                             <field name="auto_picking"/>
                             <field name="active" select="2"/>
                             <newline/>
@@ -819,7 +819,7 @@
                         <page string="Notes">
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
-                        <page string="Others info">
+                        <page string="Others info" groups="base.group_extended">
                             <field name="active" select="2"/>
                             <field name="auto_picking"/>
                             <newline/>