22.03.26

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

modules/purchase_trade/view/trigger_form.xml

@@ -7,6 +7,8 @@
     <field name="to_p"/>
     <label name="average"/>
     <field name="average"/>
+    <label name="last"/>
+    <field name="last"/>
     <label name="application_period"/>
     <field name="application_period"/>
     <label name="from_a"/>

modules/purchase_trade/view/trigger_tree.xml

@@ -3,6 +3,7 @@
    <field name="from_p"/>
    <field name="to_p"/>
    <field name="average"/>
+   <field name="last"/>
    <field name="application_period"/>
    <field name="from_a"/>
    <field name="to_a"/>