From 996c6b07e54b27679f3c121f1c34eb69146c7a8d Mon Sep 17 00:00:00 2001
From: Michael Telahun <mtm@trevi.et>
Date: Thu, 10 Nov 2022 16:43:10 +0300
Subject: [PATCH] [MIG] payroll: Migration to 15.0

---
 payroll/README.rst                            |  48 +----
 payroll/__manifest__.py                       |   2 +-
 payroll/data/hr_payroll_data.xml              |  22 ++-
 payroll/data/hr_payroll_sequence.xml          |  16 +-
 payroll/demo/hr_payroll_demo.xml              |   1 -
 payroll/models/__init__.py                    |   1 +
 payroll/models/hr_employee.py                 |   1 -
 payroll/models/hr_leave_type.py               |  10 ++
 payroll/models/hr_payslip.py                  |  22 +--
 payroll/models/hr_payslip_line.py             |   1 -
 payroll/models/hr_payslip_run.py              |   1 -
 payroll/models/hr_salary_rule.py              |  54 +++---
 payroll/readme/HISTORY.rst                    |  34 ----
 payroll/security/hr_payroll_security.xml      | 168 +++++++++---------
 payroll/static/description/index.html         |  81 ++-------
 payroll/tests/common.py                       |   7 +
 payroll/tests/test_hr_payroll_cancel.py       |  21 ++-
 payroll/tests/test_hr_payslip_change_state.py |   5 +-
 payroll/tests/test_hr_payslip_worked_days.py  |   2 +-
 payroll/tests/test_hr_salary_rule.py          |   6 +-
 payroll/tests/test_payslip_flow.py            |  22 +--
 payroll/views/hr_contract_views.xml           |   6 +-
 .../views/hr_contribution_register_views.xml  |   2 +-
 payroll/views/hr_payroll_structure_views.xml  |   4 +-
 payroll/views/hr_payslip_line_views.xml       |   7 +-
 payroll/views/hr_payslip_run_views.xml        |   1 -
 payroll/views/hr_payslip_views.xml            |  12 +-
 .../views/hr_salary_rule_category_views.xml   |   2 +-
 payroll/views/hr_salary_rule_views.xml        |   6 +-
 ...hr_payroll_contribution_register_report.py |   5 +-
 payroll/wizard/hr_payslip_change_state.py     |  20 ++-
 31 files changed, 235 insertions(+), 355 deletions(-)
 create mode 100644 payroll/models/hr_leave_type.py
 delete mode 100644 payroll/readme/HISTORY.rst

diff --git a/payroll/README.rst b/payroll/README.rst
index 6fecebc75..db7d93635 100644
--- a/payroll/README.rst
+++ b/payroll/README.rst
@@ -14,13 +14,13 @@ Payroll
     :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html
     :alt: License: LGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fpayroll-lightgray.png?logo=github
-    :target: https://github.com/OCA/payroll/tree/14.0/payroll
+    :target: https://github.com/OCA/payroll/tree/15.0/payroll
     :alt: OCA/payroll
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/payroll-14-0/payroll-14-0-payroll
+    :target: https://translation.odoo-community.org/projects/payroll-15-0/payroll-15-0-payroll
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/281/14.0
+    :target: https://runbot.odoo-community.org/runbot/281/15.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
@@ -34,51 +34,13 @@ This module is a backport from Odoo SA and as such, it is not included in the OC
 .. contents::
    :local:
 
-Changelog
-=========
-
-14.0.6.0.0 (2022-11-04)
-~~~~~~~~~~~~~~~~~~~~~~~
-
-* #87 payroll_rule_time_parameter: remove from payroll
-* Removed hr.rule.parameter & hr.rule.parameter.value (see payroll_rule_time_parameter)
-
-14.0.5.3.0 (2022-09-13)
-~~~~~~~~~~~~~~~~~~~~~~~
-
-* #67 Merge payslip_cancel and payslip_change_state in base module
-* Merged hr_payroll_cancel, adding a setting to enable this feature (by default disabled).
-* Merged hr_payroll_change_state (there is no setting to disable this feature).
-
-14.0.5.0.0 (2022-08-29)
-~~~~~~~~~~~~~~~~~~~~~~~
-
-* #60 Improve views, add child functionalities, allow compute of name
-
-14.0.4.0.0 (2022-08-17)
-~~~~~~~~~~~~~~~~~~~~~~~
-
-* #45 Remove contract_advantage_template model and new module
-* Removed hr.contract.advantage.template (moved to payroll_contract_advantages)
-
-14.0.3.0.0 (2022-08-15)
-~~~~~~~~~~~~~~~~~~~~~~~
-
-* #47 payslip refactoring
-
-14.0.2.0.0 (2022-07-07)
-~~~~~~~~~~~~~~~~~~~~~~~
-
-* #31 major-rule-parameters-function
-* Added hr.rule.parameter & hr.rule.parameter.value
-
 Bug Tracker
 ===========
 
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/payroll/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/payroll/issues/new?body=module:%20payroll%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/payroll/issues/new?body=module:%20payroll%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -123,6 +85,6 @@ Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-appstogrow| |maintainer-nimarosa| 
 
-This module is part of the `OCA/payroll <https://github.com/OCA/payroll/tree/14.0/payroll>`_ project on GitHub.
+This module is part of the `OCA/payroll <https://github.com/OCA/payroll/tree/15.0/payroll>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/payroll/__manifest__.py b/payroll/__manifest__.py
index 6bac28c03..656abf626 100644
--- a/payroll/__manifest__.py
+++ b/payroll/__manifest__.py
@@ -2,7 +2,7 @@
 
 {
     "name": "Payroll",
-    "version": "14.0.6.1.0",
+    "version": "15.0.1.0.0",
     "category": "Payroll",
     "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 c3adfdd08..1984a0266 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 b0e75db8e..ae5e10e30 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 4e987a1ab..a5cdc8878 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/__init__.py b/payroll/models/__init__.py
index 3946bd784..8222234f3 100644
--- a/payroll/models/__init__.py
+++ b/payroll/models/__init__.py
@@ -2,6 +2,7 @@
 
 from . import hr_contract
 from . import hr_employee
+from . import hr_leave_type
 from . import hr_payroll_structure
 from . import hr_salary_rule
 from . import hr_salary_rule_category
diff --git a/payroll/models/hr_employee.py b/payroll/models/hr_employee.py
index 7b23ea39a..68c4497b5 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_leave_type.py b/payroll/models/hr_leave_type.py
new file mode 100644
index 000000000..297a36759
--- /dev/null
+++ b/payroll/models/hr_leave_type.py
@@ -0,0 +1,10 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import fields, models
+
+
+class HrLeaveType(models.Model):
+    _inherit = "hr.leave.type"
+
+    code = fields.Char(string="Payroll Code")
diff --git a/payroll/models/hr_payslip.py b/payroll/models/hr_payslip.py
index 0ae4e25fd..6a0e6a7f8 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(
@@ -144,10 +142,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",
@@ -163,11 +159,11 @@ 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)
+    hide_child_lines = fields.Boolean(default=False)
     hide_invisible_lines = fields.Boolean(
         string="Show only lines that appear on payslip", default=False
     )
-    compute_date = fields.Date("Compute Date")
+    compute_date = fields.Date()
     refunded_id = fields.Many2one(
         "hr.payslip", string="Refunded Payslip", readonly=True
     )
@@ -384,7 +380,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,
@@ -394,8 +390,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,
         }
 
@@ -776,16 +772,16 @@ 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(
+            record.name = _("Salary Slip of %(name)s for %(dt)s") % {
+                "name": record.employee_id.name,
+                "dt": 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")
     def onchange_contract(self):
diff --git a/payroll/models/hr_payslip_line.py b/payroll/models/hr_payslip_line.py
index 3f3326edb..e56562d69 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,
     )
diff --git a/payroll/models/hr_payslip_run.py b/payroll/models/hr_payslip_run.py
index f96a8a504..cf77c2a0f 100644
--- a/payroll/models/hr_payslip_run.py
+++ b/payroll/models/hr_payslip_run.py
@@ -53,7 +53,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_salary_rule.py b/payroll/models/hr_salary_rule.py
index 6608073d3..19559d553 100644
--- a/payroll/models/hr_salary_rule.py
+++ b/payroll/models/hr_salary_rule.py
@@ -219,11 +219,14 @@ 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) for employee %s.")
-                % (self.name, self.code, localdict["employee"].name)
-            )
+                _(
+                    "Wrong quantity defined for salary rule "
+                    "%(nm)s (%(code)s) for employee %(ee)s."
+                )
+                % {"nm": self.name, "code": self.code, "ee": localdict["employee"].name}
+            ) from ex
 
     def _compute_rule_percentage(self, localdict):
         try:
@@ -233,14 +236,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) for employee %s."
+                    "rule %(nm)s (%(code)s) for employee %(ee)s."
                 )
-                % (self.name, self.code, localdict["employee"].name)
-            )
+                % {"nm": self.name, "code": self.code, "ee": localdict["employee"].name}
+            ) from ex
 
     def _compute_rule_code(self, localdict):
         try:
@@ -250,14 +253,19 @@ def _compute_rule_code(self, localdict):
             raise UserError(
                 _(
                     """
-Wrong python code defined for salary rule %s (%s) for employee %s.
+Wrong python code defined for salary rule %(nm)s (%(code)s) for employee %(ee)s.
 Here is the error received:
 
-%s
+%(err)s
 """
                 )
-                % (self.name, self.code, localdict["employee"].name, repr(ex))
-            )
+                % {
+                    "nm": self.name,
+                    "code": self.code,
+                    "ee": localdict["employee"].name,
+                    "err": repr(ex),
+                }
+            ) from ex
 
     def _get_rule_dict(self, localdict):
         name = localdict.get("result_name") or self.name
@@ -293,13 +301,14 @@ 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) for employee %s."
+                    "Wrong range condition defined for salary rule "
+                    "%(nm)s (%(code)s) for employee %(ee)s."
                 )
-                % (self.name, self.code, localdict["employee"].name)
-            )
+                % {"nm": self.name, "code": self.code, "ee": localdict["employee"].name}
+            ) from ex
 
     def _satisfy_condition_python(self, localdict):
         try:
@@ -309,11 +318,16 @@ def _satisfy_condition_python(self, localdict):
             raise UserError(
                 _(
                     """
-Wrong python condition defined for salary rule %s (%s) for employee %s.
+Wrong python condition defined for salary rule %(nm)s (%(code)s) for employee %(ee)s.
 Here is the error received:
 
-%s
+%(err)s
 """
                 )
-                % (self.name, self.code, localdict["employee"].name, repr(ex))
-            )
+                % {
+                    "nm": self.name,
+                    "code": self.code,
+                    "ee": localdict["employee"].name,
+                    "err": repr(ex),
+                }
+            ) from ex
diff --git a/payroll/readme/HISTORY.rst b/payroll/readme/HISTORY.rst
deleted file mode 100644
index 80372f5ad..000000000
--- a/payroll/readme/HISTORY.rst
+++ /dev/null
@@ -1,34 +0,0 @@
-14.0.6.0.0 (2022-11-04)
-~~~~~~~~~~~~~~~~~~~~~~~
-
-* #87 payroll_rule_time_parameter: remove from payroll
-* Removed hr.rule.parameter & hr.rule.parameter.value (see payroll_rule_time_parameter)
-
-14.0.5.3.0 (2022-09-13)
-~~~~~~~~~~~~~~~~~~~~~~~
-
-* #67 Merge payslip_cancel and payslip_change_state in base module
-* Merged hr_payroll_cancel, adding a setting to enable this feature (by default disabled).
-* Merged hr_payroll_change_state (there is no setting to disable this feature).
-
-14.0.5.0.0 (2022-08-29)
-~~~~~~~~~~~~~~~~~~~~~~~
-
-* #60 Improve views, add child functionalities, allow compute of name
-
-14.0.4.0.0 (2022-08-17)
-~~~~~~~~~~~~~~~~~~~~~~~
-
-* #45 Remove contract_advantage_template model and new module
-* Removed hr.contract.advantage.template (moved to payroll_contract_advantages)
-
-14.0.3.0.0 (2022-08-15)
-~~~~~~~~~~~~~~~~~~~~~~~
-
-* #47 payslip refactoring
-
-14.0.2.0.0 (2022-07-07)
-~~~~~~~~~~~~~~~~~~~~~~~
-
-* #31 major-rule-parameters-function
-* Added hr.rule.parameter & hr.rule.parameter.value
diff --git a/payroll/security/hr_payroll_security.xml b/payroll/security/hr_payroll_security.xml
index 2ccfdcf72..bfc327ef8 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/static/description/index.html b/payroll/static/description/index.html
index 8676094a8..3522ccd89 100644
--- a/payroll/static/description/index.html
+++ b/payroll/static/description/index.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils: http://docutils.sourceforge.net/" />
 <title>Payroll</title>
 <style type="text/css">
 
@@ -367,92 +367,39 @@ <h1 class="title">Payroll</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/licence-LGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/payroll/tree/14.0/payroll"><img alt="OCA/payroll" src="https://img.shields.io/badge/github-OCA%2Fpayroll-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/payroll-14-0/payroll-14-0-payroll"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/281/14.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/licence-LGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/payroll/tree/15.0/payroll"><img alt="OCA/payroll" src="https://img.shields.io/badge/github-OCA%2Fpayroll-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/payroll-15-0/payroll-15-0-payroll"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/281/15.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>Manage your employee payroll records.</p>
 <p>This module is a backport from Odoo SA and as such, it is not included in the OCA CLA. That means we do not have a copy of the copyright on it like all other OCA modules.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
-<li><a class="reference internal" href="#changelog" id="id7">Changelog</a><ul>
-<li><a class="reference internal" href="#id1" id="id8">14.0.6.0.0 (2022-11-04)</a></li>
-<li><a class="reference internal" href="#id2" id="id9">14.0.5.3.0 (2022-09-13)</a></li>
-<li><a class="reference internal" href="#id3" id="id10">14.0.5.0.0 (2022-08-29)</a></li>
-<li><a class="reference internal" href="#id4" id="id11">14.0.4.0.0 (2022-08-17)</a></li>
-<li><a class="reference internal" href="#id5" id="id12">14.0.3.0.0 (2022-08-15)</a></li>
-<li><a class="reference internal" href="#id6" id="id13">14.0.2.0.0 (2022-07-07)</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id3">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id4">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="id5">Maintainers</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#bug-tracker" id="id14">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="id15">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="id16">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="id17">Contributors</a></li>
-<li><a class="reference internal" href="#maintainers" id="id18">Maintainers</a></li>
 </ul>
-</li>
-</ul>
-</div>
-<div class="section" id="changelog">
-<h1><a class="toc-backref" href="#id7">Changelog</a></h1>
-<div class="section" id="id1">
-<h2><a class="toc-backref" href="#id8">14.0.6.0.0 (2022-11-04)</a></h2>
-<ul class="simple">
-<li>#87 payroll_rule_time_parameter: remove from payroll</li>
-<li>Removed hr.rule.parameter &amp; hr.rule.parameter.value (see payroll_rule_time_parameter)</li>
-</ul>
-</div>
-<div class="section" id="id2">
-<h2><a class="toc-backref" href="#id9">14.0.5.3.0 (2022-09-13)</a></h2>
-<ul class="simple">
-<li>#67 Merge payslip_cancel and payslip_change_state in base module</li>
-<li>Merged hr_payroll_cancel, adding a setting to enable this feature (by default disabled).</li>
-<li>Merged hr_payroll_change_state (there is no setting to disable this feature).</li>
-</ul>
-</div>
-<div class="section" id="id3">
-<h2><a class="toc-backref" href="#id10">14.0.5.0.0 (2022-08-29)</a></h2>
-<ul class="simple">
-<li>#60 Improve views, add child functionalities, allow compute of name</li>
-</ul>
-</div>
-<div class="section" id="id4">
-<h2><a class="toc-backref" href="#id11">14.0.4.0.0 (2022-08-17)</a></h2>
-<ul class="simple">
-<li>#45 Remove contract_advantage_template model and new module</li>
-<li>Removed hr.contract.advantage.template (moved to payroll_contract_advantages)</li>
-</ul>
-</div>
-<div class="section" id="id5">
-<h2><a class="toc-backref" href="#id12">14.0.3.0.0 (2022-08-15)</a></h2>
-<ul class="simple">
-<li>#47 payslip refactoring</li>
-</ul>
-</div>
-<div class="section" id="id6">
-<h2><a class="toc-backref" href="#id13">14.0.2.0.0 (2022-07-07)</a></h2>
-<ul class="simple">
-<li>#31 major-rule-parameters-function</li>
-<li>Added hr.rule.parameter &amp; hr.rule.parameter.value</li>
-</ul>
-</div>
 </div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#id14">Bug Tracker</a></h1>
+<h1><a class="toc-backref" href="#id1">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/payroll/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/payroll/issues/new?body=module:%20payroll%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/payroll/issues/new?body=module:%20payroll%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h1><a class="toc-backref" href="#id15">Credits</a></h1>
+<h1><a class="toc-backref" href="#id2">Credits</a></h1>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#id16">Authors</a></h2>
+<h2><a class="toc-backref" href="#id3">Authors</a></h2>
 <ul class="simple">
 <li>Odoo SA</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#id17">Contributors</a></h2>
+<h2><a class="toc-backref" href="#id4">Contributors</a></h2>
 <ul class="simple">
 <li>Odoo SA &lt;<a class="reference external" href="mailto:info&#64;odoo.com">info&#64;odoo.com</a>&gt;</li>
 <li>David James &lt;<a class="reference external" href="mailto:david&#64;djdc.net.au">david&#64;djdc.net.au</a>&gt;</li>
@@ -462,7 +409,7 @@ <h2><a class="toc-backref" href="#id17">Contributors</a></h2>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#id18">Maintainers</a></h2>
+<h2><a class="toc-backref" href="#id5">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
 <a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
@@ -470,7 +417,7 @@ <h2><a class="toc-backref" href="#id18">Maintainers</a></h2>
 promote its widespread use.</p>
 <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainers</a>:</p>
 <p><a class="reference external" href="https://github.com/appstogrow"><img alt="appstogrow" src="https://github.com/appstogrow.png?size=40px" /></a> <a class="reference external" href="https://github.com/nimarosa"><img alt="nimarosa" src="https://github.com/nimarosa.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/payroll/tree/14.0/payroll">OCA/payroll</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/payroll/tree/15.0/payroll">OCA/payroll</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>
diff --git a/payroll/tests/common.py b/payroll/tests/common.py
index d42223d7b..950c57f53 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 bbb35a140..5ad8723b0 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 4176d56c0..609bac41e 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 dbb311cfc..742ae2382 100644
--- a/payroll/tests/test_hr_payslip_worked_days.py
+++ b/payroll/tests/test_hr_payslip_worked_days.py
@@ -19,7 +19,7 @@ def setUp(self):
             {
                 "name": "TestLeaveType",
                 "code": "TESTLV",
-                "allocation_type": "no",
+                "allocation_validation_type": "no",
                 "leave_validation_type": "no_validation",
             }
         )
diff --git a/payroll/tests/test_hr_salary_rule.py b/payroll/tests/test_hr_salary_rule.py
index 9c2faba03..7075b1cf7 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",
@@ -26,7 +26,7 @@ def setUp(self):
             {
                 "name": "Parent Test Rule",
                 "code": "PARENT_TEST",
-                "category_id": self.env.ref("payroll.ALW").id,
+                "category_id": self.categ_alw.id,
                 "sequence": 6,
                 "parent_rule_id": self.test_rule.id,
                 "amount_select": "code",
@@ -41,7 +41,7 @@ def setUp(self):
             {
                 "name": "Child Test Rule",
                 "code": "CHILD_TEST",
-                "category_id": self.env.ref("payroll.ALW").id,
+                "category_id": self.categ_alw.id,
                 "sequence": 7,
                 "parent_rule_id": self.test_rule.id,
                 "amount_select": "code",
diff --git a/payroll/tests/test_payslip_flow.py b/payroll/tests/test_payslip_flow.py
index 18f7ed5d7..e14201209 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 0be6baf9c..2b333561e 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_info']" 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 6a11d79c9..cae969bd9 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 15541c5ac..7731da80f 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 fa3268e53..50aca7093 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" />
@@ -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 fe9625dd9..61db52978 100644
--- a/payroll/views/hr_payslip_run_views.xml
+++ b/payroll/views/hr_payslip_run_views.xml
@@ -32,7 +32,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 8125a8e2b..1ac582100 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" />
@@ -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" string="Days" />
@@ -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" />
@@ -259,7 +254,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"
diff --git a/payroll/views/hr_salary_rule_category_views.xml b/payroll/views/hr_salary_rule_category_views.xml
index 29db1d596..e68effbbb 100644
--- a/payroll/views/hr_salary_rule_category_views.xml
+++ b/payroll/views/hr_salary_rule_category_views.xml
@@ -46,7 +46,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 a559026aa..1d1a0b9df 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" />
@@ -216,7 +216,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 71328f17a..9ca924029 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 a8a1c9ea5..149c05498 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 %(nm)s is in "
+                            "%(st)s state"
                         )
+                        % {"nm": rec.name, "st": 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 %(nm)s is in "
+                            "%(st)s state"
                         )
+                        % {"nm": rec.name, "st": rec.state}
                     )
             elif new_state == "done":
                 if rec.state in ("verify", "draft"):
@@ -62,9 +64,10 @@ 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 %(nm)s is in "
+                            "%(st)s state"
                         )
+                        % {"nm": rec.name, "st": rec.state}
                     )
             elif new_state == "cancel":
                 if rec.state != "cancel":
@@ -72,9 +75,10 @@ def change_state_confirm(self):
                 else:
                     raise UserError(
                         _(
-                            "The payslip %s is already canceled "
-                            "please deselect it" % rec.name
+                            "The payslip %(nm)s is already canceled "
+                            "please deselect it"
                         )
+                        % {"nm": rec.name}
                     )
 
         return {