summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorqdp-odoo <qdp@odoo.com>2015-03-02 10:19:40 +0100
committerqdp-odoo <qdp@odoo.com>2015-03-02 10:19:40 +0100
commit7c8d295a40ccf189a8d9211731a1e4171815cbc8 (patch)
tree941b37887f9edcd45fefb5ac221355c583eee3bb /addons
parent681788b89ad754b8b5c96b801ccbe66e8c552b5a (diff)
[FIX] sale: fixing a warning that may appears in sale_service as 'invoice_state' field on procurement.order is only defined in stock_account, while it was already giving a value in sale module
Diffstat (limited to 'addons')
-rw-r--r--addons/sale/sale.py1
-rw-r--r--addons/sale_stock/sale_stock.py1
2 files changed, 1 insertions, 1 deletions
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):