devops_admin
/
odex25_standard
mirror of https://github.com/hydracp9/odex25_standard
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4487 from expsa/dev_odex25_hr 

Dev odex25 hr
This commit is contained in:
kchyounes19 2025-09-01 08:43:06 +01:00 committed by GitHub
parent 124fb63a45 9d5314aeaf
commit 44690c58ce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
odex25_hr/exp_payroll_custom/models/hr_advance_payslip.py
View File

@ -375,7 +375,7 @@ class SalaryRuleInput(models.Model):
pyroll_end = datetime.strptime(payslip_date_to, "%Y-%m-%d").date()
pyroll_days = relativedelta(pyroll_end, payroll_start).days + 1
start_date = datetime.strptime(str(holiday.date_from), "%Y-%m-%d %H:%M:%S").date()
start_date = datetime.strptime(str(holiday.date_from), "%Y-%m-%d").date()
end_date = datetime.strptime(str(payslip.date_to), "%Y-%m-%d").date()
number_of_days = relativedelta(end_date, start_date).days + 1
#if number_of_days >=28:
@ -400,7 +400,7 @@ class SalaryRuleInput(models.Model):
pyroll_days = relativedelta(pyroll_end, payroll_start).days + 1
start_date = datetime.strptime(payslip_date_from, "%Y-%m-%d").date()
end_date = datetime.strptime(str(holiday.date_to), "%Y-%m-%d %H:%M:%S").date()
end_date = datetime.strptime(str(holiday.date_to), "%Y-%m-%d").date()
number_of_days = relativedelta(end_date, start_date).days +1
if number_of_days >=28:
if pyroll_days ==28:
@ -468,7 +468,7 @@ class SalaryRuleInput(models.Model):
'number_of_hours': holiday.holiday_status_id.percentage,
'contract_id': payslip.contract_id.id})]
elif holiday_date_from >= payslip_date_from and payslip_date_to <= holiday_date_to:
start_date = datetime.strptime(holiday_date_from, "%Y-%m-%d %H:%M:%S").date()
start_date = datetime.strptime(holiday_date_from, "%Y-%m-%d").date()
end_date = datetime.strptime(payslip_date_to, "%Y-%m-%d").date()
number_of_days = relativedelta(end_date, start_date).days + 1
if number_of_days >= 0: # number_of_days <= 0
@ -522,7 +522,7 @@ class SalaryRuleInput(models.Model):
pyroll_end = datetime.strptime(payslip_date_to, "%Y-%m-%d").date()
pyroll_days = relativedelta(pyroll_end, payroll_start).days + 1
start_date = datetime.strptime(str(holiday.date_from), "%Y-%m-%d %H:%M:%S").date()
start_date = datetime.strptime(str(holiday.date_from), "%Y-%m-%d").date()
end_date = datetime.strptime(str(payslip.date_to), "%Y-%m-%d").date()
number_of_days = relativedelta(end_date, start_date).days + 1
# if number_of_days >=28: