diff --git a/modules/purchase_trade/purchase.py b/modules/purchase_trade/purchase.py index 57c668b..6a315a9 100755 --- a/modules/purchase_trade/purchase.py +++ b/modules/purchase_trade/purchase.py @@ -773,6 +773,13 @@ class PayableRule(ModelSQL, ModelView): deduction_value = fields.Numeric("Deduction Value") deduction_unit = fields.Many2One('assay.unit',"Unit") + payable_method = fields.Selection([ + ('percent', 'Fixed %'), + ('grade_minus', 'Grade minus deduction'), + ('min_of_both', 'Min(% of grade, grade - deduction)'), + ], "Method") + min_payable = fields.Numeric("Floor (min payable)") # ex: le "min -1" du Cu + class PenaltyRule(ModelSQL, ModelView): "Penalty Rule" __name__ = 'penalty.rule' diff --git a/modules/purchase_trade/purchase.xml b/modules/purchase_trade/purchase.xml index 2576cbd..120f673 100755 --- a/modules/purchase_trade/purchase.xml +++ b/modules/purchase_trade/purchase.xml @@ -205,6 +205,12 @@ this repository contains the full copyright notices and license terms. --> concentrate_form + + payable.rule + form + payable_rule_form + + +