[FIX] exp_payroll_custom
This commit is contained in:
parent
9d5314aeaf
commit
2d223b670f
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue