diff --git a/modules/purchase_trade/pricing.py b/modules/purchase_trade/pricing.py index 688b9a7..2b70a66 100755 --- a/modules/purchase_trade/pricing.py +++ b/modules/purchase_trade/pricing.py @@ -399,6 +399,7 @@ class Trigger(ModelSQL,ModelView): 'readonly': Eval('pricing_period') != None, }) average = fields.Boolean("Avg") + last = fields.Boolean("Last") application_period = fields.Many2One('pricing.period',"Application period") from_a = fields.Date("From", states={ @@ -493,7 +494,7 @@ class Trigger(ModelSQL,ModelView): pi = PI(pc.price_index) val = {} val['date'] = current_date - val['price'] = pi.get_price(current_date,pc.line.unit if pc.line else pc.sale_line.unit,pc.line.currency if pc.line else pc.sale_line.currency) + val['price'] = pi.get_price(current_date,pc.line.unit if pc.line else pc.sale_line.unit,pc.line.currency if pc.line else pc.sale_line.currency,self.last) val['avg'] = val['price'] val['avg_minus_1'] = val['price'] val['isAvg'] = self.average diff --git a/modules/purchase_trade/view/trigger_form.xml b/modules/purchase_trade/view/trigger_form.xml index 458ace9..d4e6eb9 100755 --- a/modules/purchase_trade/view/trigger_form.xml +++ b/modules/purchase_trade/view/trigger_form.xml @@ -7,6 +7,8 @@