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 #3243 from expsa/bakry_hr3 

fix term
This commit is contained in:
bakry 2025-05-20 12:24:28 +03:00 committed by GitHub
parent 6a82bc6999 6bcde7aeea
commit 22fc3bc300
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
odex25_hr/hr_termination/models/hr_termination.py
View File

@ -1112,7 +1112,3 @@ class HrSalaryRuleAndLoansLines(models.Model):
account_credit = rec.salary_rule_id.get_credit_account_id(emp_type)
rec.account_credit_id = account_credit.id

2
odex25_hr/hr_termination/wizard/termination_report_wiz.py
View File

@ -657,7 +657,7 @@ class ReportTerminationPublic(models.AbstractModel):
if type == 'all' or type == 'leave':
if salary > 0:
amount_per_day = salary / 30
lave_price = emp.remaining_leaves * amount_per_day
lave_price = leave_balance*amount_per_day
if 'lave_price' not in data['total_sum']:
data['total_sum']['lave_price'] = lave_price
else: