Merge 1b45b5b into d39d80e

hr_timesheet_computation_overtime/README.rst

@@ -1,11 +1,14 @@
-.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
-   :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
-   :alt: License: AGPL-3
-
 ===============================================
 Timesheet Computation Integration With Overtime
 ===============================================
 
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-open--synergy%2Fopnsynid--hr-lightgray.png?logo=github
+    :target: https://github.com/open-synergy/opnsynid-hr/tree/8.0/hr_timesheet_computation_overtime
+    :alt: open-synergy/opnsynid-hr
+
 
 Installation
 ============
@@ -32,8 +35,8 @@ Contributors
 Maintainer
 ----------
 
-.. image:: https://opensynergy-indonesia.com/logo.png
-   :alt: OpenSynergy Indonesia
-   :target: https://opensynergy-indonesia.com
+.. image:: https://simetri-sinergi.id/logo.png
+   :alt: PT. Simetri Sinergi Indonesia
+   :target: https://simetri-sinergi.id.com
 
-This module is maintained by the OpenSynergy Indonesia.
+This module is maintained by the PT. Simetri Sinergi Indonesia.

hr_timesheet_computation_overtime/__init__.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Copyright 2018 OpenSynergy Indonesia
+# Copyright 2020 PT. Simetri Sinergi Indonesia
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from . import models
+from . import (
+    models,
+)

hr_timesheet_computation_overtime/__openerp__.py

@@ -1,12 +1,14 @@
 # -*- coding: utf-8 -*-
 # Copyright 2018 OpenSynergy Indonesia
+# Copyright 2020 PT. Simetri Sinergi Indonesia
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+# pylint: disable=locally-disabled, manifest-required-author
 {
     "name": "Timesheet Computation Integration With Overtime",
-    "version": "8.0.1.1.0",
+    "version": "8.0.1.2.0",
     "category": "Human Resource",
-    "website": "https://opensynergy-indonesia.com",
-    "author": "OpenSynergy Indonesia",
+    "website": "https://simetri-sinergi.id",
+    "author": "OpenSynergy Indonesia, PT. Simetri Sinergi Indonesia",
     "license": "AGPL-3",
     "installable": True,
     "depends": [
@@ -15,7 +17,11 @@
     ],
     "data": [
         "data/ir_actions_server_data.xml",
+        "views/hr_overtime_config_setting_views.xml",
         "views/hr_timesheet_sheet_views.xml",
         "views/hr_overtime_request_views.xml",
     ],
+    "images": [
+        "static/description/banner.png",
+    ],
 }

hr_timesheet_computation_overtime/data/ir_actions_server_data.xml

@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2018 OpenSynergy Indonesia
+     Copyright 2020 PT. Simetri Sinergi Indonesia
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
 <openerp>
 <data>
 

hr_timesheet_computation_overtime/models/__init__.py

@@ -1,7 +1,11 @@
 # -*- coding: utf-8 -*-
 # Copyright 2018 OpenSynergy Indonesia
+# Copyright 2020 PT. Simetri Sinergi Indonesia
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from . import hr_timesheet_computation_item
-from . import hr_timesheet_sheet
-from . import hr_overtime_request
+from . import (
+    res_company,
+    res_config,
+    hr_timesheet_computation_item,
+    hr_timesheet_sheet,
+    hr_overtime_request,
+)

hr_timesheet_computation_overtime/models/hr_overtime_request.py

@@ -1,8 +1,10 @@
 # -*- coding: utf-8 -*-
 # Copyright 2018 OpenSynergy Indonesia
+# Copyright 2020 PT. Simetri Sinergi Indonesia
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
 from openerp import models, fields, api
+from openerp.exceptions import Warning as UserError
+from openerp.tools.translate import _
 
 
 class HrOvertimeRequest(models.Model):
@@ -38,3 +40,15 @@ def _compute_sheet(self):
     @api.multi
     def button_link_to_timesheet(self):
         return self._compute_sheet()
+
+    @api.constrains(
+        "sheet_id",
+        "state",
+    )
+    def _check_timesheet(self):
+        if (
+            self.state in ["confirm", "valid"] and not
+            self.sheet_id and
+            self.company_id.overtime_check_timesheet
+        ):
+            raise UserError(_("Timesheet cannot be empty"))

hr_timesheet_computation_overtime/models/hr_timesheet_computation_item.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Copyright 2018 OpenSynergy Indonesia
+# Copyright 2020 PT. Simetri Sinergi Indonesia
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
 from openerp import models, api
 
 

hr_timesheet_computation_overtime/models/hr_timesheet_sheet.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Copyright 2018 OpenSynergy Indonesia
+# Copyright 2020 PT. Simetri Sinergi Indonesia
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
 from openerp import models, fields
 
 

hr_timesheet_computation_overtime/models/res_company.py

@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+# Copyright 2018 OpenSynergy Indonesia
+# Copyright 2020 PT. Simetri Sinergi Indonesia
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from openerp import models, fields
+
+
+class ResCompany(models.Model):
+    _inherit = "res.company"
+
+    overtime_check_timesheet = fields.Boolean(
+        string="Check Timesheet",
+    )

hr_timesheet_computation_overtime/models/res_config.py

@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+# Copyright 2018 OpenSynergy Indonesia
+# Copyright 2020 PT. Simetri Sinergi Indonesia
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from openerp import models, fields
+
+
+class ResConfig(models.TransientModel):
+    _inherit = "hr.overtime_config_setting"
+
+    overtime_check_timesheet = fields.Boolean(
+        string="Check Timesheet",
+        related="company_id.overtime_check_timesheet",
+    )

hr_timesheet_computation_overtime/views/hr_overtime_config_setting_views.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2018 OpenSynergy Indonesia
+     Copyright 2020 PT. Simetri Sinergi Indonesia
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+<openerp>
+    <data>
+        <record id="hr_overtime_config_setting_view_form" model="ir.ui.view">
+            <field name="name">hr.overtime_config_setting form</field>
+            <field name="model">hr.overtime_config_setting</field>
+            <field name="inherit_id" ref="hr_attendance_overtime_request.hr_overtime_config_setting_view_form" />
+            <field name="arch" type="xml">
+                <xpath expr="//group[@name='overtime_config']" position="inside">
+                    <label for="id" string="Timesheet Computation Overtime"/>
+                    <div>
+                        <div>
+                            <label for="id" string="Check Timesheet" class="oe_inline"/>
+                            <field name="overtime_check_timesheet" class="oe_inline"/>
+                        </div>
+                    </div>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>

hr_timesheet_computation_overtime/views/hr_overtime_request_views.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2018 OpenSynergy Indonesia
+     Copyright 2020 PT. Simetri Sinergi Indonesia
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
-
 <openerp>
 <data>
 

hr_timesheet_computation_overtime/views/hr_timesheet_sheet_views.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2018 OpenSynergy Indonesia
+     Copyright 2020 PT. Simetri Sinergi Indonesia
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
-
 <openerp>
 <data>