Presik
/
trytonpsk-staff_payroll_co
mirror of https://bitbucket.org/presik/trytonpsk-staff_payroll_co.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

minor fix

This commit is contained in:
Wilson Gomez 2023-09-15 17:17:47 -05:00
parent 1e4729e01d
commit fdef50d8e5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
liquidation.py
View File

@ -573,7 +573,7 @@ class Liquidation(Workflow, ModelSQL, ModelView):
moves = [p.move.id for p in payrolls]
for payroll in payrolls:
for l in payroll.lines:
if not l.wage_type.contract_finish:
if not l.wage_type.contract_finish and not l.wage_type.provision_cancellation:
continue
if self.kind == 'contract':
if l.wage_type.type_concept not in CONTRACT:
@ -714,7 +714,7 @@ class Liquidation(Workflow, ModelSQL, ModelView):
for line in self.lines:
if not line.amount:
continue
if name == 'gross_payments' and line.wage.definition == 'payment' and line.wage.definition not in ('box_family', 'retirement'):
if name == 'gross_payments' and line.wage.definition == 'payment' and line.wage.type_concept not in concept_social_security:
res.append(line.amount)
elif name == 'total_deductions' and line.wage.definition != 'payment':
res.append(line.amount)