From fe4848a93ebb587a499e19531d509e387d2c6602 Mon Sep 17 00:00:00 2001 From: Guillem Barba Date: Mon, 19 Oct 2015 10:45:33 +0200 Subject: [PATCH] Update issue16661002 patch --- issue16661002_1.diff | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/issue16661002_1.diff b/issue16661002_1.diff index c5300f5..3b6be90 100644 --- a/issue16661002_1.diff +++ b/issue16661002_1.diff @@ -1,11 +1,10 @@ -diff -r 1ff52e782b17 account.py ---- a/trytond/trytond/modules/account_invoice_stock/account.py Sun Mar 01 19:44:41 2015 +0100 -+++ b/trytond/trytond/modules/account_invoice_stock/account.py Tue Oct 06 10:01:50 2015 +0200 -@@ -33,3 +33,12 @@ - quantity += Uom.compute_qty(stock_move.uom, stock_move.quantity, +diff -r 673658d4acd2 account.py +--- a/trytond/trytond/modules/account_invoice_stock/account.py Tue Sep 22 22:57:05 2015 +0200 ++++ b/trytond/trytond/modules/account_invoice_stock/account.py Mon Oct 19 10:43:41 2015 +0200 +@@ -34,6 +34,15 @@ self.unit) return quantity -+ + + @property + def origin_quantity(self): + 'The move quantity computed in origin unit' @@ -14,14 +13,17 @@ diff -r 1ff52e782b17 account.py + if not self.origin or not hasattr(self.origin, 'unit'): + return self.quantity + return Uom.compute_qty(self.unit, self.quantity, self.origin.unit) -diff -r 1ff52e782b17 stock.py ---- a/trytond/trytond/modules/account_invoice_stock/stock.py Sun Mar 01 19:44:41 2015 +0100 -+++ b/trytond/trytond/modules/account_invoice_stock/stock.py Tue Oct 06 10:01:50 2015 +0200 -@@ -23,3 +23,12 @@ - quantity += Uom.compute_qty(invoice_line.unit, ++ + @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' @@ -30,3 +32,7 @@ diff -r 1ff52e782b17 stock.py + 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: