[8.0.3.1.0] hr_timesheet_attendance_schedule

* Generate schedule from working schedule on timesheet
open-synergy · Mar 20, 2019 · 8075c8b · 8075c8b
1 parent b0842b0
commit 8075c8b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/hr_timesheet_attendance_schedule/__openerp__.py b/hr_timesheet_attendance_schedule/__openerp__.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
-# Copyright 2018 OpenSynergy Indonesia
+# Copyright 2018-2019 OpenSynergy Indonesia
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 # pylint: disable=locally-disabled, manifest-required-author
 {
     "name": "Timesheet Attendance Schedule",
-    "version": "8.0.3.0.0",
+    "version": "8.0.3.1.0",
     "category": "Human Resource",
     "website": "https://opensynergy-indonesia.com",
     "author": "OpenSynergy Indonesia",

diff --git a/hr_timesheet_attendance_schedule/models/hr_timesheet_sheet.py b/hr_timesheet_attendance_schedule/models/hr_timesheet_sheet.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2018 OpenSynergy Indonesia
+# Copyright 2018-2019 OpenSynergy Indonesia
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from openerp import models, fields, api
@@ -21,6 +21,10 @@ class HrTimesheetSheet(models.Model):
             ],
         },
     )
+    working_schedule_id = fields.Many2one(
+        string="Working Schedule",
+        comodel_name="resource.calendar",
+    )
 
     @api.multi
     def action_create_attendance_schedule(self):
@@ -52,7 +56,12 @@ def _create_attendance_schedule(self):
         if not contract.working_hours:
             return True
 
-        schedules = contract.working_hours._schedule_days(
+        if self.working_schedule_id:
+            working_schedule = self.working_schedule_id
+        else:
+            working_schedule = contract.working_hours
+
+        schedules = working_schedule._schedule_days(
             days=duration,
             day_date=dt_start)
 

diff --git a/hr_timesheet_attendance_schedule/views/hr_timesheet_sheet_views.xml b/hr_timesheet_attendance_schedule/views/hr_timesheet_sheet_views.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2018 OpenSynergy Indonesia
+<!-- Copyright 2018-2019 OpenSynergy Indonesia
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
 
 <openerp>
@@ -11,6 +11,9 @@
     <field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/>
     <field name="arch" type="xml">
         <data>
+            <xpath expr="//field[@name='company_id']" position="after">
+                <field name="working_schedule_id"/>
+            </xpath>
             <xpath expr="//page[@string='Attendances']" position="after">
                 <page name="attendance_schedule" string="Attendance Schedules">
                     <field name="attendance_schedule_ids" colspan="4" nolabel="1">