admin/Odoo-Modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changes

Browse Source
This commit is contained in:
gsinghpal
2026-04-07 20:49:21 -04:00
parent 3cc93b8783
commit 4fde4c7bd1
25 changed files with 1253 additions and 900 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
fusion_payroll/models/hr_payslip.py
View File

@@ -208,9 +208,16 @@ class HrPayslip(models.Model):
('date_to', '<=', payslip.date_to),
('state', 'in', ['done', 'paid']),
]
# Include current payslip if it's in draft/verify state
if payslip.state in ['draft', 'verify']:
domain = ['|', ('id', '=', payslip.id)] + domain
domain = [
'|',
('id', '=', payslip.id),
'&', '&', '&',
('employee_id', '=', payslip.employee_id.id),
('date_from', '>=', year_start),
('date_to', '<=', payslip.date_to),
('state', 'in', ['done', 'paid']),
]
ytd_payslips = self.search(domain)
@@ -229,13 +236,13 @@ class HrPayslip(models.Model):
# Sum up specific rule amounts
for line in slip.line_ids:
code = line.code or ''
if code == 'CPP':
if code == 'CPP_EE':
ytd_cpp += abs(line.total or 0)
elif code == 'CPP2':
elif code == 'CPP2_EE':
ytd_cpp2 += abs(line.total or 0)
elif code == 'EI':
elif code == 'EI_EE':
ytd_ei += abs(line.total or 0)
elif code in ['FED_TAX', 'PROV_TAX', 'INCOME_TAX']:
elif code in ['FED_TAX', 'PROV_TAX', 'OHP']:
ytd_income_tax += abs(line.total or 0)
payslip.ytd_gross = ytd_gross
@@ -278,13 +285,13 @@ class HrPayslip(models.Model):
for line in payslip.line_ids:
code = line.code or ''
if code == 'CPP':
if code == 'CPP_EE':
employee_cpp = abs(line.total or 0)
elif code == 'CPP2':
elif code == 'CPP2_EE':
employee_cpp2 = abs(line.total or 0)
elif code == 'EI':
elif code == 'EI_EE':
employee_ei = abs(line.total or 0)
elif code in ['FED_TAX', 'PROV_TAX', 'INCOME_TAX']:
elif code in ['FED_TAX', 'PROV_TAX', 'OHP']:
employee_income_tax += abs(line.total or 0)
payslip.employee_cpp = employee_cpp