From ef721eb9af09f3a7cb72714ec9a4ec63014a44a7 Mon Sep 17 00:00:00 2001
From: Yannick Tivisse <yti@odoo.com>
Date: Thu, 3 May 2018 14:24:23 +0200
Subject: [PATCH] [IMP] hr_contract: Remove the field 'vehicle_distance'

The field 'km_home_work' already exists in the hr module for the same purpose.
---
 addons/hr_contract/models/hr_contract.py                    | 2 --
 addons/hr_contract/views/hr_contract_views.xml              | 1 -
 addons/hr_payroll_account/tests/test_hr_payroll_account.py  | 1 -
 addons/l10n_be_hr_payroll/views/l10n_be_hr_payroll_view.xml | 2 +-
 4 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/addons/hr_contract/models/hr_contract.py b/addons/hr_contract/models/hr_contract.py
index ba029f2fb65..e10e2b91382 100644
--- a/addons/hr_contract/models/hr_contract.py
+++ b/addons/hr_contract/models/hr_contract.py
@@ -15,8 +15,6 @@ class Employee(models.Model):
     manager = fields.Boolean(string='Is a Manager')
     medic_exam = fields.Date(string='Medical Examination Date', groups="hr.group_hr_user")
     vehicle = fields.Char(string='Company Vehicle', groups="hr.group_hr_user")
-    vehicle_distance = fields.Integer(
-        string='Home-Work Dist.', help="In kilometers", groups="hr.group_hr_user")
     contract_ids = fields.One2many('hr.contract', 'employee_id', string='Employee Contracts')
     contract_id = fields.Many2one('hr.contract', compute='_compute_contract_id', string='Current Contract', help='Latest contract of the employee')
     contracts_count = fields.Integer(compute='_compute_contracts_count', string='Contract Count')
diff --git a/addons/hr_contract/views/hr_contract_views.xml b/addons/hr_contract/views/hr_contract_views.xml
index cd60657ec8e..78c57240ab8 100644
--- a/addons/hr_contract/views/hr_contract_views.xml
+++ b/addons/hr_contract/views/hr_contract_views.xml
@@ -35,7 +35,6 @@
                         <group string="Current Contract">
                             <field name="medic_exam" string="Medical Exam"/>
                             <field name="vehicle"/>
-                            <field name="vehicle_distance"/>
                         </group>
                     </xpath>
                     <xpath expr="//field[@name='bank_account_id']" position="replace">
diff --git a/addons/hr_payroll_account/tests/test_hr_payroll_account.py b/addons/hr_payroll_account/tests/test_hr_payroll_account.py
index dfc5e7cbcc8..ff5c2985d55 100644
--- a/addons/hr_payroll_account/tests/test_hr_payroll_account.py
+++ b/addons/hr_payroll_account/tests/test_hr_payroll_account.py
@@ -43,7 +43,6 @@ class TestHrPayrollAccount(common.TransactionCase):
             'marital': 'single',
             'name': 'John',
             'bank_account_id': self.res_partner_bank.bank_id.id,
-            'vehicle_distance': 0.0,
         })
 
         self.hr_structure_softwaredeveloper = self.env['hr.payroll.structure'].create({
diff --git a/addons/l10n_be_hr_payroll/views/l10n_be_hr_payroll_view.xml b/addons/l10n_be_hr_payroll/views/l10n_be_hr_payroll_view.xml
index 5ecbdbb0960..b17cc369858 100644
--- a/addons/l10n_be_hr_payroll/views/l10n_be_hr_payroll_view.xml
+++ b/addons/l10n_be_hr_payroll/views/l10n_be_hr_payroll_view.xml
@@ -136,7 +136,7 @@
             <field name="inherit_id" ref="hr_contract.hr_hr_employee_view_form2"/>
             <field name="priority">30</field>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='vehicle_distance']" position="after">
+                <xpath expr="//field[@name='vehicle']" position="after">
                     <field name="resident_bool" eval="False"/> 
                 </xpath>
                 <xpath expr="//field[@name='marital']" position="after">