From c9a1e39fca2f227b6342fa0bfdc257b1a5c833b7 Mon Sep 17 00:00:00 2001 From: Elvis Date: Wed, 4 Oct 2023 17:11:41 -0500 Subject: [PATCH] changes in reports --- payroll.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/payroll.py b/payroll.py index f9835ca..2000cf1 100644 --- a/payroll.py +++ b/payroll.py @@ -1176,7 +1176,7 @@ class PayrollGlobalReport(Report): raise WageTypeConceptError( gettext('staff_payroll_co.msg_type_concept_not_exists', s=line.wage_type.name)) parties[employee_id][concept] += line.amount - parties[employee_id]['worked_days'] += Decimal(payroll.worked_days_effective) + parties[employee_id]['worked_days'] += Decimal(math.ceil(payroll.worked_days_effective)) parties[employee_id]['gross_payments'] += payroll.gross_payments parties[employee_id]['total_deductions'] += payroll.total_deductions parties[employee_id]['net_payment'] += payroll.net_payment @@ -1417,7 +1417,6 @@ class PayrollPaycheckReport(Report): res[key][w + '_code'] = '' res[key][w + '_name'] = '' res[key][w + '_rate'] = 0 - res[key]['license_amount'] = 0 res[key]['incapacity_amount'] = 0 res[key]['holidays_amount'] = 0 @@ -1469,7 +1468,8 @@ class PayrollPaycheckReport(Report): concept = line['wage_type.']['type_concept'] if concept in wage_type_default and concept != 'salary': unit_formula = line['wage_type.']['unit_price_formula'] - + if concept == 'sena': + res[key]['variation'] -= line['amount'] if unit_formula: try: unit_formula = Decimal(