diff --git a/addons/l10n_be_hr_payroll/__init__.py b/addons/l10n_be_hr_payroll/__init__.py
index 2b6fd3008e4..2c6ed4d464a 100644
--- a/addons/l10n_be_hr_payroll/__init__.py
+++ b/addons/l10n_be_hr_payroll/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding:utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 import models
diff --git a/addons/l10n_be_hr_payroll/__openerp__.py b/addons/l10n_be_hr_payroll/__openerp__.py
index e1cf76de5e0..dbdc45db691 100644
--- a/addons/l10n_be_hr_payroll/__openerp__.py
+++ b/addons/l10n_be_hr_payroll/__openerp__.py
@@ -1,10 +1,10 @@
-# -*- encoding: utf-8 -*-
+# -*- coding:utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
+
 {
     'name': 'Belgium - Payroll',
     'category': 'Localization',
     'depends': ['hr_payroll'],
-    'version': '1.0',
     'description': """
 Belgian Payroll Rules.
 ======================
@@ -20,7 +20,6 @@ Belgian Payroll Rules.
     * Salary Maj, ONSS, Withholding Tax, Child Allowance, ...
     """,
 
-    'auto_install': False,
     'demo': ['data/l10n_be_hr_payroll_demo.xml'],
     'website': 'https://www.odoo.com/page/accounting',
     'data':[
@@ -28,5 +27,4 @@ Belgian Payroll Rules.
         'data/l10n_be_hr_payroll_data.xml',
         'data/hr.salary.rule.csv',
     ],
-    'installable': True
 }
diff --git a/addons/l10n_be_hr_payroll/data/l10n_be_hr_payroll_data.xml b/addons/l10n_be_hr_payroll/data/l10n_be_hr_payroll_data.xml
index f06fc37f409..ce4b3ee50fd 100644
--- a/addons/l10n_be_hr_payroll/data/l10n_be_hr_payroll_data.xml
+++ b/addons/l10n_be_hr_payroll/data/l10n_be_hr_payroll_data.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
+<odoo>
 <!-- CONTRIBUTION REGISTERS -->
     <record id="res_partner_onss" model="res.partner">
         <field name="name">Office National de Sécurité Sociale (ONSS)</field>
@@ -346,5 +345,4 @@
         <field name="company_id" ref="base.main_company"/>
         <field name="parent_id" ref="hr_payroll.structure_base"/>
         </record>
-    </data>
-</openerp>
+</odoo>
diff --git a/addons/l10n_be_hr_payroll/data/l10n_be_hr_payroll_demo.xml b/addons/l10n_be_hr_payroll/data/l10n_be_hr_payroll_demo.xml
index 6e9bed17ab2..54f338094e8 100644
--- a/addons/l10n_be_hr_payroll/data/l10n_be_hr_payroll_demo.xml
+++ b/addons/l10n_be_hr_payroll/data/l10n_be_hr_payroll_demo.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
+<odoo>
         <!-- Employee Contract -->
         <record id="hr_payroll.hr_contract_firstcontract1" model="hr.contract">
             <field name="name">Developer's Contract (Belgium payroll C.P. 218)</field>
@@ -34,7 +32,4 @@
             <field name="country_id" ref="base.cn"/>
             <field name="email">fiscal@yourcompany.example.com</field>
         </record>
-    
-    </data>
-</openerp>
-
+</odoo>
diff --git a/addons/l10n_be_hr_payroll/models/__init__.py b/addons/l10n_be_hr_payroll/models/__init__.py
index c031ed65e3e..bbb643d1c6b 100644
--- a/addons/l10n_be_hr_payroll/models/__init__.py
+++ b/addons/l10n_be_hr_payroll/models/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding:utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 import l10n_be_hr_payroll
diff --git a/addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py b/addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py
index 8b2a2b10125..7cfa403ef27 100644
--- a/addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py
+++ b/addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py
@@ -1,34 +1,30 @@
-#-*- coding:utf-8 -*-
+# -*- coding:utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from openerp.osv import fields, osv
+from odoo import fields, models
+from odoo.addons import decimal_precision as dp
 
-import openerp.addons.decimal_precision as dp
 
-class hr_contract_be(osv.osv):
+class HrContract(models.Model):
     _inherit = 'hr.contract'
 
-    _columns = {
-        'travel_reimbursement_amount': fields.float('Reimbursement of travel expenses', digits_compute=dp.get_precision('Payroll')),
-        'car_company_amount': fields.float('Company car employer', digits_compute=dp.get_precision('Payroll')),
-        'car_employee_deduction': fields.float('Company Car Deduction for Worker', digits_compute=dp.get_precision('Payroll')),
-        'misc_onss_deduction': fields.float('Miscellaneous exempt ONSS ', digits_compute=dp.get_precision('Payroll')),
-        'meal_voucher_amount': fields.float('Check Value Meal ', digits_compute=dp.get_precision('Payroll')),
-        'meal_voucher_employee_deduction': fields.float('Check Value Meal - by worker ', digits_compute=dp.get_precision('Payroll')),
-        'insurance_employee_deduction': fields.float('Insurance Group - by worker ', digits_compute=dp.get_precision('Payroll')),
-        'misc_advantage_amount': fields.float('Benefits of various nature ', digits_compute=dp.get_precision('Payroll')),
-        'additional_net_amount': fields.float('Net supplements', digits_compute=dp.get_precision('Payroll')),
-        'retained_net_amount': fields.float('Net retained ', digits_compute=dp.get_precision('Payroll')),
-    }
+    travel_reimbursement_amount = fields.Float(string='Reimbursement of travel expenses', digits_compute=dp.get_precision('Payroll'))
+    car_company_amount = fields.Float(string='Company car employer', digits_compute=dp.get_precision('Payroll'))
+    car_employee_deduction = fields.Float(string='Company Car Deduction for Worker', digits_compute=dp.get_precision('Payroll'))
+    misc_onss_deduction = fields.Float(string='Miscellaneous exempt ONSS', digits_compute=dp.get_precision('Payroll'))
+    meal_voucher_amount = fields.Float(string='Check Value Meal', digits_compute=dp.get_precision('Payroll'))
+    meal_voucher_employee_deduction = fields.Float(string='Check Value Meal - by worker', digits_compute=dp.get_precision('Payroll'))
+    insurance_employee_deduction = fields.Float(string='Insurance Group - by worker', digits_compute=dp.get_precision('Payroll'))
+    misc_advantage_amount = fields.Float(string='Benefits of various nature', digits_compute=dp.get_precision('Payroll'))
+    additional_net_amount = fields.Float(string='Net supplements', digits_compute=dp.get_precision('Payroll'))
+    retained_net_amount = fields.Float('Net retained ', digits_compute=dp.get_precision('Payroll'))
 
 
-class hr_employee_be(osv.osv):
+class HrEmployee(models.Model):
     _inherit = 'hr.employee'
 
-    _columns = {
-        'spouse_fiscal_status': fields.selection([('without income','Without Income'),('with income','With Income')], 'Tax status for spouse'),
-        'disabled_spouse_bool': fields.boolean('Disabled Spouse', help="if recipient spouse is declared disabled by law"),
-        'disabled_children_bool': fields.boolean('Disabled Children', help="if recipient children is/are declared disabled by law"),
-        'resident_bool': fields.boolean('Nonresident', help="if recipient lives in a foreign country"),
-        'disabled_children_number': fields.integer('Number of disabled children'),
-    }
+    spouse_fiscal_status = fields.Selection([('without income','Without Income'),('with income','With Income')], string='Tax status for spouse')
+    disabled_spouse_bool = fields.Boolean(string='Disabled Spouse', help='if recipient spouse is declared disabled by law')
+    disabled_children_bool = fields.Boolean(string='Disabled Children', help='if recipient children is/are declared disabled by law')
+    resident_bool = fields.Boolean(string='Nonresident', help='if recipient lives in a foreign country')
+    disabled_children_number = fields.Integer('Number of disabled children')
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 b1951a2a032..7cf651f8019 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
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
+<odoo>
         <record id="hr_contract_form_l10n_be_inherit" model="ir.ui.view">
             <field name="name">hr.contract.form.inherit</field>
             <field name="model">hr.contract</field>
@@ -24,17 +23,6 @@
             </field>
         </record>
 
-       <!-- <record id="view_employee_marital_required_form" model="ir.ui.view">
-            <field name="name">hr.employee.inherit.form</field>
-            <field name="model">hr.employee</field>
-            <field name="priority">25</field>
-            <field name="inherit_id" ref="hr.view_employee_form"/>
-            <field name="arch" type="xml">
-                <field name="marital" position="replace">
-                </field>
-            </field>
-        </record> -->
-
         <record id="hr_employee_form__l10n_be_view_for" model="ir.ui.view">
             <field name="name">hr.employee.inherit.form</field>
             <field name="model">hr.employee</field>
@@ -56,5 +44,4 @@
             </data>
             </field>
         </record>
-    </data>
-</openerp>
+</odoo>