[REF] hr_contract and various: rename working_hours to resource_calendar_id

addons/hr_contract/models/hr_contract.py

@@ -61,7 +61,9 @@ class Contract(models.Model):
     date_end = fields.Date('End Date')
     trial_date_start = fields.Date('Trial Start Date')
     trial_date_end = fields.Date('Trial End Date')
-    working_hours = fields.Many2one('resource.calendar', string='Working Schedule')
+    resource_calendar_id = fields.Many2one(
+        'resource.calendar', 'Working Schedule',
+        default=lambda self: self.env['res.company']._company_default_get().resource_calendar_id.id)
     wage = fields.Float('Wage', digits=(16, 2), required=True, help="Basic Salary of the employee")
     advantages = fields.Text('Advantages')
     notes = fields.Text('Notes')
@@ -80,6 +82,7 @@ class Contract(models.Model):
         if self.employee_id:
             self.job_id = self.employee_id.job_id
             self.department_id = self.employee_id.department_id
+            self.resource_calendar_id = self.employee_id.resource_calendar_id
 
     @api.constrains('date_start', 'date_end')
     def _check_dates(self):

addons/hr_contract/views/hr_contract_views.xml

@@ -55,7 +55,7 @@
                     <field name="name" string="Contracts"/>
                     <field name="date_start"/>
                     <field name="date_end"/>
-                    <field name="working_hours"/>
+                    <field name="resource_calendar_id"/>
                     <field name="employee_id"/>
                     <field name="department_id"/>
                     <field name="state"/>
@@ -115,7 +115,7 @@
                                     <div>
                                         <field name="date_start" class="oe_inline"/><span attrs="{'invisible': ['|', ('date_start', '=', False), ('date_end', '=', False)]}"> - </span><field name="date_end" class="oe_inline"/>
                                     </div>
-                                    <field name="working_hours"/>
+                                    <field name="resource_calendar_id"/>
                                 </group>
                             </group>
                             <separator string="Notes"/>
@@ -147,7 +147,7 @@
                     <field name="employee_id"/>
                     <field name="type_id"/>
                     <field name="job_id"/>
-                    <field name="working_hours"/>
+                    <field name="resource_calendar_id"/>
                     <field name="date_start"/>
                     <field name="date_end"/>
                     <field name="wage" invisible="1"/>

addons/hr_payroll/data/hr_payroll_demo.xml

@@ -146,7 +146,6 @@
             <field name="employee_id" ref="hr_employee_payroll"/>
             <field name="notes">Default contract for marketing executives</field>
             <field eval="4000.0" name="wage"/>
-            <field name="working_hours" ref="resource.resource_calendar_std"/>
         </record>
 
         <record id="hr_contract_gilles_gravie" model="hr.contract">
@@ -158,7 +157,6 @@
             <field name="employee_id" ref="hr.employee_qdp"/>
             <field name="notes">This is Gilles Gravie's contract</field>
             <field eval="5000.0" name="wage"/>
-            <field name="working_hours" ref="resource.resource_calendar_std"/>
         </record>
 
 </odoo>

addons/hr_payroll/models/hr_payroll.py

@@ -320,7 +320,7 @@ class HrPayslip(models.Model):
 
         res = []
         #fill only if the contract as a working schedule linked
-        for contract in self.env['hr.contract'].browse(contract_ids).filtered(lambda contract: contract.working_hours):
+        for contract in self.env['hr.contract'].browse(contract_ids).filtered(lambda contract: contract.resource_calendar_id):
             attendances = {
                  'name': _("Normal Working Days paid at 100%"),
                  'sequence': 1,
@@ -334,7 +334,7 @@ class HrPayslip(models.Model):
             day_to = fields.Datetime.from_string(date_to)
             nb_of_days = (day_to - day_from).days + 1
             for day in range(0, nb_of_days):
-                working_hours_on_day = contract.working_hours.get_work_hours_count(day_from + timedelta(days=day), False, contract.employee_id.resource_id.id)
+                working_hours_on_day = contract.resource_calendar_id.get_work_hours_count(day_from + timedelta(days=day), False, contract.employee_id.resource_id.id)
                 if working_hours_on_day:
                     #the employee had to work
                     leave_type = was_on_leave(contract.employee_id.id, day_from + timedelta(days=day))

addons/hr_payroll/tests/common.py

@@ -46,5 +46,4 @@ class TestPayslipBase(TransactionCase):
             'type_id': self.ref('hr_contract.hr_contract_type_emp'),
             'employee_id': self.richard_emp.id,
             'struct_id': self.developer_pay_structure.id,
-            'working_hours': self.ref('resource.resource_calendar_std')
         })

addons/hr_payroll/views/hr_payroll_views.xml

@@ -15,7 +15,7 @@
                 <xpath expr="//field[@name='wage']" position="after">
                     <field name="struct_id" required="1"/>
                 </xpath>
-                 <xpath expr="//field[@name='working_hours']" position="after">
+                 <xpath expr="//field[@name='resource_calendar_id']" position="after">
                     <field name="schedule_pay"/>
                 </xpath>
             </field>

addons/hr_payroll_account/tests/test_hr_payroll_account.py

@@ -70,7 +70,6 @@ class TestHrPayrollAccount(common.TransactionCase):
             'type_id': self.ref('hr_contract.hr_contract_type_emp'),
             'employee_id': self.hr_employee_john.id,
             'struct_id': self.hr_structure_softwaredeveloper.id,
-            'working_hours': self.ref('resource.resource_calendar_std'),
             'journal_id': self.ref('hr_payroll_account.expenses_journal'),
         })
 

addons/l10n_be_hr_payroll/data/l10n_be_hr_payroll_demo.xml

@@ -10,7 +10,6 @@
             <field eval="250.0" name="car_company_amount"/>
             <field eval="110" name="car_employee_deduction"/>
             <field eval="50.0" name="additional_net_amount"/>
-            <field name="working_hours" ref="resource.resource_calendar_std"/>
         </record>
 
         <record id="hr_payroll.hr_employee_payroll" model="hr.employee">