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

fix report global payroll

This commit is contained in:
Wilson Gomez 2023-09-14 17:44:33 -05:00
parent 574b787825
commit 3f894915b9
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
global_payroll.fods
View File

Binary file not shown.

11
payroll.py
View File

@ -1094,11 +1094,11 @@ class PayrollGlobalReport(Report):
dom_periods.extend([
('start', '>=', start_period.start),
('end', '<=', end_period.end),
])
])
else:
dom_periods.append(
('id', '=', start_period.id)
)
)
periods = Period.search(dom_periods)
dom_pay = cls.get_domain_payroll(data)
dom_pay.append(
@ -1109,11 +1109,12 @@ class PayrollGlobalReport(Report):
)
if data['department']:
dom_pay.append(
['AND', ['OR', [
['AND', [
'OR', [
('employee.department', '=', data['department']),
('department', '=', None),
], [
('department', '=', data['department']),
('department', '=', data['department']),
],
]]
)
@ -1184,7 +1185,7 @@ class PayrollGlobalReport(Report):
sum_total_deductions.append(payroll.total_deductions)
sum_net_payment.append(payroll.net_payment)
employee_dict = {e['employee']: e for e in parties.values()}
employee_dict = {e['employee_id_number']: e for e in parties.values()}
report_context['records'] = sorted(
employee_dict.items(), key=lambda t: t[0])