diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index bbd34bc2fe7..5926fee5ee7 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -660,7 +660,6 @@ class sale_order(osv.osv):
             'product_uos': (line.product_uos and line.product_uos.id) or line.product_uom.id,
             'company_id': order.company_id.id,
             'group_id': group_id,
-            'invoice_state': (order.order_policy == 'picking') and '2binvoiced' or 'none',
             'sale_line_id': line.id
         }
 
diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py
index 683b2ff47db..75d36eda30f 100644
--- a/addons/sale_stock/sale_stock.py
+++ b/addons/sale_stock/sale_stock.py
@@ -79,6 +79,7 @@ class sale_order(osv.osv):
         vals['route_ids'] = routes
         vals['warehouse_id'] = order.warehouse_id and order.warehouse_id.id or False
         vals['partner_dest_id'] = order.partner_shipping_id.id
+        vals['invoice_state'] = (order.order_policy == 'picking') and '2binvoiced' or 'none'
         return vals
 
     def _prepare_invoice(self, cr, uid, order, lines, context=None):