From fdef50d8e541757124912727e8c6db8a1e05948e Mon Sep 17 00:00:00 2001 From: Wilson Gomez Date: Fri, 15 Sep 2023 17:17:47 -0500 Subject: [PATCH] minor fix --- liquidation.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/liquidation.py b/liquidation.py index f1c25c4..56866c5 100644 --- a/liquidation.py +++ b/liquidation.py @@ -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)