From e4c66d7d288361a6dcb097913886fa479a2009ba Mon Sep 17 00:00:00 2001
From: Yannick Tivisse <yti@odoo.com>
Date: Tue, 24 Mar 2020 12:39:07 +0000
Subject: [PATCH] [IMP] hr_contract: remove unused field

+ Add helper method to retrieve the contract wage.

Those methods are supposed to be overriden in some cases.

closes odoo/odoo#48258

Taskid: 2222984
Related: odoo/enterprise#9454
Related: odoo/upgrade#980
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
---
 addons/hr_contract/models/hr_contract.py       | 9 ++++++++-
 addons/hr_contract/views/hr_contract_views.xml | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/addons/hr_contract/models/hr_contract.py b/addons/hr_contract/models/hr_contract.py
index 492b07b372e..247103b5d7e 100644
--- a/addons/hr_contract/models/hr_contract.py
+++ b/addons/hr_contract/models/hr_contract.py
@@ -31,7 +31,6 @@ class Contract(models.Model):
         default=lambda self: self.env.company.resource_calendar_id.id, copy=False,
         domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]")
     wage = fields.Monetary('Wage', required=True, tracking=True, help="Employee's monthly gross wage.")
-    advantages = fields.Text('Advantages')
     notes = fields.Text('Notes')
     state = fields.Selection([
         ('draft', 'New'),
@@ -185,6 +184,14 @@ class Contract(models.Model):
         for contract in self:
             contract.employee_id.sudo().write({'contract_id': contract.id})
 
+    def _get_contract_wage(self):
+        self.ensure_one()
+        return self[self._get_contract_wage_field()]
+
+    def _get_contract_wage_field(self):
+        self.ensure_one()
+        return 'wage'
+
     def write(self, vals):
         res = super(Contract, self).write(vals)
         if vals.get('state') == 'open':
diff --git a/addons/hr_contract/views/hr_contract_views.xml b/addons/hr_contract/views/hr_contract_views.xml
index d57a0ac08a7..0f2be3e836b 100644
--- a/addons/hr_contract/views/hr_contract_views.xml
+++ b/addons/hr_contract/views/hr_contract_views.xml
@@ -207,8 +207,8 @@
                                         <field name="wage" nolabel="1"/>
                                         <span>/ month</span>
                                     </div>
-                                    <field name="advantages" nolabel="1" placeholder="Advantages..." colspan="2" invisible="1"/>
                                 </group>
+                                <group string="Yearly Advantages" name="yearly_advantages"/>
                             </group>
                         </page>
                     </notebook>