From da9d5063499fecbee58681ce55010ecab9afc262 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Mon, 16 Jan 2012 15:16:43 +0100 Subject: [PATCH] Override values even when they are empty (a user may empty a value on a sale order or purchase order and would like the empty field to be "copied" on the invoice). bzr revid: alexis@via.ecp.fr-20120116141643-boglddgratoro59p --- addons/purchase/stock.py | 3 +-- addons/sale/stock.py | 9 +++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py index ca84d88babd..acb4ae13c05 100644 --- a/addons/purchase/stock.py +++ b/addons/purchase/stock.py @@ -72,8 +72,7 @@ class stock_picking(osv.osv): invoice_vals['address_contact_id'], invoice_vals['address_invoice_id'] = \ self.pool.get('res.partner').address_get(cr, uid, [partner.id], ['contact', 'invoice']).values() - if picking.purchase_id.fiscal_position: - invoice_vals['fiscal_position'] = picking.purchase_id.fiscal_position.id + invoice_vals['fiscal_position'] = picking.purchase_id.fiscal_position.id return invoice_vals def get_currency_id(self, cursor, user, picking): diff --git a/addons/sale/stock.py b/addons/sale/stock.py index 6daff3a83b0..f42f09eb20c 100644 --- a/addons/sale/stock.py +++ b/addons/sale/stock.py @@ -66,12 +66,9 @@ class stock_picking(osv.osv): if picking.sale_id: invoice_vals['address_contact_id'] = picking.sale_id.partner_order_id.id invoice_vals['address_invoice_id'] = picking.sale_id.partner_invoice_id.id - if picking.sale_id.fiscal_position: - invoice_vals['fiscal_position'] = picking.sale_id.fiscal_position.id - if picking.sale_id.payment_term: - invoice_vals['payment_term'] = picking.sale_id.payment_term.id - if picking.sale_id.user_id: - invoice_vals['user_id'] = picking.sale_id.user_id.id + invoice_vals['fiscal_position'] = picking.sale_id.fiscal_position.id + invoice_vals['payment_term'] = picking.sale_id.payment_term.id + invoice_vals['user_id'] = picking.sale_id.user_id.id return invoice_vals def _get_price_unit_invoice(self, cursor, user, move_line, type):