[8.0.1.8.0] hr_career_transition

* Add option to change wage on each transition
open-synergy · Dec 12, 2019 · e3152be · e3152be
1 parent f0a6657
commit e3152be
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 2 deletions.
diff --git a/hr_career_transition/__openerp__.py b/hr_career_transition/__openerp__.py
@@ -4,7 +4,7 @@
 # pylint: disable=locally-disabled, manifest-required-author
 {
     "name": "Career Transition",
-    "version": "8.0.1.7.0",
+    "version": "8.0.1.8.0",
     "category": "Human Resource",
     "website": "https://opensynergy-indonesia.com",
     "author": "OpenSynergy Indonesia",

diff --git a/hr_career_transition/models/hr_career_transition.py b/hr_career_transition/models/hr_career_transition.py
@@ -237,6 +237,15 @@ def _default_employee_id(self):
             ],
         },
     )
+    new_wage = fields.Float(
+        string="New Wage",
+        readonly=True,
+        states={
+            "draft": [
+                ("readonly", False),
+            ],
+        },
+    )
     # Previous Data
     previous_company_id = fields.Many2one(
         string="Previous Company",
@@ -254,6 +263,9 @@ def _default_employee_id(self):
         string="Previous Working Schedule",
         comodel_name="resource.calendar",
     )
+    previous_wage = fields.Float(
+        string="Previous Wage",
+    )
     # Data Change Policy
     change_company = fields.Boolean(
         related="type_id.change_company",
@@ -275,6 +287,11 @@ def _default_employee_id(self):
         string="Change Working Schedule",
         readonly=True,
     )
+    change_wage = fields.Boolean(
+        related="type_id.change_wage",
+        string="Change Wage",
+        readonly=True,
+    )
 
     note = fields.Text(
         string="Note",
@@ -489,6 +506,10 @@ def onchange_new_job_id(self):
     def onchange_new_working_hour_id(self):
         self.new_working_hour_id = self.previous_working_hour_id
 
+    @api.onchange("previous_wage")
+    def onchange_new_wage(self):
+        self.new_wage = self.previous_wage
+
     @api.multi
     def onchange_previous_contract(self, previous_contract_id):
         value = self._get_value_before_onchange_previous_contract()
@@ -510,6 +531,7 @@ def _get_value_before_onchange_previous_contract(self):
             "previous_job_id": False,
             "previous_department_id": False,
             "previous_company_id": False,
+            "previous_wage": 0.0,
         }
 
     @api.multi
@@ -524,6 +546,7 @@ def _get_value_after_onchange_previous_contract(
             "previous_job_id": previous_contract.job_id,
             "previous_department_id": previous_contract.contract_department_id,
             "previous_company_id": previous_contract.company_id,
+            "previous_wage": previous_contract.wage,
         }
 
     @api.multi
@@ -559,7 +582,7 @@ def _prepare_new_contract(self):
             "working_hours": self.new_working_hour_id and \
             self.new_working_hour_id.id or \
             False,
-            "wage": 0.0,
+            "wage": self.new_wage,
             "contract_department_id": self.new_department_id and \
             self.new_department_id.id or \
             False,
@@ -584,6 +607,7 @@ def _prepare_contract_update(self):
             "company_id": self.new_company_id and
             self.new_company_id.id or
             False,
+            "wage": self.new_wage,
         }
 
     @api.multi
@@ -602,6 +626,7 @@ def _prepare_contract_revert(self):
             "company_id": self.previous_company_id and
             self.previous_company_id.id or
             False,
+            "wage": self.previous_wage,
         }
 
     @api.multi

diff --git a/hr_career_transition/models/hr_career_transition_type.py b/hr_career_transition/models/hr_career_transition_type.py
@@ -55,6 +55,9 @@ class HrCareerTransitionType(models.Model):
     change_working_schedule = fields.Boolean(
         string="Change Working Schedule",
     )
+    change_wage = fields.Boolean(
+        string="Change Wage",
+    )
 
     sequence_id = fields.Many2one(
         string="Sequence",

diff --git a/hr_career_transition/views/hr_career_transition_type_views.xml b/hr_career_transition/views/hr_career_transition_type_views.xml
@@ -44,6 +44,7 @@
                                 <field name="change_job_title"/>
                                 <field name="change_department"/>
                                 <field name="change_working_schedule"/>
+                                <field name="change_wage"/>
                             </group>
                         </page>
                         <page name="reason" string="Reasons">

diff --git a/hr_career_transition/views/hr_career_transition_views.xml b/hr_career_transition/views/hr_career_transition_views.xml
@@ -72,6 +72,9 @@
                             <field name="previous_working_hour_id" string="Working Schedule" readonly="1"/>
                             <field name="new_working_hour_id" nolabel="1"
                                 attrs="{'required':[('change_working_schedule','=',True)], 'readonly':[('change_working_schedule','=',False)]}"/>
+                            <field name="previous_wage" string="Basic Salary" readonly="1"/>
+                            <field name="new_wage" nolabel="1"
+                                attrs="{'required':[('change_wage','=',True)], 'readonly':[('change_wage','=',False)]}"/>
                         </group>
                     </page>
                     <page name="note" string="Note">
@@ -83,6 +86,7 @@
                             <field name="change_department"/>
                             <field name="change_job_title"/>
                             <field name="change_working_schedule"/>
+                            <field name="change_wage"/>
                         </group>
                         <group name="group_policy_2" colspan="4" col="2">
                             <field name="confirm_ok"/>