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 #4500 from expsa/dev_odex25_hr 

Dev odex25 hr
This commit is contained in:
SamirLADOUI-sa 2025-09-01 14:59:55 +01:00 committed by GitHub
parent ac7b37225c 6d7fe43405
commit c83c1417ab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,10 +59,10 @@ class SalaryRuleInput(models.Model):
move_id = fields.Many2one('account.move', string="Move Number")
# bank_id = fields.Many2one(related='employee_id.bank_account_id.bank_id')
basic_allowances = fields.Float(string='Basic Salary', compute='compute_allowances_')
house_allowances = fields.Float(string='House Allowance', compute='compute_allowances_')
trans_allowances = fields.Float(string='Transport Allowance', compute='compute_allowances_')
other_allowances = fields.Float(string='Others Allowance', compute='compute_allowances_')
basic_allowances = fields.Float(string='Basic Salary', compute='compute_allowances_',store=True)
house_allowances = fields.Float(string='House Allowance', compute='compute_allowances_',store=True)
trans_allowances = fields.Float(string='Transport Allowance', compute='compute_allowances_',store=True)
other_allowances = fields.Float(string='Others Allowance', compute='compute_allowances_',store=True)
employee_insurnce = fields.Float(string='Employee Insurnce', compute='compute_allowances_',store=True)
company_insurnce = fields.Float(string='Company Insurnce', compute='compute_allowances_',store=True)
@ -71,9 +71,11 @@ class SalaryRuleInput(models.Model):
holiday_start_date = fields.Date(string="Holiday Start Date")
holiday_end_date = fields.Date(string="Holiday End Date")
@api.depends('allowance_ids', 'allowance_ids.total', 'deduction_ids', 'deduction_ids.total')
def compute_allowances_(self):
for item in self:
item.basic_allowances, item.house_allowances, trans_allowances, employee_insurnce, company_insurnce = 0.0, 0.0, 0.0, 0.0, 0.0
item.basic_allowances = item.house_allowances = item.trans_allowances = item.employee_insurnce = item.company_insurnce = 0.0
for line in item.allowance_ids:
if line.salary_rule_id.rules_type == 'salary':
item.basic_allowances = line.total