Skip to content
Snippets Groups Projects
Commit 3cc823a6 authored by Yannick Tivisse's avatar Yannick Tivisse
Browse files

[IMP] hr_payroll: Make 'contract_id' related on worked_days/input lines

No need to display this information on every worked days/input lines

It makes no sense to have a different contract on different payslip lines
too.
parent fbfd98a7
No related branches found
No related tags found
No related merge requests found
......@@ -156,7 +156,6 @@ class HrPayslip(models.Model):
'code': benefit_type.code,
'number_of_days': hours / calendar.hours_per_day, # n_days returned by benefit_days_data doesn't make sense for extra work
'number_of_hours': hours,
'contract_id': contract.id,
}
res.append(line)
......@@ -407,7 +406,7 @@ class HrPayslipWorkedDays(models.Model):
code = fields.Char(required=True, help="The code that can be used in the salary rules")
number_of_days = fields.Float(string='Number of Days')
number_of_hours = fields.Float(string='Number of Hours')
contract_id = fields.Many2one('hr.contract', string='Contract', required=True,
contract_id = fields.Many2one(related='payslip_id.contract_id', string='Contract', required=True,
help="The contract for which applied this worked days")
......@@ -423,7 +422,7 @@ class HrPayslipInput(models.Model):
amount = fields.Float(help="It is used in computation. For e.g. A rule for sales having "
"1% commission of basic salary for per product can defined in expression "
"like result = inputs.SALEURO.amount * contract.wage*0.01.")
contract_id = fields.Many2one('hr.contract', string='Contract', required=True,
contract_id = fields.Many2one(related='payslip_id.contract_id', string='Contract', required=True,
help="The contract for which applied this input")
......
......@@ -168,7 +168,7 @@
<field name="code"/>
<field name="number_of_days" sum="Total Working Days"/>
<field name="number_of_hours"/>
<field name="contract_id"/>
<field name="contract_id" invisible="True"/>
<field name="sequence" invisible="True"/>
</tree>
<form string="Worked Day">
......@@ -188,7 +188,7 @@
<field name="name"/>
<field name="code"/>
<field name="amount"/>
<field name="contract_id"/>
<field name="contract_id" invisible="True"/>
<field name="sequence" invisible="True"/>
</tree>
<form string="Payslip Line">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment