diff --git a/payroll/__manifest__.py b/payroll/__manifest__.py
index 79bebeeb..765f92df 100644
--- a/payroll/__manifest__.py
+++ b/payroll/__manifest__.py
@@ -2,7 +2,7 @@
 
 {
     "name": "Payroll",
-    "version": "14.0.5.5.1",
+    "version": "15.0.1.0.0",
     "category": "Human Resources",
     "website": "https://github.com/OCA/payroll",
     "sequence": 38,
diff --git a/payroll/data/hr_payroll_data.xml b/payroll/data/hr_payroll_data.xml
index c3adfdd0..1984a026 100644
--- a/payroll/data/hr_payroll_data.xml
+++ b/payroll/data/hr_payroll_data.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-    <data noupdate="1">
-        <!-- Decimal Precision -->
-        <record forcecreate="True" id="decimal_payroll" model="decimal.precision">
-            <field name="name">Payroll</field>
-            <field name="digits">2</field>
-        </record>
-        <record forcecreate="True" id="decimal_payroll_rate" model="decimal.precision">
-            <field name="name">Payroll Rate</field>
-            <field name="digits">4</field>
-        </record>
-    </data>
+<odoo noupdate="1">
+    <!-- Decimal Precision -->
+    <record forcecreate="True" id="decimal_payroll" model="decimal.precision">
+        <field name="name">Payroll</field>
+        <field name="digits">2</field>
+    </record>
+    <record forcecreate="True" id="decimal_payroll_rate" model="decimal.precision">
+        <field name="name">Payroll Rate</field>
+        <field name="digits">4</field>
+    </record>
 </odoo>
diff --git a/payroll/data/hr_payroll_sequence.xml b/payroll/data/hr_payroll_sequence.xml
index b0e75db8..ae5e10e3 100644
--- a/payroll/data/hr_payroll_sequence.xml
+++ b/payroll/data/hr_payroll_sequence.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-    <data noupdate="1">
-        <record id="seq_salary_slip" model="ir.sequence">
-            <field name="name">Salary Slip</field>
-            <field name="code">salary.slip</field>
-            <field name="prefix">SLIP/</field>
-            <field name="padding">3</field>
-        </record>
-    </data>
+<odoo noupdate="1">
+    <record id="seq_salary_slip" model="ir.sequence">
+        <field name="name">Salary Slip</field>
+        <field name="code">salary.slip</field>
+        <field name="prefix">SLIP/</field>
+        <field name="padding">3</field>
+    </record>
 </odoo>
diff --git a/payroll/demo/hr_payroll_demo.xml b/payroll/demo/hr_payroll_demo.xml
index 4e987a1a..a5cdc887 100644
--- a/payroll/demo/hr_payroll_demo.xml
+++ b/payroll/demo/hr_payroll_demo.xml
@@ -192,7 +192,6 @@ ref('hr_salary_rule_convanceallowance1'),ref('hr_salary_rule_professionaltax1'),
         <field name="company_id" ref="base.main_company" />
         <field eval="1" name="active" />
         <field name="name">Roger Scott</field>
-        <field name="work_location">Building 1, Second Floor</field>
         <field name="work_phone">+3282823500</field>
         <field
             name="image_1920"
diff --git a/payroll/models/hr_employee.py b/payroll/models/hr_employee.py
index 7b23ea39..68c4497b 100644
--- a/payroll/models/hr_employee.py
+++ b/payroll/models/hr_employee.py
@@ -12,7 +12,6 @@ class HrEmployee(models.Model):
     )
     payslip_count = fields.Integer(
         compute="_compute_payslip_count",
-        string="Payslip Count",
         groups="payroll.group_payroll_user",
     )
 
diff --git a/payroll/models/hr_payslip.py b/payroll/models/hr_payslip.py
index 9e0a6380..e40effaf 100644
--- a/payroll/models/hr_payslip.py
+++ b/payroll/models/hr_payslip.py
@@ -57,7 +57,6 @@ class HrPayslip(models.Model):
         states={"draft": [("readonly", False)]},
     )
     date_from = fields.Date(
-        string="Date From",
         readonly=True,
         required=True,
         default=lambda self: fields.Date.to_string(date.today().replace(day=1)),
@@ -65,7 +64,6 @@ class HrPayslip(models.Model):
         tracking=True,
     )
     date_to = fields.Date(
-        string="Date To",
         readonly=True,
         required=True,
         default=lambda self: fields.Date.to_string(
@@ -149,10 +147,8 @@ class HrPayslip(models.Model):
     dynamic_filtered_payslip_lines = fields.One2many(
         "hr.payslip.line",
         compute="_compute_dynamic_filtered_payslip_lines",
-        string="Dynamic Filtered Payslip Lines",
     )
     credit_note = fields.Boolean(
-        string="Credit Note",
         readonly=True,
         states={"draft": [("readonly", False)]},
         help="Indicates this payslip has a refund of another",
@@ -168,16 +164,14 @@ class HrPayslip(models.Model):
     payslip_count = fields.Integer(
         compute="_compute_payslip_count", string="Payslip Computation Details"
     )
-    hide_child_lines = fields.Boolean(string="Hide Child Lines", default=False)
-    compute_date = fields.Date("Compute Date")
+    hide_child_lines = fields.Boolean(default=False)
+    compute_date = fields.Date()
     refunded_id = fields.Many2one(
         "hr.payslip", string="Refunded Payslip", readonly=True
     )
-    allow_cancel_payslips = fields.Boolean(
-        "Allow Cancel Payslips", compute="_compute_allow_cancel_payslips"
-    )
+    allow_cancel_payslips = fields.Boolean(compute="_compute_allow_cancel_payslips")
     prevent_compute_on_confirm = fields.Boolean(
-        "Prevent Compute on Confirm", compute="_compute_prevent_compute_on_confirm"
+        compute="_compute_prevent_compute_on_confirm"
     )
 
     def _compute_prevent_compute_on_confirm(self):
@@ -364,7 +358,7 @@ def _compute_leave_days(self, contract, day_from, day_to):
                 {
                     "name": holiday.holiday_status_id.name or _("Global Leaves"),
                     "sequence": 5,
-                    "code": holiday.holiday_status_id.code or "GLOBAL",
+                    "code": holiday.holiday_status_id.name or "GLOBAL",
                     "number_of_days": 0.0,
                     "number_of_hours": 0.0,
                     "contract_id": contract.id,
@@ -393,7 +387,7 @@ def _compute_worked_days(self, contract, day_from, day_to):
         of the payslip. This returns the FULL work days expected for the resource
         calendar selected for the employee (it don't substract leaves by default).
         """
-        work_data = contract.employee_id._get_work_days_data(
+        work_data = contract.employee_id._get_work_days_data_batch(
             day_from,
             day_to,
             calendar=contract.resource_calendar_id,
@@ -403,8 +397,8 @@ def _compute_worked_days(self, contract, day_from, day_to):
             "name": _("Normal Working Days paid at 100%"),
             "sequence": 1,
             "code": "WORK100",
-            "number_of_days": work_data["days"],
-            "number_of_hours": work_data["hours"],
+            "number_of_days": work_data[contract.employee_id.id]["days"],
+            "number_of_hours": work_data[contract.employee_id.id]["hours"],
             "contract_id": contract.id,
         }
 
@@ -780,15 +774,17 @@ def onchange_employee(self):
 
     def _compute_name(self):
         for record in self:
-            record.name = _("Salary Slip of %s for %s") % (
-                record.employee_id.name,
-                tools.ustr(
-                    babel.dates.format_date(
-                        date=datetime.combine(record.date_from, time.min),
-                        format="MMMM-y",
-                        locale=record.env.context.get("lang") or "en_US",
-                    )
-                ),
+            record.name = _("Salary Slip of %(name)s for %(date)s") % (
+                {
+                    "name": record.employee_id.name,
+                    "date": tools.ustr(
+                        babel.dates.format_date(
+                            date=datetime.combine(record.date_from, time.min),
+                            format="MMMM-y",
+                            locale=record.env.context.get("lang") or "en_US",
+                        )
+                    ),
+                }
             )
 
     @api.onchange("contract_id")
diff --git a/payroll/models/hr_payslip_line.py b/payroll/models/hr_payslip_line.py
index 3f3326ed..9003baf5 100644
--- a/payroll/models/hr_payslip_line.py
+++ b/payroll/models/hr_payslip_line.py
@@ -36,7 +36,6 @@ class HrPayslipLine(models.Model):
     quantity = fields.Float(digits="Payroll", default=1.0)
     total = fields.Float(
         compute="_compute_total",
-        string="Total",
         digits="Payroll",
         store=True,
     )
@@ -62,8 +61,8 @@ def _compute_parent_line_id(self):
                 )
                 if parent_line and len(parent_line) > 1:
                     raise UserError(
-                        _("Recursion error. Only one line should be parent of %s")
-                        % line.parent_rule_id.name
+                        _("Recursion error. Only one line should be parent of %(name)s")
+                        % {"name": line.parent_rule_id.name}
                     )
                 line.parent_line_id = (
                     parent_line[0].id if len(parent_line) == 1 else False
diff --git a/payroll/models/hr_payslip_run.py b/payroll/models/hr_payslip_run.py
index aab8233d..f794d19d 100644
--- a/payroll/models/hr_payslip_run.py
+++ b/payroll/models/hr_payslip_run.py
@@ -46,7 +46,6 @@ class HrPayslipRun(models.Model):
         + relativedelta(months=+1, day=1, days=-1),
     )
     credit_note = fields.Boolean(
-        string="Credit Note",
         readonly=True,
         states={"draft": [("readonly", False)]},
         help="If its checked, indicates that all payslips generated from here "
diff --git a/payroll/models/hr_rule_parameter.py b/payroll/models/hr_rule_parameter.py
index 28768b20..d0d00083 100644
--- a/payroll/models/hr_rule_parameter.py
+++ b/payroll/models/hr_rule_parameter.py
@@ -13,7 +13,7 @@ class HrSalaryRuleParameterValue(models.Model):
         "hr.rule.parameter", required=True, ondelete="cascade"
     )
     code = fields.Char(related="rule_parameter_id.code", store=True, readonly=True)
-    date_from = fields.Date(string="Date From", required=True)
+    date_from = fields.Date(required=True)
     parameter_value = fields.Text(help="Python Code")
     country_id = fields.Many2one(related="rule_parameter_id.country_id")
     company_id = fields.Many2one(related="rule_parameter_id.company_id")
@@ -33,7 +33,7 @@ class HrSalaryRuleParameter(models.Model):
 
     name = fields.Char(required=True)
     code = fields.Char(required=True)
-    description = fields.Text("Description")
+    description = fields.Text()
     country_id = fields.Many2one(
         "res.country",
         string="Country",
@@ -62,7 +62,8 @@ def _get_parameter_from_code(self, code, date=None):
             return ast.literal_eval(rule_parameter.parameter_value)
         else:
             raise UserError(
-                _("No rule parameter with code '%s' was found for %s ") % (code, date)
+                _("No rule parameter with code '%(code)s' was found for %(date)d ")
+                % ({"code": code, "date": date})
             )
 
     _sql_constraints = [
diff --git a/payroll/models/hr_salary_rule.py b/payroll/models/hr_salary_rule.py
index a360d595..c46543d3 100644
--- a/payroll/models/hr_salary_rule.py
+++ b/payroll/models/hr_salary_rule.py
@@ -206,11 +206,11 @@ def _compute_rule_fix(self, localdict):
                 "rate": 100.0,
                 "amount": self.amount_fix,
             }
-        except Exception:
+        except Exception as ex:
             raise UserError(
-                _("Wrong quantity defined for salary rule %s (%s).")
-                % (self.name, self.code)
-            )
+                _("Wrong quantity defined for salary rule %(name)s (%(code)s).")
+                % {"name": self.name, "code": self.code}
+            ) from ex
 
     def _compute_rule_percentage(self, localdict):
         try:
@@ -220,14 +220,14 @@ def _compute_rule_percentage(self, localdict):
                 "rate": self.amount_percentage,
                 "amount": float(safe_eval(self.amount_percentage_base, localdict)),
             }
-        except Exception:
+        except Exception as ex:
             raise UserError(
                 _(
                     "Wrong percentage base or quantity defined for salary "
-                    "rule %s (%s)."
+                    "rule %(name)s (%(code)s)."
                 )
-                % (self.name, self.code)
-            )
+                % {"name": self.name, "code": self.code}
+            ) from ex
 
     def _compute_rule_code(self, localdict):
         try:
@@ -237,14 +237,14 @@ def _compute_rule_code(self, localdict):
             raise UserError(
                 _(
                     """
-Wrong python code defined for salary rule %s (%s).
+Wrong python code defined for salary rule %(name)s (%(code)s).
 Here is the error received:
 
-%s
+%(err)s
 """
                 )
-                % (self.name, self.code, repr(ex))
-            )
+                % {"name": self.name, "code": self.code, "err": repr(ex)}
+            ) from ex
 
     def _get_rule_dict(self, localdict):
         name = localdict.get("result_name") or self.name
@@ -276,11 +276,11 @@ def _satisfy_condition_range(self, localdict):
             return (
                 self.condition_range_min <= result <= self.condition_range_max or False
             )
-        except Exception:
+        except Exception as ex:
             raise UserError(
-                _("Wrong range condition defined for salary rule %s (%s).")
-                % (self.name, self.code)
-            )
+                _("Wrong range condition defined for salary rule %(name)s (%(code)s).")
+                % {"name": self.name, "code": self.code}
+            ) from ex
 
     def _satisfy_condition_python(self, localdict):
         try:
@@ -290,11 +290,11 @@ def _satisfy_condition_python(self, localdict):
             raise UserError(
                 _(
                     """
-Wrong python condition defined for salary rule %s (%s).
+Wrong python condition defined for salary rule %(name)s (%(code)s).
 Here is the error received:
 
-%s
+%(err)s
 """
                 )
-                % (self.name, self.code, repr(ex))
-            )
+                % {"name": self.name, "code": self.code, "err": repr(ex)}
+            ) from ex
diff --git a/payroll/security/hr_payroll_security.xml b/payroll/security/hr_payroll_security.xml
index 2ccfdcf7..bfc327ef 100644
--- a/payroll/security/hr_payroll_security.xml
+++ b/payroll/security/hr_payroll_security.xml
@@ -1,87 +1,85 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-    <data noupdate="1">
-        <record model="ir.module.category" id="module_category_payroll">
-            <field name="name">Payroll</field>
-            <field name="description">Manage employee payroll</field>
-            <field name="sequence">16</field>
-        </record>
-        <record id="group_payroll_user" model="res.groups">
-            <field name="name">Officer</field>
-            <field name="category_id" ref="module_category_payroll" />
-            <field
-                name="implied_ids"
-                eval="[(4, ref('hr.group_hr_user')), (4, ref('hr_contract.group_hr_contract_manager'))]"
-            />
-        </record>
-        <record id="group_payroll_manager" model="res.groups">
-            <field name="name">Manager</field>
-            <field name="category_id" ref="module_category_payroll" />
-            <field name="implied_ids" eval="[(4, ref('payroll.group_payroll_user'))]" />
-            <field
-                name="users"
-                eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"
-            />
-        </record>
-        <record id="base.default_user" model="res.users">
-            <field name="groups_id" eval="[(4,ref('payroll.group_payroll_manager'))]" />
-        </record>
-        <record id="hr_payroll_rule_officer" model="ir.rule">
-            <field name="name">Officer and subordinates Payslip</field>
-            <field name="model_id" ref="model_hr_payslip" />
-            <field name="domain_force">
-                ['|','|', ('employee_id.user_id', '=', user.id),
-                ('employee_id.department_id', '=', False),
-                ('employee_id.department_id.manager_id.user_id', '=', user.id)]
-            </field>
-            <field name="groups" eval="[(4, ref('payroll.group_payroll_user'))]" />
-        </record>
-        <record id="hr_payslip_rule_manager" model="ir.rule">
-            <field name="name">All Payslip</field>
-            <field name="model_id" ref="model_hr_payslip" />
-            <field name="domain_force">[(1,'=',1)]</field>
-            <field name="groups" eval="[(4, ref('payroll.group_payroll_manager'))]" />
-        </record>
-        <!-- Company-restricted Records -->
-        <record model="ir.rule" id="hr_payslip_rule_company">
-            <field name="name">Payslip: multi-company</field>
-            <field name="model_id" ref="model_hr_payslip" />
-            <field name="global" eval="True" />
-            <field name="domain_force">
-                ['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]
-            </field>
-        </record>
-        <record model="ir.rule" id="hr_payroll_structure_rule_company">
-            <field name="name">Payroll Structure: multi-company</field>
-            <field name="model_id" ref="model_hr_payroll_structure" />
-            <field name="global" eval="True" />
-            <field name="domain_force">
-                ['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]
-            </field>
-        </record>
-        <record model="ir.rule" id="hr_salary_rule_company">
-            <field name="name">Salary Rule: multi-company</field>
-            <field name="model_id" ref="model_hr_salary_rule" />
-            <field name="global" eval="True" />
-            <field name="domain_force">
-                ['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]
-            </field>
-        </record>
-        <record model="ir.rule" id="hr_salary_category_rule_company">
-            <field name="name">Salary Rule Category: multi-company</field>
-            <field name="model_id" ref="model_hr_salary_rule_category" />
-            <field name="global" eval="True" />
-            <field name="domain_force">
-                ['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]
-            </field>
-        </record>
-        <record model="ir.rule" id="hr_contribution_register_rule_company">
-            <field name="name">Contribution Register: multi-company</field>
-            <field name="model_id" ref="model_hr_contribution_register" />
-            <field name="global" eval="True" />
-            <field name="domain_force">
-                ['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]
-            </field>
-        </record>
-    </data>
+<odoo noupdate="1">
+    <record model="ir.module.category" id="module_category_payroll">
+        <field name="name">Payroll</field>
+        <field name="description">Manage employee payroll</field>
+        <field name="sequence">16</field>
+    </record>
+    <record id="group_payroll_user" model="res.groups">
+        <field name="name">Officer</field>
+        <field name="category_id" ref="module_category_payroll" />
+        <field
+            name="implied_ids"
+            eval="[(4, ref('hr.group_hr_user')), (4, ref('hr_contract.group_hr_contract_manager'))]"
+        />
+    </record>
+    <record id="group_payroll_manager" model="res.groups">
+        <field name="name">Manager</field>
+        <field name="category_id" ref="module_category_payroll" />
+        <field name="implied_ids" eval="[(4, ref('payroll.group_payroll_user'))]" />
+        <field
+            name="users"
+            eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"
+        />
+    </record>
+    <record id="base.default_user" model="res.users">
+        <field name="groups_id" eval="[(4,ref('payroll.group_payroll_manager'))]" />
+    </record>
+    <record id="hr_payroll_rule_officer" model="ir.rule">
+        <field name="name">Officer and subordinates Payslip</field>
+        <field name="model_id" ref="model_hr_payslip" />
+        <field name="domain_force">
+            ['|','|', ('employee_id.user_id', '=', user.id),
+            ('employee_id.department_id', '=', False),
+            ('employee_id.department_id.manager_id.user_id', '=', user.id)]
+        </field>
+        <field name="groups" eval="[(4, ref('payroll.group_payroll_user'))]" />
+    </record>
+    <record id="hr_payslip_rule_manager" model="ir.rule">
+        <field name="name">All Payslip</field>
+        <field name="model_id" ref="model_hr_payslip" />
+        <field name="domain_force">[(1,'=',1)]</field>
+        <field name="groups" eval="[(4, ref('payroll.group_payroll_manager'))]" />
+    </record>
+    <!-- Company-restricted Records -->
+    <record model="ir.rule" id="hr_payslip_rule_company">
+        <field name="name">Payslip: multi-company</field>
+        <field name="model_id" ref="model_hr_payslip" />
+        <field name="global" eval="True" />
+        <field name="domain_force">
+            ['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]
+        </field>
+    </record>
+    <record model="ir.rule" id="hr_payroll_structure_rule_company">
+        <field name="name">Payroll Structure: multi-company</field>
+        <field name="model_id" ref="model_hr_payroll_structure" />
+        <field name="global" eval="True" />
+        <field name="domain_force">
+            ['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]
+        </field>
+    </record>
+    <record model="ir.rule" id="hr_salary_rule_company">
+        <field name="name">Salary Rule: multi-company</field>
+        <field name="model_id" ref="model_hr_salary_rule" />
+        <field name="global" eval="True" />
+        <field name="domain_force">
+            ['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]
+        </field>
+    </record>
+    <record model="ir.rule" id="hr_salary_category_rule_company">
+        <field name="name">Salary Rule Category: multi-company</field>
+        <field name="model_id" ref="model_hr_salary_rule_category" />
+        <field name="global" eval="True" />
+        <field name="domain_force">
+            ['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]
+        </field>
+    </record>
+    <record model="ir.rule" id="hr_contribution_register_rule_company">
+        <field name="name">Contribution Register: multi-company</field>
+        <field name="model_id" ref="model_hr_contribution_register" />
+        <field name="global" eval="True" />
+        <field name="domain_force">
+            ['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]
+        </field>
+    </record>
 </odoo>
diff --git a/payroll/tests/common.py b/payroll/tests/common.py
index 7cfb495d..ffe173bc 100644
--- a/payroll/tests/common.py
+++ b/payroll/tests/common.py
@@ -11,6 +11,7 @@ def setUp(self):
 
         self.CalendarAttendance = self.env["resource.calendar.attendance"]
         self.Contract = self.env["hr.contract"]
+        self.ContributionRegister = self.env["hr.contribution.register"]
         self.Department = self.env["hr.department"]
         self.PayrollStructure = self.env["hr.payroll.structure"]
         self.Payslip = self.env["hr.payslip"]
@@ -177,6 +178,12 @@ def setUp(self):
             }
         )
 
+        # Contribution Registers
+        #
+        self.register_hra = self.ContributionRegister.create(
+            {"name": "House Rent Allowance"}
+        )
+
         # I create a new employee "Richard"
         self.richard_emp = self.env["hr.employee"].create(
             {
diff --git a/payroll/tests/test_hr_payroll_cancel.py b/payroll/tests/test_hr_payroll_cancel.py
index bbb35a14..5ad8723b 100644
--- a/payroll/tests/test_hr_payroll_cancel.py
+++ b/payroll/tests/test_hr_payroll_cancel.py
@@ -25,7 +25,6 @@ def setUp(self):
             }
         )
         self.hr_employee_anita = self.env.ref("hr.employee_mit")
-        self.hr_structure_marketing_executive = self.ref("payroll.structure_001")
         self.hr_contract_anita = self.env.ref("hr_contract.hr_contract_mit")
         self.hr_payslip = self.env["hr.payslip"].create(
             {
@@ -69,16 +68,16 @@ def _create_payslip(self):
             [("payslip_id", "=", self.hr_payslip.id)]
         )
         payslip_input.write({"amount": 5.0})
-        context = {
-            "lang": "en_US",
-            "tz": False,
-            "active_model": "hr.payslip",
-            "department_id": False,
-            "active_ids": [self.payslip_action_id],
-            "section_id": False,
-            "active_id": self.payslip_action_id,
-        }
-        self.hr_payslip.with_context(context).compute_sheet()
+        self.hr_payslip.with_context(
+            {},
+            lang="en_US",
+            tz=False,
+            active_model="hr.payslip",
+            department_id=False,
+            active_ids=[self.payslip_action_id],
+            section_id=False,
+            active_id=self.payslip_action_id,
+        ).compute_sheet()
         return self.hr_payslip
 
     def test_action_payslip_cancel(self):
diff --git a/payroll/tests/test_hr_payslip_change_state.py b/payroll/tests/test_hr_payslip_change_state.py
index 4176d56c..e137f22a 100644
--- a/payroll/tests/test_hr_payslip_change_state.py
+++ b/payroll/tests/test_hr_payslip_change_state.py
@@ -15,8 +15,9 @@ def setUp(self):
     def test_change_state(self):
         hr_payslip = self._create_payslip()
         tested_model = self.tested_model
-        context = {"active_ids": [hr_payslip.id]}
-        action = tested_model.with_context(context).create({"state": "verify"})
+        action = tested_model.with_context(active_ids=[hr_payslip.id]).create(
+            {"state": "verify"}
+        )
         # By default, a payslip is on draft state
         action.change_state_confirm()
         # trying to set it to wrong states
diff --git a/payroll/tests/test_hr_payslip_worked_days.py b/payroll/tests/test_hr_payslip_worked_days.py
index dbb311cf..7c365b77 100644
--- a/payroll/tests/test_hr_payslip_worked_days.py
+++ b/payroll/tests/test_hr_payslip_worked_days.py
@@ -18,8 +18,7 @@ def setUp(self):
         self.holiday_type = self.LeaveType.create(
             {
                 "name": "TestLeaveType",
-                "code": "TESTLV",
-                "allocation_type": "no",
+                "allocation_validation_type": "no",
                 "leave_validation_type": "no_validation",
             }
         )
@@ -89,10 +88,10 @@ def test_worked_days_negative(self):
 
         worked_days_codes = richard_payslip.worked_days_line_ids.mapped("code")
         self.assertIn(
-            "TESTLV", worked_days_codes, "The leave is in the 'Worked Days' list"
+            "TestLeaveType", worked_days_codes, "The leave is in the 'Worked Days' list"
         )
         wdl_ids = richard_payslip.worked_days_line_ids.filtered(
-            lambda x: x.code == "TESTLV"
+            lambda x: x.code == "TestLeaveType"
         )
         self.assertEqual(len(wdl_ids), 1, "There is only one line matching the leave")
         self.assertEqual(
@@ -122,10 +121,10 @@ def test_leaves_positive(self):
 
         worked_days_codes = richard_payslip.worked_days_line_ids.mapped("code")
         self.assertIn(
-            "TESTLV", worked_days_codes, "The leave is in the 'Worked Days' list"
+            "TestLeaveType", worked_days_codes, "The leave is in the 'Worked Days' list"
         )
         wdl_ids = richard_payslip.worked_days_line_ids.filtered(
-            lambda x: x.code == "TESTLV"
+            lambda x: x.code == "TestLeaveType"
         )
         self.assertEqual(len(wdl_ids), 1, "There is only one line matching the leave")
         self.assertEqual(
diff --git a/payroll/tests/test_hr_salary_rule.py b/payroll/tests/test_hr_salary_rule.py
index b04f323b..28fc598d 100644
--- a/payroll/tests/test_hr_salary_rule.py
+++ b/payroll/tests/test_hr_salary_rule.py
@@ -14,7 +14,7 @@ def setUp(self):
             {
                 "name": "test rule",
                 "code": "TEST",
-                "category_id": self.env.ref("payroll.ALW").id,
+                "category_id": self.categ_alw.id,
                 "sequence": 6,
                 "amount_select": "code",
                 "amount_python_compute": "result = 0",
diff --git a/payroll/tests/test_payslip_flow.py b/payroll/tests/test_payslip_flow.py
index 18f7ed5d..e1420120 100644
--- a/payroll/tests/test_payslip_flow.py
+++ b/payroll/tests/test_payslip_flow.py
@@ -42,17 +42,17 @@ def test_00_payslip_flow(self):
         # I verify the payslip is in draft state
         self.assertEqual(richard_payslip.state, "draft", "State not changed!")
 
-        context = {
-            "lang": "en_US",
-            "tz": False,
-            "active_model": "ir.ui.menu",
-            "department_id": False,
-            "section_id": False,
-            "active_ids": [self.ref("payroll.hr_payslip_menu")],
-            "active_id": self.ref("payroll.hr_payslip_menu"),
-        }
         # I click on 'Compute Sheet' button on payslip
-        richard_payslip.with_context(context).compute_sheet()
+        richard_payslip.with_context(
+            {},
+            lang="en_US",
+            tz=False,
+            active_model="ir.ui.menu",
+            department_id=False,
+            section_id=False,
+            active_ids=[self.ref("payroll.hr_payslip_menu")],
+            active_id=self.ref("payroll.hr_payslip_menu"),
+        ).compute_sheet()
 
         # Check child rules shown in table by default
         child_line = richard_payslip.dynamic_filtered_payslip_lines.filtered(
@@ -154,7 +154,7 @@ def test_00_payslip_flow(self):
         # I print the contribution register report
         context = {
             "model": "hr.contribution.register",
-            "active_ids": [self.ref("payroll.hr_houserent_register")],
+            "active_ids": [self.register_hra.id],
         }
         test_reports.try_report_action(
             self.env.cr,
diff --git a/payroll/views/hr_contract_views.xml b/payroll/views/hr_contract_views.xml
index 0be6baf9..e7802cf8 100644
--- a/payroll/views/hr_contract_views.xml
+++ b/payroll/views/hr_contract_views.xml
@@ -5,14 +5,12 @@
         <field name="model">hr.contract</field>
         <field name="inherit_id" ref="hr_contract.hr_contract_view_form" />
         <field name="arch" type="xml">
-            <xpath expr="//group[@name='salary_and_advantages']" position="inside">
+            <xpath expr="//group[@name='salary']" position="inside">
+                <field name="schedule_pay" />
                 <field name="struct_id" required="1" />
                 <field name="company_id" groups="base.group_multi_company" />
                 <field name="currency_id" invisible="1" />
             </xpath>
-            <xpath expr="//field[@name='wage']" position="after">
-                <field name="schedule_pay" />
-            </xpath>
         </field>
     </record>
 </odoo>
diff --git a/payroll/views/hr_contribution_register_views.xml b/payroll/views/hr_contribution_register_views.xml
index 6a11d79c..cae969bd 100644
--- a/payroll/views/hr_contribution_register_views.xml
+++ b/payroll/views/hr_contribution_register_views.xml
@@ -4,7 +4,7 @@
         <field name="name">hr.contribution.register.tree</field>
         <field name="model">hr.contribution.register</field>
         <field name="arch" type="xml">
-            <tree string="Contribution Registers">
+            <tree>
                 <field name="name" />
                 <field
                     name="company_id"
diff --git a/payroll/views/hr_payroll_structure_views.xml b/payroll/views/hr_payroll_structure_views.xml
index fff73985..df682fda 100644
--- a/payroll/views/hr_payroll_structure_views.xml
+++ b/payroll/views/hr_payroll_structure_views.xml
@@ -4,7 +4,7 @@
         <field name="name">hr.payroll.structure.tree</field>
         <field name="model">hr.payroll.structure</field>
         <field name="arch" type="xml">
-            <tree string="Employee Function">
+            <tree>
                 <field name="name" />
                 <field name="code" />
                 <field name="rule_ids" />
@@ -21,7 +21,7 @@
         <field name="model">hr.payroll.structure</field>
         <field name="field_parent">children_ids</field>
         <field name="arch" type="xml">
-            <tree string="Salary Structure">
+            <tree>
                 <field name="name" />
                 <field name="code" />
                 <field
diff --git a/payroll/views/hr_payslip_line_views.xml b/payroll/views/hr_payslip_line_views.xml
index fa3268e5..4b9cbed3 100644
--- a/payroll/views/hr_payslip_line_views.xml
+++ b/payroll/views/hr_payslip_line_views.xml
@@ -4,11 +4,7 @@
         <field name="name">hr.payslip.line.tree</field>
         <field name="model">hr.payslip.line</field>
         <field name="arch" type="xml">
-            <tree
-                string="Salary Structure"
-                editable="bottom"
-                decoration-info="total == 0"
-            >
+            <tree editable="bottom" decoration-info="total == 0">
 
                 <field name="allow_edit_payslip_lines" invisible="1" />
                 <field name="category_id" />
@@ -39,7 +35,7 @@
         <field name="name">hr.payslip.line.form</field>
         <field name="model">hr.payslip.line</field>
         <field name="arch" type="xml">
-            <form string="Payslip Line">
+            <form>
                 <h2>
                     <field name="slip_id" readonly="1" />
                 </h2>
@@ -77,7 +73,6 @@
                         <group>
                             <field name="child_ids" readonly="1" nolabel="1">
                                 <tree
-                                    string="Child Salary Structure"
                                     editable="false"
                                     decoration-info="total == 0"
                                     decoration-bf="parent_line_id == False"
diff --git a/payroll/views/hr_payslip_run_views.xml b/payroll/views/hr_payslip_run_views.xml
index 491d00f6..0a62c78c 100644
--- a/payroll/views/hr_payslip_run_views.xml
+++ b/payroll/views/hr_payslip_run_views.xml
@@ -31,7 +31,6 @@
             <tree
                 decoration-info="state in ('confirm','hr_check','accont_check')"
                 decoration-muted="state == 'cancel'"
-                string="Payslips Batches"
                 multi_edit="1"
                 sample="1"
             >
diff --git a/payroll/views/hr_payslip_views.xml b/payroll/views/hr_payslip_views.xml
index 493f0ffb..8774f01d 100644
--- a/payroll/views/hr_payslip_views.xml
+++ b/payroll/views/hr_payslip_views.xml
@@ -4,12 +4,7 @@
         <field name="name">hr.payslip.tree</field>
         <field name="model">hr.payslip</field>
         <field name="arch" type="xml">
-            <tree
-                decoration-muted="state == 'cancel'"
-                string="Payslips"
-                multi_edit="1"
-                sample="1"
-            >
+            <tree decoration-muted="state == 'cancel'" multi_edit="1" sample="1">
                 <field name="number" readonly="1" decoration-bf="1" />
                 <field name="employee_id" readonly="1" />
                 <field name="name" />
@@ -77,7 +72,7 @@
         <field name="name">hr.payslip.form</field>
         <field name="model">hr.payslip</field>
         <field name="arch" type="xml">
-            <form string="Payslip">
+            <form>
                 <header>
                     <field name="allow_cancel_payslips" invisible="1" />
                     <button
@@ -194,7 +189,7 @@
                         <page name="input" string="Worked Days &amp; Inputs">
                             <separator name="worked" string="Worked Days" />
                             <field name="worked_days_line_ids">
-                                <tree string="Worked Days" editable="bottom">
+                                <tree editable="bottom">
                                     <field name="name" />
                                     <field name="code" />
                                     <field name="number_of_days" />
@@ -206,7 +201,7 @@
                                     />
                                     <field name="sequence" invisible="True" />
                                 </tree>
-                                <form string="Worked Day">
+                                <form>
                                     <group col="4">
                                         <field name="name" />
                                         <field name="code" />
@@ -219,7 +214,7 @@
                             </field>
                             <separator name="other" string="Other Inputs" />
                             <field name="input_line_ids" colspan="4" nolabel="1">
-                                <tree string="Input Data" editable="bottom">
+                                <tree editable="bottom">
                                     <field name="name" />
                                     <field name="code" />
                                     <field name="amount_qty" />
@@ -231,7 +226,7 @@
                                     />
                                     <field name="sequence" invisible="True" />
                                 </tree>
-                                <form string="Payslip Line">
+                                <form>
                                     <group col="4">
                                         <field name="name" />
                                         <field name="code" />
@@ -255,7 +250,6 @@
                                 nolabel="1"
                             >
                                 <tree
-                                    string="Salary Structure"
                                     decoration-info="total == 0 and appears_on_payslip == True"
                                     decoration-bf="parent_rule_id == False"
                                     decoration-it="parent_rule_id != False"
@@ -289,10 +283,7 @@
                         </page>
                         <page name="details" string="Salary rules apearing on payslip">
                             <field name="details_by_salary_rule_category">
-                                <tree
-                                    string="Payslip Lines"
-                                    decoration-info="total == 0"
-                                >
+                                <tree decoration-info="total == 0">
                                     <field name="category_id" decoration-bf="1" />
                                     <field name="code" widget="badge" />
                                     <field name="name" />
diff --git a/payroll/views/hr_salary_rule_category_views.xml b/payroll/views/hr_salary_rule_category_views.xml
index 69509ec4..1a15a9e4 100644
--- a/payroll/views/hr_salary_rule_category_views.xml
+++ b/payroll/views/hr_salary_rule_category_views.xml
@@ -42,7 +42,7 @@
         <field name="name">hr.salary.rule.category.tree</field>
         <field name="model">hr.salary.rule.category</field>
         <field name="arch" type="xml">
-            <tree string="Salary Rule Categories">
+            <tree>
                 <field name="name" />
                 <field name="code" />
                 <field name="parent_id" invisible="1" />
diff --git a/payroll/views/hr_salary_rule_views.xml b/payroll/views/hr_salary_rule_views.xml
index d644a948..0462fbb8 100644
--- a/payroll/views/hr_salary_rule_views.xml
+++ b/payroll/views/hr_salary_rule_views.xml
@@ -4,7 +4,7 @@
         <field name="name">hr.salary.rule.list</field>
         <field name="model">hr.salary.rule</field>
         <field name="arch" type="xml">
-            <tree string="Salary Rules">
+            <tree>
                 <field name="name" />
                 <field name="code" decoration-bf="1" />
                 <field name="category_id" widget="badge" />
@@ -53,7 +53,7 @@
         <field name="field_parent">child_ids</field>
         <field eval="20" name="priority" />
         <field name="arch" type="xml">
-            <tree string="Salary Rules">
+            <tree>
                 <field name="name" />
                 <field name="code" />
                 <field name="category_id" invisible="True" />
@@ -69,7 +69,7 @@
         <field name="name">hr.salary.rule.form</field>
         <field name="model">hr.salary.rule</field>
         <field name="arch" type="xml">
-            <form string="Salary Rules">
+            <form>
                 <div
                     class="alert alert-info oe_edit_only"
                     role="alert"
@@ -209,7 +209,7 @@
                         </page>
                         <page name="inputs" string="Inputs">
                             <field name="input_ids" mode="tree">
-                                <tree string="Input Data" editable="bottom">
+                                <tree editable="bottom">
                                     <field name="code" />
                                     <field name="name" />
                                 </tree>
diff --git a/payroll/wizard/hr_payroll_contribution_register_report.py b/payroll/wizard/hr_payroll_contribution_register_report.py
index 71328f17..9ca92402 100644
--- a/payroll/wizard/hr_payroll_contribution_register_report.py
+++ b/payroll/wizard/hr_payroll_contribution_register_report.py
@@ -9,11 +9,8 @@ class PayslipLinesContributionRegister(models.TransientModel):
     _name = "payslip.lines.contribution.register"
     _description = "Payslip Lines by Contribution Registers"
 
-    date_from = fields.Date(
-        string="Date From", required=True, default=datetime.now().strftime("%Y-%m-01")
-    )
+    date_from = fields.Date(required=True, default=datetime.now().strftime("%Y-%m-01"))
     date_to = fields.Date(
-        string="Date To",
         required=True,
         default=str(
             datetime.now() + relativedelta.relativedelta(months=+1, day=1, days=-1)
diff --git a/payroll/wizard/hr_payslip_change_state.py b/payroll/wizard/hr_payslip_change_state.py
index a8a1c9ea..2ca7a1a6 100644
--- a/payroll/wizard/hr_payslip_change_state.py
+++ b/payroll/wizard/hr_payslip_change_state.py
@@ -40,9 +40,10 @@ def change_state_confirm(self):
                     raise UserError(
                         _(
                             "Only rejected payslips can be reset to "
-                            "draft, the payslip %s is in "
-                            "%s state" % (rec.name, rec.state)
+                            "draft, the payslip %(name)s is in "
+                            "%(state)s state"
                         )
+                        % {"name": rec.name, "state": rec.state}
                     )
             elif new_state == "verify":
                 if rec.state in ["draft", "verify"]:
@@ -51,9 +52,10 @@ def change_state_confirm(self):
                     raise UserError(
                         _(
                             "Only draft payslips can be verified,"
-                            "the payslip %s is in "
-                            "%s state" % (rec.name, rec.state)
+                            "the payslip %(name)s is in "
+                            "%(state)s state"
                         )
+                        % {"name": rec.name, "state": rec.state}
                     )
             elif new_state == "done":
                 if rec.state in ("verify", "draft"):
@@ -62,19 +64,18 @@ def change_state_confirm(self):
                     raise UserError(
                         _(
                             "Only payslips in states verify or draft"
-                            " can be confirmed, the payslip %s is in "
-                            "%s state" % (rec.name, rec.state)
+                            " can be confirmed, the payslip %(name)s is in "
+                            "%(state)s state"
                         )
+                        % {"name": rec.name, "state": rec.state}
                     )
             elif new_state == "cancel":
                 if rec.state != "cancel":
                     rec.action_payslip_cancel()
                 else:
                     raise UserError(
-                        _(
-                            "The payslip %s is already canceled "
-                            "please deselect it" % rec.name
-                        )
+                        _("The payslip %(name)s is already canceled please deselect it")
+                        % {"name": rec.name}
                     )
 
         return {