From ee0a18a6477fb1b2b06906b3acbb4c66b6ddf75c Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Thu, 9 Feb 2012 02:48:38 +0100 Subject: [PATCH 1/3] poc keep sequence from so to invoice when invoicing from picking bzr revid: al@openerp.com-20120209014838-b6skk4g33t3gzw6c --- addons/sale_layout/sale_layout.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/addons/sale_layout/sale_layout.py b/addons/sale_layout/sale_layout.py index ef63ad596ac..a7017a78c87 100644 --- a/addons/sale_layout/sale_layout.py +++ b/addons/sale_layout/sale_layout.py @@ -161,4 +161,15 @@ class sale_order(osv.osv): sale_order() +class stock_picking(osv.osv): + _inherit = "stock.picking" + + def _prepare_invoice_line(self, cr, uid, group, picking, move_line, invoice_id, invoice_vals, context=None): + vals = super(stock_picking, self).__prepare_invoice_line(cr, uid, group, picking, move_line, invoice_id, invoice_vals, context) + + if "sequence" in self.pool.get("account.invoice.line")._all_columns and move_line.sale_line_id: + vals['sequence'] == move_line.sale_line_id.sequence + + return vals + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From c6287a3e23b509be7c33859f5b807aa8167b012e Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Thu, 9 Feb 2012 02:59:40 +0100 Subject: [PATCH 2/3] fix typos bzr revid: al@openerp.com-20120209015940-mim5twc6wknv8f88 --- addons/sale_layout/sale_layout.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/sale_layout/sale_layout.py b/addons/sale_layout/sale_layout.py index a7017a78c87..4d44429bf15 100644 --- a/addons/sale_layout/sale_layout.py +++ b/addons/sale_layout/sale_layout.py @@ -165,10 +165,10 @@ class stock_picking(osv.osv): _inherit = "stock.picking" def _prepare_invoice_line(self, cr, uid, group, picking, move_line, invoice_id, invoice_vals, context=None): - vals = super(stock_picking, self).__prepare_invoice_line(cr, uid, group, picking, move_line, invoice_id, invoice_vals, context) + vals = super(stock_picking, self)._prepare_invoice_line(cr, uid, group, picking, move_line, invoice_id, invoice_vals, context) if "sequence" in self.pool.get("account.invoice.line")._all_columns and move_line.sale_line_id: - vals['sequence'] == move_line.sale_line_id.sequence + vals['sequence'] = move_line.sale_line_id.sequence return vals From f078a29e7db139591cb5620bef2de9b679016ae7 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Wed, 15 Feb 2012 00:24:48 +0100 Subject: [PATCH 3/3] update as per qdp review bzr revid: al@openerp.com-20120214232448-54yp5vbnk1jw90dz --- addons/sale_layout/sale_layout.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/sale_layout/sale_layout.py b/addons/sale_layout/sale_layout.py index 4d44429bf15..15531e76e1d 100644 --- a/addons/sale_layout/sale_layout.py +++ b/addons/sale_layout/sale_layout.py @@ -165,9 +165,9 @@ class stock_picking(osv.osv): _inherit = "stock.picking" def _prepare_invoice_line(self, cr, uid, group, picking, move_line, invoice_id, invoice_vals, context=None): - vals = super(stock_picking, self)._prepare_invoice_line(cr, uid, group, picking, move_line, invoice_id, invoice_vals, context) + vals = super(stock_picking, self)._prepare_invoice_line(cr, uid, group, picking, move_line, invoice_id, invoice_vals, context=context) - if "sequence" in self.pool.get("account.invoice.line")._all_columns and move_line.sale_line_id: + if move_line.sale_line_id: vals['sequence'] = move_line.sale_line_id.sequence return vals