diff --git a/issue16661002_1.diff b/issue16661002_1.diff index 3b6be90..b102fbe 100644 --- a/issue16661002_1.diff +++ b/issue16661002_1.diff @@ -17,22 +17,22 @@ diff -r 673658d4acd2 account.py @classmethod def copy(cls, lines, default=None): if default is None: -diff -r 673658d4acd2 stock.py ---- a/trytond/trytond/modules/account_invoice_stock/stock.py Tue Sep 22 22:57:05 2015 +0200 -+++ b/trytond/trytond/modules/account_invoice_stock/stock.py Mon Oct 19 10:43:41 2015 +0200 -@@ -24,6 +24,15 @@ - invoice_line.quantity, self.uom) - return quantity - -+ @property -+ def origin_quantity(self): -+ 'The move quantity computed in origin unit' -+ pool = Pool() -+ Uom = pool.get('product.uom') -+ if not self.origin or not hasattr(self.origin, 'unit'): -+ return self.quantity -+ return Uom.compute_qty(self.uom, self.quantity, self.origin.unit) -+ - @classmethod - def copy(cls, moves, default=None): - if default is None: +# diff -r 673658d4acd2 stock.py +# --- a/trytond/trytond/modules/account_invoice_stock/stock.py Tue Sep 22 22:57:05 2015 +0200 +# +++ b/trytond/trytond/modules/account_invoice_stock/stock.py Mon Oct 19 10:43:41 2015 +0200 +# @@ -24,6 +24,15 @@ +# invoice_line.quantity, self.uom) +# return quantity +# +# + @property +# + def origin_quantity(self): +# + 'The move quantity computed in origin unit' +# + pool = Pool() +# + Uom = pool.get('product.uom') +# + if not self.origin or not hasattr(self.origin, 'unit'): +# + return self.quantity +# + return Uom.compute_qty(self.uom, self.quantity, self.origin.unit) +# + +# @classmethod +# def copy(cls, moves, default=None): +# if default is None: diff --git a/series b/series index 56fa766..5070a5a 100644 --- a/series +++ b/series @@ -65,8 +65,8 @@ issue4950_sale.diff party_after_account.diff issue4986.diff issue16661002_1.diff -issue19491002_1.diff -issue20451002_1.diff +#issue19491002_1.diff +#issue20451002_1.diff issue7961002_40001.diff issue4115.diff issue5118.diff