Merge branch 'master' of bitbucket.org:presik/trytonpsk-staff_payroll
This commit is contained in:
commit
3512b34f67
|
@ -424,7 +424,7 @@ class Payroll(Workflow, ModelSQL, ModelView):
|
|||
unit_value = fix_amount
|
||||
|
||||
discount = None
|
||||
if discounts.get(wage.id):
|
||||
if discounts and discounts.get(wage.id):
|
||||
discount = discounts.get(wage.id)
|
||||
qty = self.get_line_quantity_special(wage)
|
||||
if qty == 0:
|
||||
|
|
Loading…
Reference in New Issue