Merge 52599ad into 92e4c89

hr_assignment_transition/README.rst

@@ -32,8 +32,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_assignment_transition/__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_assignment_transition/__openerp__.py

@@ -1,13 +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": "Career Transition - New Assignment",
-    "version": "8.0.1.1.0",
+    "version": "8.0.2.0.0",
     "category": "Human Resource",
     "website": "https://opensynergy-indonesia.com",
-    "author": "OpenSynergy Indonesia",
+    "author": "OpenSynergy Indonesia, PT. Simetri Sinergi Indonesia",
     "license": "AGPL-3",
     "installable": True,
     "depends": [

hr_assignment_transition/data/base_sequence_configurator_data.xml

@@ -1,5 +1,6 @@
 <?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>

hr_assignment_transition/data/base_workflow_policy_data.xml

@@ -1,5 +1,6 @@
 <?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>
@@ -12,11 +13,6 @@
     <field name="field_id" search="[('model_id.model','=','hr.assignment_transition'),('name','=','confirm_ok')]"/>
     <field name="python_code">result = document.type_id.confirm_grp_ids.ids</field>
 </record>
-<record id="base_workflow_line_assignment_transition_open" model="base.workflow_policy_line">
-    <field name="workflow_id" ref="hr_assignment_transition.base_workflow_assignment_transition"/>
-    <field name="field_id" search="[('model_id.model','=','hr.assignment_transition'),('name','=','open_ok')]"/>
-    <field name="python_code">result = document.type_id.open_grp_ids.ids</field>
-</record>
 <record id="base_workflow_line_assignment_transition_valid" model="base.workflow_policy_line">
     <field name="workflow_id" ref="hr_assignment_transition.base_workflow_assignment_transition"/>
     <field name="field_id" search="[('model_id.model','=','hr.assignment_transition'),('name','=','valid_ok')]"/>
@@ -32,5 +28,10 @@
     <field name="field_id" search="[('model_id.model','=','hr.assignment_transition'),('name','=','restart_ok')]"/>
     <field name="python_code">result = document.type_id.restart_grp_ids.ids</field>
 </record>
+<record id="base_workflow_line_assignment_transition_restart_approval" model="base.workflow_policy_line">
+    <field name="workflow_id" ref="hr_assignment_transition.base_workflow_assignment_transition"/>
+    <field name="field_id" search="[('model_id.model','=','hr.assignment_transition'),('name','=','restart_approval_ok')]"/>
+    <field name="python_code">result = document.type_id.restart_approval_grp_ids.ids</field>
+</record>
 </data>
 </openerp>

hr_assignment_transition/data/hr_career_transition_type_data.xml

@@ -1,5 +1,6 @@
 <?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>

hr_assignment_transition/data/ir_sequence_data.xml

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

hr_assignment_transition/models/__init__.py

@@ -1,6 +1,9 @@
 # -*- 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_assignment_transition
-from . import hr_employee
+from . import (
+    hr_assignment_transition,
+    hr_employee,
+    tier_definition,
+)

hr_assignment_transition/models/hr_assignment_transition.py

@@ -1,5 +1,6 @@
 # -*- 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.html).
 
 from openerp import models, api

hr_assignment_transition/models/hr_employee.py

@@ -1,5 +1,6 @@
 # -*- 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

hr_assignment_transition/models/tier_definition.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Copyright 2020 OpenSynergy Indonesia
+# Copyright 2020 PT. Simetri Sinergi Indonesia
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from openerp import api, models
+
+
+class TierDefinition(models.Model):
+    _inherit = "tier.definition"
+
+    @api.model
+    def _get_tier_validation_model_names(self):
+        res = super(TierDefinition, self)._get_tier_validation_model_names()
+        res.append("hr.assignment_transition")
+        return res

hr_assignment_transition/views/hr_assignment_transition_views.xml

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

hr_career_transition/README.rst

@@ -36,8 +36,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_career_transition/__init__.py

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

hr_career_transition/__openerp__.py

@@ -1,13 +1,14 @@
 # -*- coding: utf-8 -*-
 # Copyright 2018-2019 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": "Career Transition",
-    "version": "8.0.1.8.0",
+    "version": "8.0.2.0.0",
     "category": "Human Resource",
     "website": "https://opensynergy-indonesia.com",
-    "author": "OpenSynergy Indonesia",
+    "author": "OpenSynergy Indonesia, PT. Simetri Sinergi Indonesia",
     "license": "AGPL-3",
     "installable": True,
     "depends": [
@@ -16,6 +17,7 @@
         "hr_contract_reference",
         "base_sequence_configurator",
         "base_workflow_policy",
+        "base_multiple_approval",
     ],
     "data": [
         "security/ir.model.access.csv",

hr_career_transition/data/base_workflow_policy_data.xml

@@ -1,5 +1,6 @@
 <?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>
@@ -15,12 +16,6 @@
     <field name="python_code">result = document.type_id.confirm_grp_ids.ids</field>
 </record>
 
-<record id="workflow_policy_career_transition_open" model="base.workflow_policy_line">
-    <field name="workflow_id" ref="workflow_policy_career_transition"/>
-    <field name="field_id" ref="hr_career_transition.field_hr_career_transition_open_ok"/>
-    <field name="python_code">result = document.type_id.open_grp_ids.ids</field>
-</record>
-
 <record id="workflow_policy_career_transition_valid" model="base.workflow_policy_line">
     <field name="workflow_id" ref="workflow_policy_career_transition"/>
     <field name="field_id" ref="hr_career_transition.field_hr_career_transition_valid_ok"/>
@@ -39,5 +34,11 @@
     <field name="python_code">result = document.type_id.restart_grp_ids.ids</field>
 </record>
 
+<record id="workflow_policy_career_transition_restart_approval" model="base.workflow_policy_line">
+    <field name="workflow_id" ref="workflow_policy_career_transition"/>
+    <field name="field_id" ref="hr_career_transition.field_hr_career_transition_restart_approval_ok"/>
+    <field name="python_code">result = document.type_id.restart_approval_grp_ids.ids</field>
+</record>
+
 </data>
 </openerp>

hr_career_transition/menu.xml

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

hr_career_transition/models/__init__.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 . import hr_career_transition
-from . import hr_career_transition_type
-from . import hr_career_transition_type_reason
-from . import hr_employee
+from . import(
+    hr_career_transition,
+    hr_career_transition_type,
+    hr_career_transition_type_reason,
+    hr_employee,
+)

hr_career_transition/models/hr_career_transition.py

@@ -1,5 +1,6 @@
 # -*- 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, _
@@ -8,9 +9,20 @@
 
 class HrCareerTransition(models.Model):
     _name = "hr.career_transition"
-    _inherit = ["mail.thread", "base.sequence_document",
-                "base.workflow_policy_object"]
     _description = "Career Transition"
+    _inherit = [
+        "mail.thread",
+        "base.sequence_document",
+        "base.workflow_policy_object",
+        "tier.validation",
+    ]
+    _state_from = [
+        "draft",
+        "confirm",
+    ]
+    _state_to = [
+        "open",
+    ]
     _order = "effective_date desc, id"
 
     @api.multi
@@ -363,12 +375,6 @@ def _default_employee_id(self):
         store=False,
         readonly=True,
     )
-    open_ok = fields.Boolean(
-        string="Can Open",
-        compute="_compute_policy",
-        store=False,
-        readonly=True,
-    )
     valid_ok = fields.Boolean(
         string="Can Validate",
         compute="_compute_policy",
@@ -387,11 +393,16 @@ def _default_employee_id(self):
         store=False,
         readonly=True,
     )
+    restart_approval_ok = fields.Boolean(
+        string="Can Restart Approval",
+        compute="_compute_policy",
+    )
 
     @api.multi
     def action_confirm(self):
         for transition in self:
             transition.write(transition._prepare_confirm_data())
+            transition.request_validation()
 
     @api.multi
     def action_approve(self):
@@ -417,12 +428,28 @@ def action_cancel(self):
                 new_contract.unlink()
             else:
                 transition._revert_contract()
+            transition.restart_validation()
 
     @api.multi
     def action_restart(self):
         for transition in self:
             transition.write(transition._prepare_restart_data())
 
+    @api.multi
+    def validate_tier(self):
+        _super = super(HrCareerTransition, self)
+        _super.validate_tier()
+        for document in self:
+            if document.validated:
+                document.action_approve()
+
+    @api.multi
+    def restart_validation(self):
+        _super = super(HrCareerTransition, self)
+        _super.restart_validation()
+        for document in self:
+            document.request_validation()
+
     @api.multi
     def _prepare_confirm_data(self):
         self.ensure_one()

hr_career_transition/models/hr_career_transition_type.py

@@ -1,5 +1,6 @@
 # -*- 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
@@ -78,13 +79,6 @@ class HrCareerTransitionType(models.Model):
         column1="type_id",
         column2="group_id",
     )
-    open_grp_ids = fields.Many2many(
-        string="Allowed to Start Process",
-        comodel_name="res.groups",
-        relation="rel_open_career_transition",
-        column1="type_id",
-        column2="group_id",
-    )
     valid_grp_ids = fields.Many2many(
         string="Allowed to Validate",
         comodel_name="res.groups",
@@ -106,6 +100,13 @@ class HrCareerTransitionType(models.Model):
         column1="type_id",
         column2="group_id",
     )
+    restart_approval_grp_ids = fields.Many2many(
+        string="Allow To Restart Approval",
+        comodel_name="res.groups",
+        relation="rel_restart_approval_career_transition",
+        column1="type_id",
+        column2="group_id",
+    )
 
     @api.multi
     def _get_transition_limit(self, transition_reason):

hr_career_transition/models/hr_career_transition_type_reason.py

@@ -1,5 +1,6 @@
 # -*- 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_career_transition/models/hr_contract.py

@@ -1,5 +1,6 @@
 # -*- 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_career_transition/models/hr_employee.py

@@ -1,5 +1,6 @@
 # -*- 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

hr_career_transition/reports/hr_career_transition_analysis.py

@@ -1,5 +1,6 @@
 # -*- 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