diff --git a/modules/purchase_trade/purchase.py b/modules/purchase_trade/purchase.py index 50ae76b..de6debd 100755 --- a/modules/purchase_trade/purchase.py +++ b/modules/purchase_trade/purchase.py @@ -1367,6 +1367,8 @@ class Line(metaclass=PoolMeta): fields.Numeric("Tolerance min"), 'get_tolerance_min') tolerance_max = fields.Function( fields.Numeric("Tolerance max"), 'get_tolerance_max') + targeted_qt = fields.Function( + fields.Numeric("Targeted Qt", digits='unit'), 'get_targeted_qt') # certification = fields.Selection([ # (None, ''), # ('bci', 'BCI'), @@ -1574,6 +1576,9 @@ class Line(metaclass=PoolMeta): return Decimal(str(purchase.tol_max or 0)) return Decimal(str(self.tol_max or 0)) + def get_targeted_qt(self, name): + return self._tolerance_actual_quantity() + def get_progress(self,name): PS = Pool().get('purchase.pricing.summary') ps = PS.search(['line','=',self.id]) diff --git a/modules/purchase_trade/sale.py b/modules/purchase_trade/sale.py index db5ea13..cfaea61 100755 --- a/modules/purchase_trade/sale.py +++ b/modules/purchase_trade/sale.py @@ -1349,6 +1349,8 @@ class SaleLine(metaclass=PoolMeta): fields.Numeric("Tolerance min"), 'get_tolerance_min') tolerance_max = fields.Function( fields.Numeric("Tolerance max"), 'get_tolerance_max') + targeted_qt = fields.Function( + fields.Numeric("Targeted Qt", digits='unit'), 'get_targeted_qt') certif = fields.Many2One('purchase.certification',"Certification",states={'readonly': (Eval('inherit_cer')),}) # certification = fields.Selection([ # (None, ''), @@ -1564,6 +1566,9 @@ class SaleLine(metaclass=PoolMeta): return Decimal(str(sale.tol_max or 0)) return Decimal(str(self.tol_max or 0)) + def get_targeted_qt(self, name): + return self._tolerance_actual_quantity() + def get_progress(self,name): PS = Pool().get('sale.pricing.summary') ps = PS.search(['sale_line','=',self.id]) diff --git a/modules/purchase_trade/view/purchase_line_form.xml b/modules/purchase_trade/view/purchase_line_form.xml index 9a6caa5..7a4bcad 100755 --- a/modules/purchase_trade/view/purchase_line_form.xml +++ b/modules/purchase_trade/view/purchase_line_form.xml @@ -48,6 +48,8 @@ this repository contains the full copyright notices and license terms. --> +