diff --git a/odex25_hr/exp_payroll_custom/report/bank_pdf_report.py b/odex25_hr/exp_payroll_custom/report/bank_pdf_report.py index 25e427a08..1358d3969 100644 --- a/odex25_hr/exp_payroll_custom/report/bank_pdf_report.py +++ b/odex25_hr/exp_payroll_custom/report/bank_pdf_report.py @@ -963,7 +963,7 @@ class PayslipBankReport(models.AbstractModel): 'Basic': basic, 'Housing': housing, 'Other': round(other, 2), - 'Deduction': round((payslip.total_deductions + payslip.total_loans), 2), + 'Deduction': round(-(payslip.total_deductions + payslip.total_loans), 2), 'Address': payslip.employee_id.branch_id.name if branch else payslip.employee_id.working_location.name, 'Pay Description': report_type, 'currency': payslip.employee_id.company_id.currency_id.name @@ -1355,7 +1355,7 @@ class PayslipBankReport(models.AbstractModel): 'Basic': basic, 'Housing': housing, 'Other': round(other, 2), - 'Deduction': round((payslip.total_deductions + payslip.total_loans), 2), + 'Deduction': round(-(payslip.total_deductions + payslip.total_loans), 2), 'Address': payslip.employee_id.branch_id.name if branch else payslip.employee_id.working_location.name, 'Pay Description': report_type, 'currency': payslip.employee_id.company_id.currency_id.name diff --git a/odex25_hr/exp_payroll_custom/report/payslip_monthly_report.py b/odex25_hr/exp_payroll_custom/report/payslip_monthly_report.py index cf320e165..368786dd0 100644 --- a/odex25_hr/exp_payroll_custom/report/payslip_monthly_report.py +++ b/odex25_hr/exp_payroll_custom/report/payslip_monthly_report.py @@ -38,8 +38,8 @@ class PayslipMonthlyReport(models.AbstractModel): for line in self.env['hr.salary.rule'].browse(data['rule_ids']): rule_dict.setdefault(line.category_id.rule_type, []) rule_dict[line.category_id.rule_type] += line - tdict = {'count': '#', 'emp_no': _('EMP #'), 'emp': _('Name'), } - ndict = {'count': '','emp_no':_('Nets') ,'emp':''} + tdict = {'count': '#', 'emp_no':_('EMP #'),'emp': _('Name'), } + ndict = {'count': '', 'emp_no': _('Nets'),'emp':'' } for key, value in rule_dict.items(): for x in value: tdict[x.id], ndict[x.id] = x.name, 0 @@ -100,15 +100,15 @@ class PayslipMonthlyReport(models.AbstractModel): count = 0 ftotal = 0 inner_doc = {'rule': rule.name, 'lines': [], } - inner_doc['lines'].append({'count': '#', 'emp_no': _('EMP #'), 'emp': _('Employee'), 'amount': _('Amount')}) + inner_doc['lines'].append({'count': '#', 'emp_no': _('EMP #'), 'emp': _('Employee'), 'amount': _('Amount'), }) for emp in set(payslip_line.browse(data['payslip_line_ids']).filtered( lambda r: r.salary_rule_id.id == rule.id).mapped('employee_id')): count += 1 total = sum(payslip_line.browse(data['payslip_line_ids']).filtered( lambda r: r.employee_id.id == emp.id and r.salary_rule_id.id == rule.id).mapped('amount')) ftotal += total - inner_doc['lines'].append({'count': count, 'emp_no': emp.emp_no, 'emp': emp.name, 'amount': total}) - inner_doc['lines'].append({'count': '', 'emp_no': _('Total'),'emp':'', 'amount': ftotal}) + inner_doc['lines'].append({'count': count, 'emp_no': emp.emp_no, 'emp': emp.name, 'amount': total, }) + inner_doc['lines'].append({'count': '', 'emp_no': _('Total'),'emp':'', 'amount': ftotal, }) docs.append(inner_doc) return title, exception, docs diff --git a/odex25_hr/exp_payroll_custom/templates/payroll_bank_text.xml b/odex25_hr/exp_payroll_custom/templates/payroll_bank_text.xml index d3a657c06..5163996f6 100644 --- a/odex25_hr/exp_payroll_custom/templates/payroll_bank_text.xml +++ b/odex25_hr/exp_payroll_custom/templates/payroll_bank_text.xml @@ -2,8 +2,8 @@