From 91b82d6122aa9fe20df52338c53b9adc94586296 Mon Sep 17 00:00:00 2001 From: Sergi Almacellas Abellana Date: Mon, 23 Dec 2013 21:15:55 +0100 Subject: [PATCH 1/2] Remove unused code on Invoice.copy review2421003 --- invoice.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/invoice.py b/invoice.py index 550e08e41b..55bc7e9af7 100644 --- a/invoice.py +++ b/invoice.py @@ -1037,10 +1037,6 @@ class Invoice(Workflow, ModelSQL, ModelView): @classmethod def copy(cls, invoices, default=None): - pool = Pool() - Line = pool.get('account.invoice.line') - Tax = pool.get('account.invoice.tax') - if default is None: default = {} default = default.copy() @@ -1054,7 +1050,6 @@ class Invoice(Workflow, ModelSQL, ModelView): default.setdefault('invoice_date', None) default.setdefault('accounting_date', None) default['lines_to_pay'] = None - default.setdefault('origin', None) return super(Invoice, cls).copy(invoices, default=default) @classmethod From d45007d32f50055584e24c4d9ad74b0269b85586 Mon Sep 17 00:00:00 2001 From: Sergi Almacellas Abellana Date: Mon, 23 Dec 2013 21:16:56 +0100 Subject: [PATCH 2/2] Clear origin field on copying lines review2421002 issue3565 --- invoice.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/invoice.py b/invoice.py index 55bc7e9af7..ab3d157977 100644 --- a/invoice.py +++ b/invoice.py @@ -1907,6 +1907,14 @@ class InvoiceLine(ModelSQL, ModelView): cls.raise_user_error('create', (invoice.rec_name,)) return super(InvoiceLine, cls).create(vlist) + @classmethod + def copy(cls, lines, default=None): + if default is None: + default = {} + default = default.copy() + default.setdefault('origin', None) + return super(InvoiceLine, cls).copy(lines, default=default) + @classmethod def validate(cls, lines): super(InvoiceLine, cls).validate(lines)