diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index 4d0e8914c3e..a04eca80871 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -111,8 +111,6 @@
             <field name="product_uom_qty">3</field>
         </record>
 
-        <workflow action="order_confirm" model="sale.order" ref="order6"/>
-
 
         <!--Resource: sale.order-->
         
@@ -195,7 +193,7 @@
             <field name="product_uom_qty">4</field>
             <field name="price_unit">500</field>
         </record>
-
+        <workflow action="order_confirm" model="sale.order" ref="order6"/>
         <!--Resource: sale.order-->
 
         <record id="order7" model="sale.order">
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index 4e23a45436e..8b64b360435 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -42,12 +42,6 @@
         <field name="implied_ids" eval="[(4, ref('analytic.group_analytic_accounting'))]"/>
     </record>
 
-    <record id="group_invoice_deli_orders" model="res.groups">
-        <field name="name">Enable Invoicing Delivery orders</field>
-        <field name="category_id" ref="base.module_category_hidden"/>
-    </record>
-
-
     <record model="res.users" id="base.user_root">
         <field eval="[(4,ref('base.group_partner_manager'))]" name="groups_id"/>
     </record>
diff --git a/addons/sale_stock/res_config.py b/addons/sale_stock/res_config.py
index c7d3d970b67..b337fe5e794 100644
--- a/addons/sale_stock/res_config.py
+++ b/addons/sale_stock/res_config.py
@@ -27,7 +27,7 @@ class sale_configuration(osv.osv_memory):
     _inherit = 'sale.config.settings'
     _columns = {
         'group_invoice_deli_orders': fields.boolean('Based on Delivery Orders',
-            implied_group='sale.group_invoice_deli_orders',
+            implied_group='group_invoice_deli_orders',
             help="To allow your salesman to make invoices for Delivery Orders using the menu 'Deliveries to Invoice'."),
         'task_work': fields.boolean('Based on Task Activities',
             help="""Lets you transfer the entries under tasks defined for Project Management to
@@ -45,7 +45,7 @@ class sale_configuration(osv.osv_memory):
         'default_picking_policy' : fields.boolean("Configurable Shipping Policy",
             help = "You will be able to configure, per sale order, if you deliver all  products at once or if you deliver each product when it is available.  This may have an impact on the shipping price."),
         'group_mrp_properties': fields.boolean('Properties on Lines',
-            implied_group='sale.group_mrp_properties',
+            implied_group='group_mrp_properties',
             help="Allows you to tag sale order lines with properties."),
         'group_multiple_shops': fields.boolean("Manage Multiple Shops",
             implied_group='stock.group_locations',
diff --git a/addons/sale_stock/sale_stock_demo.xml b/addons/sale_stock/sale_stock_demo.xml
index d336cd0c37e..9e4a1f60632 100644
--- a/addons/sale_stock/sale_stock_demo.xml
+++ b/addons/sale_stock/sale_stock_demo.xml
@@ -12,15 +12,18 @@
             <field name="order_policy">manual</field>
         </record>
       
+      <workflow action="order_confirm" model="sale.order" ref="sale.order5"/>
+      
         <record id="sale.order6" model="sale.order">
             <field name="order_policy">manual</field>
         </record>   
+        <workflow action="order_confirm" model="sale.order" ref="sale.order6"/>
+        <workflow action="manual_invoice" model="sale.order" ref="sale.order6"/>
                 
         <record id="sale.order7" model="sale.order">
             <field name="order_policy">manual</field>
         </record>
         
-        <workflow action="order_confirm" model="sale.order" ref="sale.order5"/>
         
         <record id="sale.order" model="sale.order">
             <field name="order_policy">picking</field>
diff --git a/addons/sale_stock/sale_stock_view.xml b/addons/sale_stock/sale_stock_view.xml
index 96128e40000..e15bc023462 100644
--- a/addons/sale_stock/sale_stock_view.xml
+++ b/addons/sale_stock/sale_stock_view.xml
@@ -133,13 +133,10 @@
                    <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>
-                   <xpath expr="//page[@string='Other Information']/field[@name='order_line']/group/group[@name='logistics']/field[@name='order_policy']" position="before">
+                   <xpath expr="//page[@string='Other Information']/group/group[@name='logistics']/field[@name='order_policy']" position="before">
                        <field name="incoterm" widget="selection" groups="base.group_user"/>
                        <field name="picking_policy" required="True"/>
                    </xpath>
-                   <xpath expr="//page[@string='Other Information']/field[@name='order_line']/group/group/field[@name='invoiced']" position="after">
-                       <field name="shipped"/>
-                   </xpath>
                 </data>
            </field>
         </record>
diff --git a/addons/sale_stock/security/sale_stock_security.xml b/addons/sale_stock/security/sale_stock_security.xml
index 54d04f08e11..73badf9ad0e 100644
--- a/addons/sale_stock/security/sale_stock_security.xml
+++ b/addons/sale_stock/security/sale_stock_security.xml
@@ -7,6 +7,10 @@
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
     
+    <record id="group_invoice_deli_orders" model="res.groups">
+        <field name="name">Enable Invoicing Delivery orders</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>    
     
     </data>
 </openerp>
diff --git a/addons/sale_stock/stock_view.xml b/addons/sale_stock/stock_view.xml
index 40de6872be0..6399658c392 100644
--- a/addons/sale_stock/stock_view.xml
+++ b/addons/sale_stock/stock_view.xml
@@ -77,7 +77,7 @@
             <field name="context">{'default_type': 'out', 'contact_display': 'partner_address', 'search_default_to_invoice': 1, 'search_default_done': 1, 'default_invoice_state': '2binvoiced'}</field>
             <field name="search_view_id" ref="stock.view_picking_out_search"/>
         </record>
-        <menuitem action="outgoing_picking_list_to_invoice" id="menu_action_picking_list_to_invoice" parent="base.menu_invoiced" groups="sale.group_invoice_deli_orders" sequence="20"/>
+        <menuitem action="outgoing_picking_list_to_invoice" id="menu_action_picking_list_to_invoice" parent="base.menu_invoiced" groups="group_invoice_deli_orders" sequence="20"/>
 
     </data>
 </openerp>