main #7

Merged
admin merged 620 commits from main into dev 2026-03-29 13:03:25 +00:00
Showing only changes of commit 4e3818d46a - Show all commits

View File

@@ -795,7 +795,8 @@ class PayableRule(ModelSQL, ModelView):
by_deduction = grade - self.deduction_value
if self.deduction_unit.symbol == 'g/t':
result = min(by_percent/Decimal(10000), by_deduction/Decimal(10000))
result = min(by_percent, by_deduction)
else:
result = min(by_percent, by_deduction)
if self.min_payable is not None:
result = max(result, self.min_payable)