[IMP] hr_contract: Remove the field 'vehicle_distance'

The field 'km_home_work' already exists in the hr module for the same purpose.
This commit is contained in:
Yannick Tivisse
2018-05-04 09:59:52 +02:00
parent a696f84f1f
commit ef721eb9af
4 changed files with 1 additions and 5 deletions
-2
View File
@@ -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')
@@ -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">
@@ -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({
@@ -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">