diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index 1e6585618b5..74bd1194ee4 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -50,7 +50,7 @@ The Dashboard for the Sales Manager will include
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    'images': ['images/deliveries_to_invoice.jpeg','images/sale_dashboard.jpeg','images/Sale_order_line_to_invoice.jpeg','images/sale_order.jpeg','images/sales_analysis.jpeg'],
+    'images': ['images/sale_dashboard.jpeg','images/Sale_order_line_to_invoice.jpeg','images/sale_order.jpeg','images/sales_analysis.jpeg'],
     'depends': ['account_voucher'],
     'data': [
         'wizard/sale_line_invoice.xml',
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 660a60f5e39..d5da6df24f3 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -276,11 +276,7 @@
                         </page>
                         <page string="Other Information" groups="base.group_user">
                             <group>
-                                <group name="logistics">
-                                    <field name="order_policy" readonly="1"/>
-                                    <field name="invoice_quantity" invisible="True"/>
-                                </group>
-                                <group groups="base.group_user">
+                                <group name="sales_person" groups="base.group_user">
                                     <field name="user_id"/>
                                     <field groups="base.group_no_one" name="origin"/>
                                 </group>
diff --git a/addons/sale_stock/__openerp__.py b/addons/sale_stock/__openerp__.py
index 1bbafae7952..bd63184f4c9 100644
--- a/addons/sale_stock/__openerp__.py
+++ b/addons/sale_stock/__openerp__.py
@@ -54,7 +54,7 @@ The Dashboard for the Sales Manager will include
 """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    'images': [],
+    'images': ['images/deliveries_to_invoice.jpeg'],
     'depends': ['sale', 'stock', 'procurement'],
     'init_xml': [],
     'update_xml': ['security/sale_stock_security.xml',
diff --git a/addons/sale_stock/process/sale_stock_process.xml b/addons/sale_stock/process/sale_stock_process.xml
index 239482eea01..666f6ba6502 100644
--- a/addons/sale_stock/process/sale_stock_process.xml
+++ b/addons/sale_stock/process/sale_stock_process.xml
@@ -8,7 +8,7 @@
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Sales Order Requisition&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Drives procurement orders for every sales order line.&quot;&quot;&quot;" name="note"/>
-            <field name="subflow_id" ref="process_process_salesprocess0"/>
+            <field name="subflow_id" ref="sale.process_process_salesprocess0"/>
             <field name="process_id" ref="procurement.process_process_procurementprocess0"/>
             <field eval="&quot;&quot;&quot;object.state in ('draft', 'waiting_date', 'manual', 'progress', 'shipping_except', 'invoice_except', 'done', 'cancel')&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
@@ -22,7 +22,7 @@
             <field eval="&quot;&quot;&quot;Procurement Order&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;One Procurement order for each sales order line and for each of the components.&quot;&quot;&quot;" name="note"/>
             <field name="subflow_id" ref="procurement.process_process_procurementprocess0"/>
-            <field name="process_id" ref="process_process_salesprocess0"/>
+            <field name="process_id" ref="sale.process_process_salesprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='confirmed'&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
         </record>
@@ -34,7 +34,7 @@
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Pick List&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Document of the move to the output or to the customer.&quot;&quot;&quot;" name="note"/>
-            <field name="process_id" ref="process_process_salesprocess0"/>
+            <field name="process_id" ref="sale.process_process_salesprocess0"/>
             <field eval="&quot;&quot;&quot;object.state in ('assigned', 'confirmed')&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
         </record>
@@ -44,7 +44,7 @@
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Delivery Order&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Document of the move to the customer.&quot;&quot;&quot;" name="note"/>
-            <field name="process_id" ref="process_process_salesprocess0"/>
+            <field name="process_id" ref="sale.process_process_salesprocess0"/>
             <field eval="&quot;&quot;&quot;object.state in ('done', 'assigned')&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
         </record>
@@ -57,7 +57,7 @@
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Invoice&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Based on the shipped or on the ordered quantities.&quot;&quot;&quot;" name="note"/>
-            <field name="process_id" ref="process_process_salesprocess0"/>
+            <field name="process_id" ref="sale.process_process_salesprocess0"/>
             <field name="subflow_id" ref="account.process_process_invoiceprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
@@ -84,7 +84,7 @@
             <field eval="&quot;&quot;&quot;Create Procurement Order&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;A procurement order is automatically created as soon as a sales order is confirmed or as the invoice is paid. It drives the purchasing and the production of products regarding to the rules and to the sales order's parameters. &quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_saleprocurement0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_saleorder0"/>
+            <field model="process.node" name="source_node_id" ref="sale.process_node_saleorder0"/>
         </record>
 
         <record id="process_transition_packing0" model="process.transition">
diff --git a/addons/sale_stock/sale_stock_view.xml b/addons/sale_stock/sale_stock_view.xml
index 1c18a1ce67e..73f247b9ba7 100644
--- a/addons/sale_stock/sale_stock_view.xml
+++ b/addons/sale_stock/sale_stock_view.xml
@@ -110,14 +110,14 @@
                    <xpath expr="//page[@string='Order Lines']/field[@name='order_line']/tree[@string='Sales Order Lines']/field[@name='th_weight']" position="after">
                        <field name="product_packaging" invisible="1"/>
                    </xpath>
-                   <field name='order_policy' position="replace">
-                       <field name="order_policy" on_change="shipping_policy_change(order_policy)"/>
-                       <field name="invoice_quantity" invisible="1"/>
-                   </field>
-                   <field name='order_policy' position="before">
-                       <field name="incoterm" widget="selection" groups="base.group_user"/>
-                       <field name="picking_policy" required="True"/>
-                   </field>
+                   <xpath expr="//group[@name='sales_person']" position="before">
+                        <group name="logistics">
+                            <field name="incoterm" widget="selection" groups="base.group_user"/>
+                            <field name="picking_policy" required="True"/>
+                            <field name="order_policy" on_change="shipping_policy_change(order_policy)"/>
+                            <field name="invoice_quantity" invisible="True"/>
+                        </group>
+                   </xpath>
                 </data>
            </field>
         </record>