diff --git a/README.md b/README.md
index 89789f74..72f67c7d 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 
 <!-- /!\ Non OCA Context : Set here the badge of your runbot / runboat instance. -->
-[![Pre-commit Status](https://github.com/trevi-software/trevi-hr/actions/workflows/pre-commit.yml/badge.svg?branch=15.0)](https://github.com/trevi-software/trevi-hr/actions/workflows/pre-commit.yml?query=branch%3A15.0)
-[![Build Status](https://github.com/trevi-software/trevi-hr/actions/workflows/test.yml/badge.svg?branch=15.0)](https://github.com/trevi-software/trevi-hr/actions/workflows/test.yml?query=branch%3A15.0)
-[![codecov](https://codecov.io/gh/trevi-software/trevi-hr/branch/15.0/graph/badge.svg)](https://codecov.io/gh/trevi-software/trevi-hr)
+[![Pre-commit Status](https://github.com/trevi-software/trevi-hr/actions/workflows/pre-commit.yml/badge.svg?branch=14.0)](https://github.com/trevi-software/trevi-hr/actions/workflows/pre-commit.yml?query=branch%3A14.0)
+[![Build Status](https://github.com/trevi-software/trevi-hr/actions/workflows/test.yml/badge.svg?branch=14.0)](https://github.com/trevi-software/trevi-hr/actions/workflows/test.yml?query=branch%3A14.0)
+[![codecov](https://codecov.io/gh/trevi-software/trevi-hr/branch/14.0/graph/badge.svg)](https://codecov.io/gh/trevi-software/trevi-hr)
 <!-- /!\ Non OCA Context : Set here the badge of your translation instance. -->
 
 <!-- /!\ do not modify above this line -->
@@ -17,7 +17,63 @@ This repository contains Human Resource addons developed by TREVI Software
 
 [//]: # (addons)
 
-This part will be replaced when running the oca-gen-addons-table script from OCA/maintainer-tools.
+Available addons
+----------------
+addon | version | maintainers | summary
+--- | --- | --- | ---
+[base_lock](base_lock/) | 14.0.1.0.0 |  | Base locking module.
+[group_payroll_manager](group_payroll_manager/) | 14.0.1.0.0 |  | Permissions group Payroll Manager
+[hr_accrual_bank](hr_accrual_bank/) | 14.0.1.0.0 |  | Basic framework for recording accruals to a time bank
+[hr_attendance_day](hr_attendance_day/) | 14.0.1.0.0 |  | Attach a localized date to an attendace record
+[hr_benefit](hr_benefit/) | 14.0.1.0.1 |  | Assign benefits and deductables to employees
+[hr_benefit_payroll](hr_benefit_payroll/) | 14.0.1.2.2 |  | Access benefits in payroll through salary rules.
+[hr_contract_status](hr_contract_status/) | 14.0.1.0.1 |  | Workflows and notifications on employee contracts.
+[hr_contract_status_benefit](hr_contract_status_benefit/) | 14.0.1.0.0 |  | Link hr_contract_status with hr_benefit
+[hr_contract_values](hr_contract_values/) | 14.0.1.0.0 |  | Contracts - Initial Settings
+[hr_contract_values_payroll](hr_contract_values_payroll/) | 14.0.1.1.0 |  | Contract Payroll Structure Initial Settings
+[hr_contract_values_resource_schedule](hr_contract_values_resource_schedule/) | 14.0.1.0.0 |  | Set working hours in default contract values.
+[hr_employee_seniority_months](hr_employee_seniority_months/) | 14.0.1.0.1 |  | Calculate an employee's months of employment
+[hr_employee_status](hr_employee_status/) | 14.0.1.0.2 |  | Track the HR status of employees
+[hr_employee_status_benefit](hr_employee_status_benefit/) | 14.0.1.0.0 |  | Link between hr_employee_status and hr_benefit
+[hr_employee_status_payroll](hr_employee_status_payroll/) | 14.0.1.0.0 |  | Adds access records to employee separation records
+[hr_employee_wizard](hr_employee_wizard/) | 14.0.1.0.0 |  | Streamline the creation of a new employee record
+[hr_job_change_state](hr_job_change_state/) | 14.0.1.0.0 |  | Change State of Jobs
+[hr_job_transfer](hr_job_transfer/) | 14.0.1.0.0 |  | Departmental Transfer
+[hr_jobs_hierarchy](hr_jobs_hierarchy/) | 14.0.1.0.0 |  | Job Hierarchy
+[hr_leave_type_unique](hr_leave_type_unique/) | 14.0.1.0.0 |  | Ensure leave types are unique
+[hr_photobooth](hr_photobooth/) | 14.0.1.0.0 |  | Capture employee picture with webcam
+[ir_module_category_payroll](ir_module_category_payroll/) | 14.0.1.0.0 |  | Creates Payroll module category
+[payroll_default_salary_rules](payroll_default_salary_rules/) | 14.0.1.0.0 |  | Default set of salary rules and categories.
+[payroll_operating_unit](payroll_operating_unit/) | 14.0.1.1.0 |  | WARNING-this module will be removed.
+[payroll_operating_unit_access_all](payroll_operating_unit_access_all/) | 14.0.1.1.0 |  | Access all payslips.
+[payroll_payslip_amendment](payroll_payslip_amendment/) | 14.0.1.0.0 |  | Add amendments to current and future pay slips
+[payroll_payslip_amendment_contract_status](payroll_payslip_amendment_contract_status/) | 14.0.1.0.0 |  | Link payslip amendments with the employee contract state.
+[payroll_payslip_dictionary](payroll_payslip_dictionary/) | 14.0.1.3.0 |  | Dictionary of values that can be used in payslip calculations
+[payroll_payslip_hr_leave_type](payroll_payslip_hr_leave_type/) | 14.0.1.0.0 |  | Use time-off codes (instead of names) in payslip rules
+[payroll_payslip_patch](payroll_payslip_patch/) | 14.0.2.0.0 |  | Miscellaneous source code patches to payslip handling
+[payroll_payslip_report](payroll_payslip_report/) | 14.0.2.0.0 |  | Comprehensive payslip report by department.
+[payroll_period_account](payroll_period_account/) | 14.0.1.0.0 |  | Links payroll periods to accounting
+[payroll_period_base_lock](payroll_period_base_lock/) | 14.0.1.0.0 |  | Adds a base lock field to a payroll period.
+[payroll_period_by_contract_type](payroll_period_by_contract_type/) | 14.0.1.0.0 |  | Generate separate payslip batches for each contract type.
+[payroll_period_contract_values](payroll_period_contract_values/) | 14.0.1.0.0 |  | Links payroll period schedules with employee contracts.
+[payroll_period_payslip_amendment](payroll_period_payslip_amendment/) | 14.0.1.0.0 |  | Link payslip amendments with a payroll period.
+[payroll_period_per_ou](payroll_period_per_ou/) | 14.0.1.0.0 |  | Generate separate payroll sheets for each OU.
+[payroll_period_processing](payroll_period_processing/) | 14.0.1.2.1 |  | Payroll period processing wizard
+[payroll_period_processing_per_ou](payroll_period_processing_per_ou/) | 14.0.1.0.0 |  | For each period process only those payslips that belong to the OU.
+[payroll_periods](payroll_periods/) | 14.0.1.4.0 |  | Configurable payroll schedules.
+[payroll_policy_absence](payroll_policy_absence/) | 14.0.1.0.0 |  | Define properties of an employee absense policy for payroll.
+[payroll_policy_accrual](payroll_policy_accrual/) | 14.0.1.0.0 |  | Automatically or manually accrue to time banks to be withdrawn later
+[payroll_policy_group](payroll_policy_group/) | 14.0.1.0.1 |  | Group payroll policies and assign them to contracts
+[payroll_policy_ot](payroll_policy_ot/) | 14.0.1.0.0 |  | Assign over-time policies to a policy group
+[payroll_policy_payslip](payroll_policy_payslip/) | 14.0.1.0.1 |  | Apply payroll policies duing payslip processing
+[payroll_policy_presence](payroll_policy_presence/) | 14.0.1.0.0 |  | Define properties of an employee presence policy
+[payroll_policy_rounding](payroll_policy_rounding/) | 14.0.1.0.0 |  | Define attendance check-in and check-out rounding policies
+[payroll_register](payroll_register/) | 14.0.1.3.0 |  | Payroll Register
+[payroll_register_report](payroll_register_report/) | 14.0.1.0.0 |  | List payslips with salary categories by batch.
+[res_currency_denomination](res_currency_denomination/) | 14.0.1.1.0 |  | Currency Denominations
+[resource_schedule](resource_schedule/) | 14.0.1.0.0 |  | Easily create, manage, and track employee shift planning.
+[trevi_hr_job_categories](trevi_hr_job_categories/) | 14.0.1.0.0 |  | Job Categories
+[trevi_hr_usability](trevi_hr_usability/) | 14.0.1.0.0 |  | Simplify Employee Records.
 
 [//]: # (end addons)
 
diff --git a/base_lock/README.rst b/base_lock/README.rst
new file mode 100644
index 00000000..ba61cefd
--- /dev/null
+++ b/base_lock/README.rst
@@ -0,0 +1,61 @@
+=========
+Base Lock
+=========
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:a631edfee4e90a3340d15684c641555f8192c293e93e7af706d2ca7e26b2ee9a
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/base_lock
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+This module provides a base object locking mechanism. It offers no user visible functionality on its own. It is expected to be used by module developers.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20base_lock%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+* Michael Telahun Makonnen
+
+Other credits
+~~~~~~~~~~~~~
+
+* Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/base_lock>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/base_lock/__init__.py b/base_lock/__init__.py
new file mode 100644
index 00000000..2b0f2dca
--- /dev/null
+++ b/base_lock/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
diff --git a/base_lock/__manifest__.py b/base_lock/__manifest__.py
new file mode 100644
index 00000000..b7c94d36
--- /dev/null
+++ b/base_lock/__manifest__.py
@@ -0,0 +1,19 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Base Lock",
+    "summary": "Base locking module.",
+    "version": "15.0.1.0.0",
+    "category": "Generic",
+    "images": ["static/src/img/main_screenshot.png"],
+    "author": "TREVI Software, Michael Telahun Makonnen",
+    "license": "AGPL-3",
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": ["base"],
+    "data": [
+        "security/ir.model.access.csv",
+    ],
+    "installable": True,
+}
diff --git a/base_lock/i18n/base_lock.pot b/base_lock/i18n/base_lock.pot
new file mode 100644
index 00000000..cd9db7f5
--- /dev/null
+++ b/base_lock/i18n/base_lock.pot
@@ -0,0 +1,79 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* base_lock
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: base_lock
+#: model:ir.model,name:base_lock.model_base_lock
+msgid "Base Lock Object"
+msgstr ""
+
+#. module: base_lock
+#: model:ir.model.fields,field_description:base_lock.field_base_lock__company_id
+msgid "Company"
+msgstr ""
+
+#. module: base_lock
+#: model:ir.model.fields,field_description:base_lock.field_base_lock__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: base_lock
+#: model:ir.model.fields,field_description:base_lock.field_base_lock__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: base_lock
+#: model:ir.model.fields,field_description:base_lock.field_base_lock__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: base_lock
+#: model:ir.model.fields,field_description:base_lock.field_base_lock__end_time
+msgid "End Time"
+msgstr ""
+
+#. module: base_lock
+#: model:ir.model.fields,field_description:base_lock.field_base_lock__id
+msgid "ID"
+msgstr ""
+
+#. module: base_lock
+#: model:ir.model.fields,field_description:base_lock.field_base_lock____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: base_lock
+#: model:ir.model.fields,field_description:base_lock.field_base_lock__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: base_lock
+#: model:ir.model.fields,field_description:base_lock.field_base_lock__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: base_lock
+#: model:ir.model.fields,field_description:base_lock.field_base_lock__name
+msgid "Name"
+msgstr ""
+
+#. module: base_lock
+#: model:ir.model.fields,field_description:base_lock.field_base_lock__start_time
+msgid "Start Time"
+msgstr ""
+
+#. module: base_lock
+#: model:ir.model.fields,field_description:base_lock.field_base_lock__tz
+msgid "Time Zone"
+msgstr ""
diff --git a/base_lock/models/__init__.py b/base_lock/models/__init__.py
new file mode 100644
index 00000000..ab127a31
--- /dev/null
+++ b/base_lock/models/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import base_lock
diff --git a/base_lock/models/base_lock.py b/base_lock/models/base_lock.py
new file mode 100644
index 00000000..0ecc5004
--- /dev/null
+++ b/base_lock/models/base_lock.py
@@ -0,0 +1,80 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import datetime
+
+from pytz import common_timezones, timezone, utc
+
+from odoo import api, fields, models
+from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT as OE_DTFORMAT
+
+
+class Lock(models.Model):
+
+    _name = "base.lock"
+    _description = "Base Lock Object"
+    _check_company_auto = True
+
+    @api.model
+    def _tz_list(self):
+
+        res = tuple()
+        for name in common_timezones:
+            res += ((name, name),)
+        return res
+
+    name = fields.Char(required=True)
+    start_time = fields.Datetime(required=True)
+    end_time = fields.Datetime(required=True)
+    tz = fields.Selection(selection=_tz_list, string="Time Zone", required=True)
+    company_id = fields.Many2one(
+        comodel_name="res.company",
+        string="Company",
+        index=True,
+        default=lambda self: self.env.company,
+        required=True,
+    )
+
+    @api.model
+    def create(self, vals):
+        dt_tz = timezone(vals.get("tz", False))
+        dtStart = vals.get("start_time", False)
+        dtEnd = vals.get("end_time", False)
+        tzStart = dt_tz.localize(dtStart, is_dst=False)
+        tzEnd = dt_tz.localize(dtEnd, is_dst=False)
+        dtStart = tzStart.astimezone(utc).replace(tzinfo=None)
+        dtEnd = tzEnd.astimezone(utc).replace(tzinfo=None)
+        vals["start_time"] = dtStart
+        vals["end_time"] = dtEnd
+
+        return super(Lock, self).create(vals)
+
+    @api.model
+    def is_locked_datetime_utc(self, dt_str):
+        """Determines whether a DateTime (string) value falls within a locked period.
+        The DateTime string is assumed to be a naive UTC (straight from DB)."""
+
+        lock_ids = self.search(
+            ["&", ("start_time", "<=", dt_str), ("end_time", ">=", dt_str)]
+        )
+        if len(lock_ids) > 0:
+            return True
+
+        return False
+
+    @api.model
+    def is_locked_date(self, d_str, tz_str=None):
+        """Determine if the date (string) is locked. If a time zone is
+        specified it will check for midnight according to it, otherwise,
+        it is assumed to be UTC"""
+
+        dt_str = d_str + " 00:00:00"
+        if tz_str:
+            dt_tz = timezone(tz_str)
+            dt = datetime.strptime(dt_str, OE_DTFORMAT)
+            tzdt = dt_tz.localize(dt, is_dst=False)
+            utcdt = tzdt.astimezone(utc)
+            dt_str = utcdt.strftime(OE_DTFORMAT)
+
+        return self.is_locked_datetime_utc(dt_str)
diff --git a/base_lock/readme/CREDITS.rst b/base_lock/readme/CREDITS.rst
new file mode 100644
index 00000000..d264bc7e
--- /dev/null
+++ b/base_lock/readme/CREDITS.rst
@@ -0,0 +1 @@
+* Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/base_lock/readme/DESCRIPTION.rst b/base_lock/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..3a9ffc1b
--- /dev/null
+++ b/base_lock/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+This module provides a base object locking mechanism. It offers no user visible functionality on its own. It is expected to be used by module developers.
diff --git a/base_lock/security/ir.model.access.csv b/base_lock/security/ir.model.access.csv
new file mode 100644
index 00000000..d52508d5
--- /dev/null
+++ b/base_lock/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_base_lock_user,access_base_lock,model_base_lock,base.group_user,1,0,0,0
diff --git a/base_lock/static/description/icon.png b/base_lock/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/base_lock/static/description/icon.png differ
diff --git a/base_lock/static/description/index.html b/base_lock/static/description/index.html
new file mode 100644
index 00000000..83c56e7a
--- /dev/null
+++ b/base_lock/static/description/index.html
@@ -0,0 +1,417 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Base Lock</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="base-lock">
+<h1 class="title">Base Lock</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:a631edfee4e90a3340d15684c641555f8192c293e93e7af706d2ca7e26b2ee9a
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/base_lock"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<p>This module provides a base object locking mechanism. It offers no user visible functionality on its own. It is expected to be used by module developers.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-4">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20base_lock%0Aversion:%2014.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="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>TREVI Software</li>
+<li>Michael Telahun Makonnen</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-4">Other credits</a></h2>
+<ul class="simple">
+<li>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/base_lock">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/base_lock/static/src/img/main_screenshot.png b/base_lock/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/base_lock/static/src/img/main_screenshot.png differ
diff --git a/base_lock/tests/__init__.py b/base_lock/tests/__init__.py
new file mode 100644
index 00000000..79e5a3f6
--- /dev/null
+++ b/base_lock/tests/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import test_lock
diff --git a/base_lock/tests/test_lock.py b/base_lock/tests/test_lock.py
new file mode 100644
index 00000000..ec800ac6
--- /dev/null
+++ b/base_lock/tests/test_lock.py
@@ -0,0 +1,137 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import datetime
+
+from odoo.exceptions import AccessError
+from odoo.tests import common, new_test_user
+
+
+class TestLock(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super(TestLock, cls).setUpClass()
+
+        cls.Lock = cls.env["base.lock"]
+
+        # normal user
+        cls.user = new_test_user(
+            cls.env,
+            login="reg",
+            groups="base.group_user",
+            name="Simple employee",
+            email="reg@example.com",
+        )
+
+    def create_lock(self, start, end, tz):
+        return self.Lock.create(
+            {
+                "name": "A lock",
+                "start_time": start,
+                "end_time": end,
+                "tz": tz,
+            }
+        )
+
+    def test_user_read(self):
+        """Has read access to lock.lock"""
+
+        # utc: 2020-12-31 21:00:00 - 2021-01-31 20:59:59
+        start = datetime(2021, 1, 1, 0, 0, 0)
+        end = datetime(2021, 1, 31, 23, 59, 59)
+        lk = self.create_lock(start, end, "Africa/Addis_Ababa")
+        try:
+            lk.with_user(self.user.id).read([])
+        except AccessError:
+            self.fail("raised an AccessError exception")
+
+    def test_user_write_fails(self):
+        """Write access fails"""
+
+        # utc: 2020-12-31 21:00:00 - 2021-01-31 20:59:59
+        start = datetime(2021, 1, 1, 0, 0, 0)
+        end = datetime(2021, 1, 31, 23, 59, 59)
+        lk = self.create_lock(start, end, "Africa/Addis_Ababa")
+        with self.assertRaises(AccessError):
+            lk.with_user(self.user.id).name = "B"
+
+    def test_user_create_fails(self):
+        """Create access fails"""
+
+        # utc: 2020-12-31 21:00:00 - 2021-01-31 20:59:59
+        start = datetime(2021, 1, 1, 0, 0, 0)
+        end = datetime(2021, 1, 31, 23, 59, 59)
+        with self.assertRaises(AccessError):
+            self.Lock.with_user(self.user.id).create(
+                {
+                    "name": "A",
+                    "start_time": start,
+                    "end_time": end,
+                    "tz": "Africa/Addis_Ababa",
+                }
+            )
+
+    def test_user_unlink_fails(self):
+        """Unlink access fails"""
+
+        # utc: 2020-12-31 21:00:00 - 2021-01-31 20:59:59
+        start = datetime(2021, 1, 1, 0, 0, 0)
+        end = datetime(2021, 1, 31, 23, 59, 59)
+        lk = self.create_lock(start, end, "Africa/Addis_Ababa")
+        with self.assertRaises(AccessError):
+            lk.with_user(self.user.id).unlink()
+
+    def test_lock_datetime_utc(self):
+        """Locking of datetime value"""
+
+        # utc: 2020-12-31 21:00:00 - 2021-01-31 20:59:59
+        start = datetime(2021, 1, 1, 0, 0, 0)
+        end = datetime(2021, 1, 31, 23, 59, 59)
+
+        lk = self.create_lock(start, end, "Africa/Addis_Ababa")
+
+        # just before lock start
+        self.assertFalse(lk.is_locked_datetime_utc("2020-12-31 02:59:59"))
+        # just after lock end
+        self.assertFalse(lk.is_locked_datetime_utc("2021-01-31 21:00:00"))
+        # at lock start
+        self.assertTrue(lk.is_locked_datetime_utc("2020-12-31 21:00:00"))
+        # in the middle of the lock period
+        self.assertTrue(lk.is_locked_datetime_utc("2021-01-15 03:00:00"))
+        # at lock end
+        self.assertTrue(lk.is_locked_datetime_utc("2021-01-31 20:59:59"))
+
+    def test_lock_date_tz(self):
+        """Locking of date value with timezone info"""
+
+        # utc: 2020-12-31 21:00:00 - 2021-01-31 20:59:59
+        start = datetime(2021, 1, 1, 0, 0, 0)
+        end = datetime(2021, 1, 31, 23, 59, 59)
+        lk = self.create_lock(start, end, "Africa/Addis_Ababa")
+
+        # day before lock start
+        self.assertFalse(lk.is_locked_date("2020-12-31", "Africa/Addis_Ababa"))
+        # day after lock end
+        self.assertFalse(lk.is_locked_date("2021-02-01", "Africa/Addis_Ababa"))
+        # day of lock start
+        self.assertTrue(lk.is_locked_date("2021-01-01", "Africa/Addis_Ababa"))
+        # day of lock end
+        self.assertTrue(lk.is_locked_date("2021-01-31", "Africa/Addis_Ababa"))
+
+    def test_lock_date_notz(self):
+        """Locking of date value without timezone info"""
+
+        # utc: 2021-01-01 00:00:00 - 2021-01-31 23:59:59
+        start = datetime(2021, 1, 1, 0, 0, 0)
+        end = datetime(2021, 1, 31, 23, 59, 59)
+        lk = self.create_lock(start, end, "Africa/Addis_Ababa")
+
+        # day before lock start
+        self.assertFalse(lk.is_locked_date("2020-12-31"))
+        # day after lock end
+        self.assertFalse(lk.is_locked_date("2021-02-01"))
+        # day of lock start
+        self.assertTrue(lk.is_locked_date("2021-01-01"))
+        # day of lock end
+        self.assertTrue(lk.is_locked_date("2021-01-31"))
diff --git a/hr_accrual_bank/README.rst b/hr_accrual_bank/README.rst
new file mode 100644
index 00000000..d1a1aba4
--- /dev/null
+++ b/hr_accrual_bank/README.rst
@@ -0,0 +1,72 @@
+=========
+Time Bank
+=========
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:de6edbdb5fdc15c355783318d1bb1cc52bd0b0368b433f8ffe5940a234bc9b3f
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/hr_accrual_bank
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+Accruals to Bank
+================
+
+An Accrual is any benefit (usually time) that accrues on behalf of an employee over an extended
+period of time. This can be vacation days, sick days, or some other benefit. The actual policy
+and mechanics of bank accrual should be handled by other modules. This module only provides
+the basic framework for recording the data. While this module's functionality overlaps with
+Odoo's accrual leave allocations they are not the same and are not interchangeable. Specifically, this
+module:
+* Allows more complex accrual accounting (for example 1.5 days for every month for the first 12 months, then 1.75 days for the next 12 months, etc...)
+* Allows creation of accruals from salary rules during payroll processing
+* Does not attach units to the accrued amount (1.0 can mean a vacation day, a dollar, a product, or anything else depending on the module)
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20hr_accrual_bank%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+* Michael Telahun Makonnen
+
+Other credits
+~~~~~~~~~~~~~
+
+* Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/hr_accrual_bank>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/hr_accrual_bank/__init__.py b/hr_accrual_bank/__init__.py
new file mode 100644
index 00000000..1cc5116e
--- /dev/null
+++ b/hr_accrual_bank/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import models
diff --git a/hr_accrual_bank/__manifest__.py b/hr_accrual_bank/__manifest__.py
new file mode 100644
index 00000000..ec15a935
--- /dev/null
+++ b/hr_accrual_bank/__manifest__.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2021 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    "name": "Time Bank",
+    "summary": "Basic framework for recording accruals to a time bank",
+    "version": "15.0.1.0.0",
+    "category": "Human Resources",
+    "author": "TREVI Software, Michael Telahun Makonnen",
+    "license": "AGPL-3",
+    "images": ["static/src/img/main_screenshot.png"],
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "hr",
+        "hr_holidays",
+    ],
+    "data": [
+        "security/ir.model.access.csv",
+        "data/accrual_data.xml",
+        "views/hr_accrual_view.xml",
+    ],
+    "installable": True,
+}
diff --git a/hr_accrual_bank/data/accrual_data.xml b/hr_accrual_bank/data/accrual_data.xml
new file mode 100644
index 00000000..ecb14bac
--- /dev/null
+++ b/hr_accrual_bank/data/accrual_data.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+
+        <!-- Decimal Precision for accrual values -->
+        <record forcecreate="True" id="decimal_accrual" model="decimal.precision">
+            <field name="name">Accruals</field>
+            <field name="digits">3</field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/hr_accrual_bank/i18n/hr_accrual_bank.pot b/hr_accrual_bank/i18n/hr_accrual_bank.pot
new file mode 100644
index 00000000..e6b4be4d
--- /dev/null
+++ b/hr_accrual_bank/i18n/hr_accrual_bank.pot
@@ -0,0 +1,129 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* hr_accrual_bank
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: hr_accrual_bank
+#: model:ir.model,name:hr_accrual_bank.model_hr_accrual
+#: model:ir.model.fields,field_description:hr_accrual_bank.field_hr_accrual_line__accrual_id
+#: model_terms:ir.ui.view,arch_db:hr_accrual_bank.hr_accrual_view_form
+msgid "Accrual"
+msgstr ""
+
+#. module: hr_accrual_bank
+#: model:ir.model,name:hr_accrual_bank.model_hr_accrual_line
+msgid "Accrual Line"
+msgstr ""
+
+#. module: hr_accrual_bank
+#: model:ir.model.fields,field_description:hr_accrual_bank.field_hr_accrual__line_ids
+#: model_terms:ir.ui.view,arch_db:hr_accrual_bank.hr_accrual_view_form
+msgid "Accrual Lines"
+msgstr ""
+
+#. module: hr_accrual_bank
+#: model:ir.actions.act_window,name:hr_accrual_bank.open_accrual
+#: model:ir.ui.menu,name:hr_accrual_bank.menu_hr_accrual
+msgid "Accrual Time Banks"
+msgstr ""
+
+#. module: hr_accrual_bank
+#: model_terms:ir.ui.view,arch_db:hr_accrual_bank.hr_accrual_view_tree
+msgid "Accruals"
+msgstr ""
+
+#. module: hr_accrual_bank
+#: model:ir.model.fields,field_description:hr_accrual_bank.field_hr_accrual_line__amount
+msgid "Amount"
+msgstr ""
+
+#. module: hr_accrual_bank
+#: model:ir.model.fields,field_description:hr_accrual_bank.field_hr_accrual__create_uid
+#: model:ir.model.fields,field_description:hr_accrual_bank.field_hr_accrual_line__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: hr_accrual_bank
+#: model:ir.model.fields,field_description:hr_accrual_bank.field_hr_accrual__create_date
+#: model:ir.model.fields,field_description:hr_accrual_bank.field_hr_accrual_line__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: hr_accrual_bank
+#: model:ir.model.fields,field_description:hr_accrual_bank.field_hr_accrual_line__date
+msgid "Date"
+msgstr ""
+
+#. module: hr_accrual_bank
+#: model:ir.model.fields,field_description:hr_accrual_bank.field_hr_accrual__display_name
+#: model:ir.model.fields,field_description:hr_accrual_bank.field_hr_accrual_line__display_name
+#: model:ir.model.fields,field_description:hr_accrual_bank.field_hr_leave_allocation__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: hr_accrual_bank
+#: model:ir.model.fields,field_description:hr_accrual_bank.field_hr_accrual_line__employee_id
+msgid "Employee"
+msgstr ""
+
+#. module: hr_accrual_bank
+#: model:ir.model.fields,field_description:hr_accrual_bank.field_hr_leave_allocation__from_accrual
+msgid "From Accrual"
+msgstr ""
+
+#. module: hr_accrual_bank
+#: model:ir.model.fields,field_description:hr_accrual_bank.field_hr_accrual__id
+#: model:ir.model.fields,field_description:hr_accrual_bank.field_hr_accrual_line__id
+#: model:ir.model.fields,field_description:hr_accrual_bank.field_hr_leave_allocation__id
+msgid "ID"
+msgstr ""
+
+#. module: hr_accrual_bank
+#: model:ir.model.fields,field_description:hr_accrual_bank.field_hr_accrual____last_update
+#: model:ir.model.fields,field_description:hr_accrual_bank.field_hr_accrual_line____last_update
+#: model:ir.model.fields,field_description:hr_accrual_bank.field_hr_leave_allocation____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: hr_accrual_bank
+#: model:ir.model.fields,field_description:hr_accrual_bank.field_hr_accrual__write_uid
+#: model:ir.model.fields,field_description:hr_accrual_bank.field_hr_accrual_line__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: hr_accrual_bank
+#: model:ir.model.fields,field_description:hr_accrual_bank.field_hr_accrual__write_date
+#: model:ir.model.fields,field_description:hr_accrual_bank.field_hr_accrual_line__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: hr_accrual_bank
+#: model:ir.model.fields,field_description:hr_accrual_bank.field_hr_accrual__holiday_status_id
+msgid "Leave"
+msgstr ""
+
+#. module: hr_accrual_bank
+#: model:ir.model.fields,field_description:hr_accrual_bank.field_hr_accrual_line__leave_allocation_id
+msgid "Leave Allocation"
+msgstr ""
+
+#. module: hr_accrual_bank
+#: model:ir.model.fields,field_description:hr_accrual_bank.field_hr_accrual__name
+#: model_terms:ir.ui.view,arch_db:hr_accrual_bank.hr_accrual_view_form
+msgid "Name"
+msgstr ""
+
+#. module: hr_accrual_bank
+#: model:ir.model,name:hr_accrual_bank.model_hr_leave_allocation
+msgid "Time Off Allocation"
+msgstr ""
diff --git a/hr_accrual_bank/models/__init__.py b/hr_accrual_bank/models/__init__.py
new file mode 100644
index 00000000..004aefc7
--- /dev/null
+++ b/hr_accrual_bank/models/__init__.py
@@ -0,0 +1,6 @@
+# Copyright (C) 2021 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import hr_accrual
+from . import hr_leave_allocation
diff --git a/hr_accrual_bank/models/hr_accrual.py b/hr_accrual_bank/models/hr_accrual.py
new file mode 100644
index 00000000..ca3e301d
--- /dev/null
+++ b/hr_accrual_bank/models/hr_accrual.py
@@ -0,0 +1,88 @@
+# Copyright (C) 2021 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class HrAccrual(models.Model):
+
+    _name = "hr.accrual"
+    _description = "Accrual"
+
+    name = fields.Char(required=True)
+    holiday_status_id = fields.Many2one(string="Leave", comodel_name="hr.leave.type")
+    line_ids = fields.One2many(
+        string="Accrual Lines",
+        comodel_name="hr.accrual.line",
+        inverse_name="accrual_id",
+        readonly=True,
+    )
+
+    def get_balance(self, employee_id, date=None):
+
+        if date is None:
+            date = fields.Date.today()
+
+        res = 0.0
+        self.env.cr.execute(
+            """SELECT SUM(amount) from hr_accrual_line \
+                           WHERE accrual_id in %s AND employee_id=%s AND date <= %s""",
+            (tuple(self.ids), employee_id, date),
+        )
+        for row in self.env.cr.fetchall():
+            res = row[0]
+
+        return res
+
+    def deposit(self, employee_id, amount, date, name=None):
+
+        line_obj = self.env["hr.accrual.line"]
+
+        res = []
+        for accrual in self:
+
+            lv = False
+            if accrual.holiday_status_id:
+                leave_allocation = {
+                    "name": name is not None and name or "Allocation from Accrual",
+                    "allocation_type": "regular",
+                    "state": "draft",
+                    "employee_id": employee_id,
+                    "number_of_days": amount,
+                    "holiday_status_id": accrual.holiday_status_id.id,
+                    "from_accrual": True,
+                }
+                lv = self.env["hr.leave.allocation"].create(leave_allocation)
+                lv.action_confirm()
+                lv.action_validate()
+
+            # Create accrual line
+            #
+            vals = {
+                "date": date,
+                "employee_id": employee_id,
+                "amount": amount,
+                "accrual_id": accrual.id,
+                "leave_allocation_id": lv and lv.id or False,
+            }
+            res.append(line_obj.create(vals))
+
+        return res
+
+
+class HrAccrualLine(models.Model):
+
+    _name = "hr.accrual.line"
+    _description = "Accrual Line"
+    _rec_name = "date"
+
+    date = fields.Date(required=True, default=fields.Date.today())
+    accrual_id = fields.Many2one(
+        string="Accrual", comodel_name="hr.accrual", required=True
+    )
+    employee_id = fields.Many2one(
+        string="Employee", comodel_name="hr.employee", required=True
+    )
+    leave_allocation_id = fields.Many2one("hr.leave.allocation")
+    amount = fields.Float(digits="Accruals", required=True)
diff --git a/hr_accrual_bank/models/hr_leave_allocation.py b/hr_accrual_bank/models/hr_leave_allocation.py
new file mode 100644
index 00000000..6fa86008
--- /dev/null
+++ b/hr_accrual_bank/models/hr_leave_allocation.py
@@ -0,0 +1,10 @@
+# Copyright (C) 2021 TREVI Software
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class HrLeaveAllocation(models.Model):
+    _inherit = "hr.leave.allocation"
+
+    from_accrual = fields.Boolean()
diff --git a/hr_accrual_bank/readme/CREDITS.rst b/hr_accrual_bank/readme/CREDITS.rst
new file mode 100644
index 00000000..d264bc7e
--- /dev/null
+++ b/hr_accrual_bank/readme/CREDITS.rst
@@ -0,0 +1 @@
+* Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/hr_accrual_bank/readme/DESCRIPTION.rst b/hr_accrual_bank/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..52234028
--- /dev/null
+++ b/hr_accrual_bank/readme/DESCRIPTION.rst
@@ -0,0 +1,12 @@
+Accruals to Bank
+================
+
+An Accrual is any benefit (usually time) that accrues on behalf of an employee over an extended
+period of time. This can be vacation days, sick days, or some other benefit. The actual policy
+and mechanics of bank accrual should be handled by other modules. This module only provides
+the basic framework for recording the data. While this module's functionality overlaps with
+Odoo's accrual leave allocations they are not the same and are not interchangeable. Specifically, this
+module:
+* Allows more complex accrual accounting (for example 1.5 days for every month for the first 12 months, then 1.75 days for the next 12 months, etc...)
+* Allows creation of accruals from salary rules during payroll processing
+* Does not attach units to the accrued amount (1.0 can mean a vacation day, a dollar, a product, or anything else depending on the module)
diff --git a/hr_accrual_bank/security/ir.model.access.csv b/hr_accrual_bank/security/ir.model.access.csv
new file mode 100644
index 00000000..e1b1ecb4
--- /dev/null
+++ b/hr_accrual_bank/security/ir.model.access.csv
@@ -0,0 +1,7 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_accrual_user,access_hr_accrual,model_hr_accrual,hr.group_hr_user,1,0,0,0
+access_hr_accrual_line_user,access_hr_accrual_line,model_hr_accrual_line,hr.group_hr_user,1,0,0,0
+access_hr_accrual_leave_mgr,access_hr_accrual,model_hr_accrual,hr_holidays.group_hr_holidays_manager,1,1,1,1
+access_hr_accrual_leave_resp,access_hr_accrual,model_hr_accrual,hr_holidays.group_hr_holidays_responsible,1,0,0,0
+access_hr_accrual_line_leave_mgr,access_hr_accrual_line,model_hr_accrual_line,hr_holidays.group_hr_holidays_manager,1,1,1,1
+access_hr_accrual_line_leave_resp,access_hr_accrual_line,model_hr_accrual_line,hr_holidays.group_hr_holidays_responsible,1,0,0,0
diff --git a/hr_accrual_bank/static/description/icon.png b/hr_accrual_bank/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/hr_accrual_bank/static/description/icon.png differ
diff --git a/hr_accrual_bank/static/description/index.html b/hr_accrual_bank/static/description/index.html
new file mode 100644
index 00000000..116f9e3d
--- /dev/null
+++ b/hr_accrual_bank/static/description/index.html
@@ -0,0 +1,417 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Time Bank</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="time-bank">
+<h1 class="title">Time Bank</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:de6edbdb5fdc15c355783318d1bb1cc52bd0b0368b433f8ffe5940a234bc9b3f
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/hr_accrual_bank"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<div class="section" id="accruals-to-bank">
+<h1>Accruals to Bank</h1>
+<p>An Accrual is any benefit (usually time) that accrues on behalf of an employee over an extended
+period of time. This can be vacation days, sick days, or some other benefit. The actual policy
+and mechanics of bank accrual should be handled by other modules. This module only provides
+the basic framework for recording the data. While this module’s functionality overlaps with
+Odoo’s accrual leave allocations they are not the same and are not interchangeable. Specifically, this
+module:
+* Allows more complex accrual accounting (for example 1.5 days for every month for the first 12 months, then 1.75 days for the next 12 months, etc…)
+* Allows creation of accruals from salary rules during payroll processing
+* Does not attach units to the accrued amount (1.0 can mean a vacation day, a dollar, a product, or anything else depending on the module)</p>
+<p><strong>Table of contents</strong></p>
+</div>
+<div class="section" id="bug-tracker">
+<h1>Bug Tracker</h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20hr_accrual_bank%0Aversion:%2014.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>Credits</h1>
+<div class="section" id="authors">
+<h2>Authors</h2>
+<ul class="simple">
+<li>TREVI Software</li>
+<li>Michael Telahun Makonnen</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2>Other credits</h2>
+<ul class="simple">
+<li>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2>Maintainers</h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/hr_accrual_bank">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/hr_accrual_bank/static/src/img/main_screenshot.png b/hr_accrual_bank/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/hr_accrual_bank/static/src/img/main_screenshot.png differ
diff --git a/hr_accrual_bank/tests/__init__.py b/hr_accrual_bank/tests/__init__.py
new file mode 100644
index 00000000..4758ffd4
--- /dev/null
+++ b/hr_accrual_bank/tests/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2021 TREVI Software
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import test_hr_accrual
diff --git a/hr_accrual_bank/tests/test_hr_accrual.py b/hr_accrual_bank/tests/test_hr_accrual.py
new file mode 100644
index 00000000..8206ca57
--- /dev/null
+++ b/hr_accrual_bank/tests/test_hr_accrual.py
@@ -0,0 +1,56 @@
+# Copyright (C) 2021 TREVI Software
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields
+from odoo.tests import common
+
+
+class TestAccrual(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super(TestAccrual, cls).setUpClass()
+
+        cls.Accrual = cls.env["hr.accrual"]
+        cls.Allocation = cls.env["hr.leave.allocation"]
+        cls.eeJohn = cls.env["hr.employee"].create({"name": "EE John"})
+
+        # Make sure we have the rights to create, validate and delete the
+        # leaves, leave types and allocations
+        LeaveType = cls.env["hr.leave.type"].with_context(tracking_disable=True)
+
+        cls.accrual_type = LeaveType.create(
+            {
+                "name": "accrual",
+                "allocation_type": "fixed",
+                "validity_start": False,
+            }
+        )
+
+    def test_accrual_deposit_and_balance(self):
+        """The balance should be the same amount deposited"""
+
+        accrual = self.Accrual.create({"name": "A"})
+        accrual.deposit(self.eeJohn.id, 100, fields.Date.today(), "manual accrual")
+        self.assertEqual(100, accrual.get_balance(self.eeJohn.id))
+
+    def test_create_leave_allocation(self):
+        """A deposit should create a corresponding leave allocation"""
+
+        accrual = self.Accrual.create(
+            {"name": "A", "holiday_status_id": self.accrual_type.id}
+        )
+        accrual.deposit(self.eeJohn.id, 2.0, fields.Date.today(), "manual accrual")
+
+        allocs = self.Allocation.search([("name", "=", "manual accrual")])
+        self.assertEqual(1, len(allocs))
+        self.assertTrue(allocs[0].from_accrual)
+        self.assertEqual(allocs[0].allocation_type, "regular")
+        self.assertEqual(
+            0,
+            fields.Float.compare(
+                allocs[0].number_of_days_display, 2.0, precision_digits=1
+            ),
+        )
+        self.assertEqual(
+            0, fields.Float.compare(allocs[0].number_of_days, 2.0, precision_digits=1)
+        )
diff --git a/hr_accrual_bank/views/hr_accrual_view.xml b/hr_accrual_bank/views/hr_accrual_view.xml
new file mode 100644
index 00000000..bd7cc63a
--- /dev/null
+++ b/hr_accrual_bank/views/hr_accrual_view.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+
+        <record id="hr_accrual_view_tree" model="ir.ui.view">
+            <field name="name">hr.accrual.tree</field>
+            <field name="model">hr.accrual</field>
+            <field name="arch" type="xml">
+                <tree string="Accruals">
+                    <field name="name" />
+                    <field name="holiday_status_id" />
+                </tree>
+            </field>
+        </record>
+
+        <record id="hr_accrual_view_form" model="ir.ui.view">
+            <field name="name">hr.accrual.form</field>
+            <field name="model">hr.accrual</field>
+            <field name="arch" type="xml">
+                <form string="Accrual">
+                    <label for="name" string="Name" class="oe_edit_only" />
+                    <h1>
+                        <field name="name" />
+                    </h1>
+                    <group>
+                        <group>
+                            <field name="holiday_status_id" />
+                        </group>
+                    </group>
+                    <group string="Accrual Lines">
+                        <field name="line_ids" nolabel="1" />
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="open_accrual" model="ir.actions.act_window">
+            <field name="name">Accrual Time Banks</field>
+            <field name="res_model">hr.accrual</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem
+            action="open_accrual"
+            id="menu_hr_accrual"
+            parent="hr.menu_human_resources_configuration"
+            sequence="45"
+        />
+
+    </data>
+</odoo>
diff --git a/hr_attendance_day/README.rst b/hr_attendance_day/README.rst
new file mode 100644
index 00000000..7a99e3f9
--- /dev/null
+++ b/hr_attendance_day/README.rst
@@ -0,0 +1,61 @@
+==============
+Attendance Day
+==============
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:b461f524a00eb5a7a4a48e76056776fbe1b24def17935bf20729c00b7b6662f8
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/hr_attendance_day
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+This module attaches an attendance "date" field to each attendance record to signify which calendar date the record
+belongs to. The date is calculated according to the employee's timezone.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20hr_attendance_day%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+
+Other credits
+~~~~~~~~~~~~~
+
+Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/hr_attendance_day>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/hr_attendance_day/__init__.py b/hr_attendance_day/__init__.py
new file mode 100644
index 00000000..35bb139f
--- /dev/null
+++ b/hr_attendance_day/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2022 TREVI Software
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import models
diff --git a/hr_attendance_day/__manifest__.py b/hr_attendance_day/__manifest__.py
new file mode 100644
index 00000000..9a79af58
--- /dev/null
+++ b/hr_attendance_day/__manifest__.py
@@ -0,0 +1,21 @@
+# Copyright (C) 2022 TREVI Software
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    "name": "Attendance Day",
+    "summary": "Attach a localized date to an attendace record",
+    "version": "15.0.1.0.0",
+    "category": "Human Resources",
+    "author": "TREVI Software",
+    "license": "AGPL-3",
+    "images": ["static/src/img/main_screenshot.png"],
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "hr",
+        "hr_attendance",
+    ],
+    "data": [
+        "views/hr_attendance_view.xml",
+    ],
+    "installable": True,
+}
diff --git a/hr_attendance_day/i18n/hr_attendance_day.pot b/hr_attendance_day/i18n/hr_attendance_day.pot
new file mode 100644
index 00000000..ce984806
--- /dev/null
+++ b/hr_attendance_day/i18n/hr_attendance_day.pot
@@ -0,0 +1,39 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* hr_attendance_day
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: hr_attendance_day
+#: model:ir.model,name:hr_attendance_day.model_hr_attendance
+msgid "Attendance"
+msgstr ""
+
+#. module: hr_attendance_day
+#: model:ir.model.fields,field_description:hr_attendance_day.field_hr_attendance__day
+msgid "Day"
+msgstr ""
+
+#. module: hr_attendance_day
+#: model:ir.model.fields,field_description:hr_attendance_day.field_hr_attendance__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: hr_attendance_day
+#: model:ir.model.fields,field_description:hr_attendance_day.field_hr_attendance__id
+msgid "ID"
+msgstr ""
+
+#. module: hr_attendance_day
+#: model:ir.model.fields,field_description:hr_attendance_day.field_hr_attendance____last_update
+msgid "Last Modified on"
+msgstr ""
diff --git a/hr_attendance_day/models/__init__.py b/hr_attendance_day/models/__init__.py
new file mode 100644
index 00000000..2064bbcb
--- /dev/null
+++ b/hr_attendance_day/models/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2022 TREVI Software
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import hr_attendance
diff --git a/hr_attendance_day/models/hr_attendance.py b/hr_attendance_day/models/hr_attendance.py
new file mode 100644
index 00000000..e100a9f3
--- /dev/null
+++ b/hr_attendance_day/models/hr_attendance.py
@@ -0,0 +1,21 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from pytz import timezone, utc
+
+from odoo import api, fields, models
+
+
+class HrAttendance(models.Model):
+    _inherit = "hr.attendance"
+
+    day = fields.Date(compute="_compute_day", store=True)
+
+    @api.depends("check_in")
+    def _compute_day(self):
+
+        for att in self:
+            local_tz = timezone(att.employee_id.tz)
+            utc_check_in = utc.localize(att.check_in)
+            tz_check_in = utc_check_in.astimezone(local_tz)
+            att.day = tz_check_in.date()
diff --git a/hr_attendance_day/readme/CREDITS.rst b/hr_attendance_day/readme/CREDITS.rst
new file mode 100644
index 00000000..47150bbd
--- /dev/null
+++ b/hr_attendance_day/readme/CREDITS.rst
@@ -0,0 +1 @@
+Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/hr_attendance_day/readme/DESCRIPTION.rst b/hr_attendance_day/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..94965b28
--- /dev/null
+++ b/hr_attendance_day/readme/DESCRIPTION.rst
@@ -0,0 +1,2 @@
+This module attaches an attendance "date" field to each attendance record to signify which calendar date the record
+belongs to. The date is calculated according to the employee's timezone.
diff --git a/hr_attendance_day/static/description/icon.png b/hr_attendance_day/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/hr_attendance_day/static/description/icon.png differ
diff --git a/hr_attendance_day/static/description/index.html b/hr_attendance_day/static/description/index.html
new file mode 100644
index 00000000..c0b2cccb
--- /dev/null
+++ b/hr_attendance_day/static/description/index.html
@@ -0,0 +1,415 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Attendance Day</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="attendance-day">
+<h1 class="title">Attendance Day</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:b461f524a00eb5a7a4a48e76056776fbe1b24def17935bf20729c00b7b6662f8
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/hr_attendance_day"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<p>This module attaches an attendance “date” field to each attendance record to signify which calendar date the record
+belongs to. The date is calculated according to the employee’s timezone.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-4">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20hr_attendance_day%0Aversion:%2014.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="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>TREVI Software</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-4">Other credits</a></h2>
+<p>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</p>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/hr_attendance_day">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/hr_attendance_day/static/src/img/main_screenshot.png b/hr_attendance_day/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/hr_attendance_day/static/src/img/main_screenshot.png differ
diff --git a/hr_attendance_day/tests/__init__.py b/hr_attendance_day/tests/__init__.py
new file mode 100644
index 00000000..16bc4606
--- /dev/null
+++ b/hr_attendance_day/tests/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2022 TREVI Software
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import test_hr_attendance
diff --git a/hr_attendance_day/tests/test_hr_attendance.py b/hr_attendance_day/tests/test_hr_attendance.py
new file mode 100644
index 00000000..48549c2d
--- /dev/null
+++ b/hr_attendance_day/tests/test_hr_attendance.py
@@ -0,0 +1,96 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import date, datetime
+
+from odoo.tests import common
+
+
+class TestHrAttendance(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.Attendance = cls.env["hr.attendance"]
+
+        # Africa/Accra is UTC + 0:00
+        cls.john = cls.env["hr.employee"].create({"name": "John", "tz": "Africa/Accra"})
+
+        # Africa/Addis_Ababa is UTC + 3:00
+        cls.sally = cls.env["hr.employee"].create(
+            {"name": "Sally", "tz": "Africa/Addis_Ababa"}
+        )
+
+    def test_utc_and_tz_match(self):
+
+        check_in = datetime(2022, 4, 1, 23, 59, 59)
+        check_out = datetime(2022, 4, 2, 8, 0)
+        att = self.Attendance.create(
+            {
+                "employee_id": self.john.id,
+                "check_in": check_in,
+                "check_out": check_out,
+            }
+        )
+
+        self.assertEqual(
+            att.day,
+            date(2022, 4, 1),
+            "Timezone with zero offset (1) from UTC has correct date",
+        )
+
+        check_in = datetime(2022, 4, 3, 0, 0, 0)
+        check_out = datetime(2022, 4, 3, 8, 0)
+        att = self.Attendance.create(
+            {
+                "employee_id": self.john.id,
+                "check_in": check_in,
+                "check_out": check_out,
+            }
+        )
+
+        self.assertEqual(
+            att.day,
+            date(2022, 4, 3),
+            "Timezone with zero offset (2) from UTC has correct date",
+        )
+
+    def test_utc_and_tz_mismatch(self):
+
+        att = self.Attendance.create(
+            {
+                "employee_id": self.sally.id,
+                "check_in": datetime(2022, 4, 1, 21, 0),
+                "check_out": datetime(2022, 4, 2, 5, 0),
+            }
+        )
+
+        self.assertEqual(
+            att.day,
+            date(2022, 4, 2),
+            "Timezone with +3:00 offset (1) from UTC has correct date",
+        )
+
+    def test_update(self):
+
+        att = self.Attendance.create(
+            {
+                "employee_id": self.sally.id,
+                "check_in": datetime(2022, 4, 1, 21, 0),
+                "check_out": datetime(2022, 4, 2, 5, 0),
+            }
+        )
+
+        self.assertEqual(
+            att.day,
+            date(2022, 4, 2),
+            "Timezone with +3:00 offset (1) from UTC has correct date",
+        )
+
+        att.check_in = datetime(2022, 4, 1, 20, 59, 59)
+        self.assertEqual(
+            att.day,
+            date(2022, 4, 1),
+            "Changing check-in backwards by 1 second from midnight (in local tz) "
+            "changes the day",
+        )
diff --git a/hr_attendance_day/views/hr_attendance_view.xml b/hr_attendance_day/views/hr_attendance_view.xml
new file mode 100644
index 00000000..8dbb4223
--- /dev/null
+++ b/hr_attendance_day/views/hr_attendance_view.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="view_attendance_tree" model="ir.ui.view">
+        <field name="name">hr.attendance.tree.payroll_policy_payslip</field>
+        <field name="model">hr.attendance</field>
+        <field name="inherit_id" ref="hr_attendance.view_attendance_tree" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='worked_hours']" position="after">
+                <field name="day" />
+            </xpath>
+        </field>
+    </record>
+
+    <record id="hr_attendance_view_form" model="ir.ui.view">
+        <field name="name">hr.attendance.form.payroll_policy_payslip</field>
+        <field name="model">hr.attendance</field>
+        <field name="inherit_id" ref="hr_attendance.hr_attendance_view_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='check_out']" position="after">
+                <field name="day" readonly="1" />
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/hr_benefit/README.rst b/hr_benefit/README.rst
new file mode 100644
index 00000000..0161d239
--- /dev/null
+++ b/hr_benefit/README.rst
@@ -0,0 +1,79 @@
+==================
+Benefit Management
+==================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:6d8231e1e849f6c64514bb282ee18348de44836c96e61ad253f584952dbf1da7
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/hr_benefit
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+Manage Employee Benefits
+========================
+This module provides a comprehensive employee benefits management solution.
+* Create benefits and their respective earnings and premiums
+* Earnings and Premiums have effective dates to reflect changes over time
+* The amounts in the benefit can be overriden in individual policies as necessary
+* Benefits can be linked to payroll through the benefit code
+
+Some possible uses:
+* Travel, Housing and other such allowances
+* Employee personal medical expenses re-imbursement plans
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Changelog
+=========
+
+14.0.1.0.1 (2022-04-07)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* [FIX] Creating a policy no longer fails because of a non-existent benefit
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20hr_benefit%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+* Michael Telahun Makonnen
+
+Other credits
+~~~~~~~~~~~~~
+
+* Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/hr_benefit>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/hr_benefit/__init__.py b/hr_benefit/__init__.py
new file mode 100644
index 00000000..91f9882b
--- /dev/null
+++ b/hr_benefit/__init__.py
@@ -0,0 +1,6 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013,2014 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
+from . import wizard
diff --git a/hr_benefit/__manifest__.py b/hr_benefit/__manifest__.py
new file mode 100644
index 00000000..36710535
--- /dev/null
+++ b/hr_benefit/__manifest__.py
@@ -0,0 +1,34 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013,2014 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Benefit Management",
+    "summary": "Assign benefits and deductables to employees",
+    "version": "15.0.1.0.0",
+    "category": "Human Resources",
+    "author": "TREVI Software, Michael Telahun Makonnen",
+    "license": "AGPL-3",
+    "images": ["static/src/img/main_screenshot.png"],
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "hr",
+        "hr_contract_status",
+        "hr_employee_seniority_months",
+    ],
+    "data": [
+        "security/ir.model.access.csv",
+        "security/security.xml",
+        "wizard/end_policy.xml",
+        "wizard/enroll_employee_view.xml",
+        "wizard/enroll_multi_employee_view.xml",
+        "views/benefit_view.xml",
+        "views/benefit_premium_view.xml",
+        "views/benefit_earning_view.xml",
+        "views/benefit_policy_view.xml",
+        "views/benefit_claim_view.xml",
+        "views/hr_employee_view.xml",
+        "data/benefit_sequence.xml",
+    ],
+    "installable": True,
+}
diff --git a/hr_benefit/data/benefit_sequence.xml b/hr_benefit/data/benefit_sequence.xml
new file mode 100644
index 00000000..5a97ac7c
--- /dev/null
+++ b/hr_benefit/data/benefit_sequence.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data noupdate="1">
+        <record id="seq_benefit_policy_ref" model="ir.sequence">
+            <field name="name">Benefit Policy Reference</field>
+            <field name="code">benefit.policy.ref</field>
+            <field name="prefix">BP/%(year)s/</field>
+            <field name="padding">5</field>
+        </record>
+    </data>
+</odoo>
diff --git a/hr_benefit/i18n/hr_benefit.pot b/hr_benefit/i18n/hr_benefit.pot
new file mode 100644
index 00000000..64e61d04
--- /dev/null
+++ b/hr_benefit/i18n/hr_benefit.pot
@@ -0,0 +1,1047 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* hr_benefit
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_annual_day__10
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_month_day__10
+msgid "10"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_annual_day__11
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_month_day__11
+msgid "11"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_annual_day__12
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_month_day__12
+msgid "12"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_annual_day__13
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_month_day__13
+msgid "13"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_annual_day__14
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_month_day__14
+msgid "14"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_annual_day__15
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_month_day__15
+msgid "15"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_annual_day__16
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_month_day__16
+msgid "16"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_annual_day__17
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_month_day__17
+msgid "17"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_annual_day__18
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_month_day__18
+msgid "18"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_annual_day__19
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_month_day__19
+msgid "19"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_annual_day__20
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_month_day__20
+msgid "20"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_annual_day__21
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_month_day__21
+msgid "21"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_annual_day__22
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_month_day__22
+msgid "22"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_annual_day__23
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_month_day__23
+msgid "23"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_annual_day__24
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_month_day__24
+msgid "24"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_annual_day__25
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_month_day__25
+msgid "25"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_annual_day__26
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_month_day__26
+msgid "26"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_annual_day__27
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_month_day__27
+msgid "27"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_annual_day__28
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_month_day__28
+msgid "28"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_annual_day__29
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_month_day__29
+msgid "29"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_annual_day__30
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_month_day__30
+msgid "30"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_annual_day__31
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_month_day__31
+msgid "31"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit__active
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_advantage__active
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_policy__active
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_premium__active
+msgid "Active"
+msgstr ""
+
+#. module: hr_benefit
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_benefit_policy_filter
+msgid "Active Policies"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_enroll_multi_employee__advantage_amount
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_policy__advantage_amount
+msgid "Advantage Amount"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_policy__advantage_override_amount
+msgid "Advantage Override Amount"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.actions.act_window,name:hr_benefit.open_all_claims_view
+#: model:ir.ui.menu,name:hr_benefit.menu_all_claims
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_all_claims_tree
+msgid "All Claims"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__type__allowance
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_benefit_policy_advantage_form
+msgid "Allowance"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_limit_period__annual
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_premium__type__annual
+msgid "Annual"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,help:hr_benefit.field_hr_benefit_advantage__job_ids
+msgid "Applies only to these job positions"
+msgstr ""
+
+#. module: hr_benefit
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_all_claims_form
+msgid "Approve"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_claim__state__approve
+msgid "Approved"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_claim__amount_approved
+msgid "Approved Amount"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_annual_month__4
+msgid "April"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_annual_month__8
+msgid "August"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_advantage__benefit_id
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_enroll_employee__benefit_id
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_enroll_multi_employee__benefit_id
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_policy__benefit_id
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_premium__benefit_id
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_benefit_policy_filter
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_benefits_form
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_benefits_policy_form
+msgid "Benefit"
+msgstr ""
+
+#. module: hr_benefit
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_benefit_policy_advantage_form
+msgid "Benefit Advantage"
+msgstr ""
+
+#. module: hr_benefit
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_benefit_policy_advantage_tree
+msgid "Benefit Advantages"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model,name:hr_benefit.model_hr_benefit_policy
+msgid "Benefit Enrollment"
+msgstr ""
+
+#. module: hr_benefit
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_benefits_policy_tree
+msgid "Benefit Policies"
+msgstr ""
+
+#. module: hr_benefit
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_benefits_policy_form
+msgid "Benefit Policy"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model,name:hr_benefit.model_hr_benefit_policy_end
+msgid "Benefit Policy Termination Wizard"
+msgstr ""
+
+#. module: hr_benefit
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_benefit_policy_premium_form
+msgid "Benefit Premium"
+msgstr ""
+
+#. module: hr_benefit
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_benefit_policy_premium_tree
+msgid "Benefit Premium Policies"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model,name:hr_benefit.model_hr_benefit_claim
+msgid "Benefit claim"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.actions.act_window,name:hr_benefit.act_hr_employee_2_hr_benefit_policy
+#: model:ir.actions.act_window,name:hr_benefit.open_benefits_view
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_employee__benefit_policy_ids
+#: model:ir.ui.menu,name:hr_benefit.menu_benefits
+#: model:ir.ui.menu,name:hr_benefit.menu_benefits_configuration
+#: model_terms:ir.ui.view,arch_db:hr_benefit.hr_employee_view_form
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_benefits_tree
+msgid "Benefits"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.ui.menu,name:hr_benefit.menu_benefits_root
+msgid "Benefits Management"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_policy__advantage_override
+msgid "Change Advantage Amount"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_policy__premium_override
+msgid "Change Premium Amount"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,help:hr_benefit.field_hr_benefit_policy__advantage_override
+msgid ""
+"Check this field if the amount of the advantage should be changed in the "
+"policy."
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,help:hr_benefit.field_hr_benefit_policy__premium_override
+msgid ""
+"Check this field if the amount of the premium should be changed in the "
+"policy."
+msgstr ""
+
+#. module: hr_benefit
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_all_claims_form
+msgid "Claim"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_employee__benefit_claims_count
+#: model_terms:ir.ui.view,arch_db:hr_benefit.hr_employee_view_form
+msgid "Claims"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.ui.menu,name:hr_benefit.menu_claims_root
+msgid "Claims & Payments"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.actions.act_window,name:hr_benefit.act_hr_employee_2_hr_benefit_claims
+msgid "Claims on Benefits"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit__code
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_policy__benefit_code
+msgid "Code"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit__company_id
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_policy__company_id
+msgid "Company"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit__create_uid
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_advantage__create_uid
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_claim__create_uid
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_enroll_employee__create_uid
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_enroll_multi_employee__create_uid
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_policy__create_uid
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_policy_end__create_uid
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_premium__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit__create_date
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_advantage__create_date
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_claim__create_date
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_enroll_employee__create_date
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_enroll_multi_employee__create_date
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_policy__create_date
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_policy_end__create_date
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_premium__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: hr_benefit
+#: code:addons/hr_benefit/models/benefit_policy.py:0
+#, python-format
+msgid "Critical Error. Unable to obtain a benefit policy number!"
+msgstr ""
+
+#. module: hr_benefit
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_benefit_policy_filter
+msgid "Current Policies"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_claim__date
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_claims_filter
+msgid "Date"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_policy__start_date
+msgid "Date of Enrollment"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_advantage__reim_period_annual_day
+msgid "Day of Month"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_annual_month__12
+msgid "December"
+msgstr ""
+
+#. module: hr_benefit
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_all_claims_form
+msgid "Decline"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_claim__state__decline
+msgid "Declined"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_advantage__allowance_amount
+msgid "Default Amount"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_policy__department_id
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_benefit_policy_filter
+msgid "Department"
+msgstr ""
+
+#. module: hr_benefit
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_benefits_policy_form
+msgid "Details"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit__display_name
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_advantage__display_name
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_claim__display_name
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_enroll_employee__display_name
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_enroll_multi_employee__display_name
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_policy__display_name
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_policy_end__display_name
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_premium__display_name
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_employee__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_policy__state__done
+msgid "Done"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_claim__state__draft
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_policy__state__draft
+msgid "Draft"
+msgstr ""
+
+#. module: hr_benefit
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_benefits_policy_form
+msgid "Duration"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_advantage__type
+msgid "Earning Type"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.actions.act_window,name:hr_benefit.open_benefits_policy_advantage_view
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit__advantage_ids
+#: model:ir.ui.menu,name:hr_benefit.menu_benefits_policy_advantage
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_benefits_form
+msgid "Earnings"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_advantage__effective_date
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_premium__effective_date
+msgid "Effective Date"
+msgstr ""
+
+#. module: hr_benefit
+#: code:addons/hr_benefit/models/benefit_allwance.py:0
+#: model:ir.model.constraint,message:hr_benefit.constraint_hr_benefit_advantage_unique_date_benefit_id
+#, python-format
+msgid "Effective date must be unique per advantage in a benefit!"
+msgstr ""
+
+#. module: hr_benefit
+#: code:addons/hr_benefit/models/benefit_premium.py:0
+#: model:ir.model.constraint,message:hr_benefit.constraint_hr_benefit_premium_unique_date_benefit_id
+#, python-format
+msgid "Effective dates must be unique per premium in a benefit!"
+msgstr ""
+
+#. module: hr_benefit
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_benefit_policy_advantage_form
+msgid "Elegibility"
+msgstr ""
+
+#. module: hr_benefit
+#: code:addons/hr_benefit/models/benefit_policy.py:0
+#, python-format
+msgid ""
+"Eligibility Requirements Unmet. The employee does not meet eligibility "
+"requirements for this benefit."
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model,name:hr_benefit.model_hr_employee
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_claim__employee_id
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_enroll_employee__employee_id
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_enroll_multi_employee__employee_ids
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_policy__employee_id
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_benefit_policy_filter
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_claims_filter
+msgid "Employee"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model,name:hr_benefit.model_hr_benefit
+msgid "Employee Benefit"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model,name:hr_benefit.model_hr_benefit_enroll_employee
+#: model:ir.model,name:hr_benefit.model_hr_benefit_enroll_multi_employee
+msgid "Employee Benefit Enrollment Form"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model,name:hr_benefit.model_hr_benefit_advantage
+msgid "Employee Benefit Policy Earning Line"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model,name:hr_benefit.model_hr_benefit_premium
+msgid "Employee Benefit Premium Policy Line"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_advantage__category_ids
+msgid "Employee Categories"
+msgstr ""
+
+#. module: hr_benefit
+#: model_terms:ir.ui.view,arch_db:hr_benefit.enroll_multi_employee_form
+msgid "Employees"
+msgstr ""
+
+#. module: hr_benefit
+#: model_terms:ir.ui.view,arch_db:hr_benefit.end_benefit_policy_form
+msgid "End Benefit Policy"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_policy_end__date
+msgid "End Date"
+msgstr ""
+
+#. module: hr_benefit
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_benefits_policy_form
+msgid "End Policy"
+msgstr ""
+
+#. module: hr_benefit
+#: model_terms:ir.ui.view,arch_db:hr_benefit.enroll_employee_form
+#: model_terms:ir.ui.view,arch_db:hr_benefit.enroll_multi_employee_form
+msgid "Enroll"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.actions.act_window,name:hr_benefit.action_enroll_employee
+#: model:ir.actions.server,name:hr_benefit.server_action_enroll_employee
+#: model_terms:ir.ui.view,arch_db:hr_benefit.enroll_employee_form
+#: model_terms:ir.ui.view,arch_db:hr_benefit.enroll_multi_employee_form
+msgid "Enroll Employee"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.actions.act_window,name:hr_benefit.action_enroll_multiemployee
+#: model:ir.actions.server,name:hr_benefit.server_action_enroll_multiemployee
+msgid "Enroll Multiple Employees"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_enroll_employee__start_date
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_enroll_multi_employee__start_date
+msgid "Enrollment Date"
+msgstr ""
+
+#. module: hr_benefit
+#: code:addons/hr_benefit/models/benefit_claim.py:0
+#, python-format
+msgid "ErrorYou may not a delete a claim that is not in a \"Draft\" state"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_advantage__invert_categories
+msgid "Exclude Categories"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_advantage__invert_jobs
+msgid "Exclude Jobs"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__type__reimburse
+msgid "Expense Reimbursement"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_annual_month__2
+msgid "February"
+msgstr ""
+
+#. module: hr_benefit
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_benefit_policy_filter
+msgid "Filters policies that are not terminated."
+msgstr ""
+
+#. module: hr_benefit
+#: model_terms:ir.ui.view,arch_db:hr_benefit.end_benefit_policy_form
+msgid "Finish"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_advantage__reim_period_month_day
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_benefit_policy_advantage_form
+msgid "First Day of Cycle"
+msgstr ""
+
+#. module: hr_benefit
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_benefits_policy_form
+msgid "General"
+msgstr ""
+
+#. module: hr_benefit
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_benefit_policy_filter
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_claims_filter
+msgid "Group By..."
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit__has_advantage
+msgid "Has Advantage"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit__has_premium
+msgid "Has Premium"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit__id
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_advantage__id
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_claim__id
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_enroll_employee__id
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_enroll_multi_employee__id
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_policy__id
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_policy_end__id
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_premium__id
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_employee__id
+msgid "ID"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,help:hr_benefit.field_hr_benefit_advantage__allowance_amount
+msgid ""
+"If the allowance is not calculated in the salary rule this is the amount of "
+"the allowance"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,help:hr_benefit.field_hr_benefit_advantage__invert_categories
+msgid ""
+"If this is checked invert the sense of the match for the categories list. "
+"Exclude employees in the selected categories."
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,help:hr_benefit.field_hr_benefit_advantage__invert_jobs
+msgid ""
+"If this is checked invert the sense of the match for the jobs list. Exclude "
+"employees in the selected jobs."
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_advantage__job_ids
+msgid "Included Job Positions"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_annual_month__1
+msgid "January"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_annual_month__7
+msgid "July"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_annual_month__6
+msgid "June"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit____last_update
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_advantage____last_update
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_claim____last_update
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_enroll_employee____last_update
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_enroll_multi_employee____last_update
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_policy____last_update
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_policy_end____last_update
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_premium____last_update
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_employee____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit__write_uid
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_advantage__write_uid
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_claim__write_uid
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_enroll_employee__write_uid
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_enroll_multi_employee__write_uid
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_policy__write_uid
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_policy_end__write_uid
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_premium__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit__write_date
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_advantage__write_date
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_claim__write_date
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_enroll_employee__write_date
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_enroll_multi_employee__write_date
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_policy__write_date
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_policy_end__write_date
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_premium__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: hr_benefit
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_benefit_policy_advantage_form
+msgid "Limit"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_advantage__reim_limit_amount
+msgid "Limit Amount"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_advantage__reim_limit_period
+msgid "Limit Period"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__type__loan
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_benefit_policy_advantage_form
+msgid "Loan"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_advantage__loan_amount
+msgid "Loan Amount"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_annual_month__3
+msgid "March"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_annual_month__5
+msgid "May"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit__min_employed_days
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_advantage__min_employed_days
+msgid "Minimum Employed Days"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_advantage__reim_period_annual_month
+msgid "Month"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_limit_period__monthly
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_premium__type__monthly
+msgid "Monthly"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit__multi_policy
+msgid "Multiple Policies/Employee"
+msgstr ""
+
+#. module: hr_benefit
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_claims_filter
+msgid "My Claims"
+msgstr ""
+
+#. module: hr_benefit
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_benefit_policy_filter
+msgid "My Policies"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit__name
+msgid "Name"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_advantage__reim_nolimit
+msgid "No Limit"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_enroll_multi_employee__premium_installments
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_policy__premium_installments
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_premium__no_of_installments
+msgid "No. of Installments"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_annual_month__11
+msgid "November"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,help:hr_benefit.field_hr_benefit_advantage__min_employed_days
+msgid ""
+"Number of days of employment before employee is eligible for this advantage."
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_annual_month__10
+msgid "October"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_policy__state__open
+msgid "Open"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_enroll_multi_employee__advantage_override
+msgid "Override Advantage"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_enroll_multi_employee__premium_override
+msgid "Override Premium"
+msgstr ""
+
+#. module: hr_benefit
+#: model_terms:ir.ui.view,arch_db:hr_benefit.end_benefit_policy_form
+msgid "Please enter the last day of the policy in the field provided below."
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.actions.act_window,name:hr_benefit.open_benefits_policy_view
+#: model:ir.actions.act_window,name:hr_benefit.open_my_benefit_policies
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_employee__benefit_policies_count
+#: model:ir.ui.menu,name:hr_benefit.menu_my_benefit_policies
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_benefit_policy_filter
+msgid "Policies"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_claim__benefit_policy_id
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_claims_filter
+msgid "Policy"
+msgstr ""
+
+#. module: hr_benefit
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_benefits_form
+msgid "Premium"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_enroll_multi_employee__premium_amount
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_policy__premium_amount
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_premium__amount
+msgid "Premium Amount"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_policy__premium_override_amount
+msgid "Premium Override Amount"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_policy__premium_override_total
+msgid "Premium Override Total"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_enroll_multi_employee__premium_total
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_policy__premium_total
+msgid "Premium Total"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_premium__type
+msgid "Premium Type"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.actions.act_window,name:hr_benefit.open_benefits_policy_premium_view
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit__premium_ids
+#: model:ir.ui.menu,name:hr_benefit.menu_benefits_policy_premium
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_benefits_form
+msgid "Premiums"
+msgstr ""
+
+#. module: hr_benefit
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_benefit_policy_advantage_form
+msgid "Re-imbursement"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_policy__name
+msgid "Reference"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_policy__note
+msgid "Remarks"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_claim__amount_requested
+msgid "Requested Amount"
+msgstr ""
+
+#. module: hr_benefit
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_all_claims_form
+msgid "Reset to New"
+msgstr ""
+
+#. module: hr_benefit
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_claims_filter
+msgid "Search All Claims"
+msgstr ""
+
+#. module: hr_benefit
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_benefit_policy_filter
+msgid "Search Benefit Policies"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields.selection,name:hr_benefit.selection__hr_benefit_advantage__reim_period_annual_month__9
+msgid "September"
+msgstr ""
+
+#. module: hr_benefit
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_benefit_policy_filter
+msgid "Start Date"
+msgstr ""
+
+#. module: hr_benefit
+#: model_terms:ir.ui.view,arch_db:hr_benefit.view_benefits_policy_form
+msgid "Start Policy"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_claim__state
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_policy__state
+msgid "State"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_enroll_employee__end_date
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_enroll_multi_employee__end_date
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_policy__end_date
+msgid "Termination Date"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,help:hr_benefit.field_hr_benefit_advantage__loan_amount
+msgid "The amount advanced to the employee"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,help:hr_benefit.field_hr_benefit_claim__date
+msgid "The date the claim was made"
+msgstr ""
+
+#. module: hr_benefit
+#: code:addons/hr_benefit/models/benefit_policy.py:0
+#, python-format
+msgid ""
+"The employee is already enrolled in this benefit program.\n"
+"%s\n"
+"Policy: %s"
+msgstr ""
+
+#. module: hr_benefit
+#: model:ir.model.fields,field_description:hr_benefit.field_hr_benefit_premium__total_amount
+msgid "Total"
+msgstr ""
+
+#. module: hr_benefit
+#: code:addons/hr_benefit/wizard/end_policy.py:0
+#, python-format
+msgid "Unable to determine Benefit Policy."
+msgstr ""
+
+#. module: hr_benefit
+#: code:addons/hr_benefit/models/benefit_allwance.py:0
+#, python-format
+msgid ""
+"Wrong earning type for this operation. Use 'Expense Re-imbursement' instead."
+msgstr ""
+
+#. module: hr_benefit
+#: code:addons/hr_benefit/models/benefit_policy.py:0
+#, python-format
+msgid "You cannot set a policy in 'Done' state to any other value."
+msgstr ""
+
+#. module: hr_benefit
+#: code:addons/hr_benefit/models/benefit_claim.py:0
+#, python-format
+msgid "You cannot set an approved claim back to 'draft' state."
+msgstr ""
+
+#. module: hr_benefit
+#: code:addons/hr_benefit/models/benefit_policy.py:0
+#: code:addons/hr_benefit/models/benefit_policy.py:0
+#, python-format
+msgid "You cannot set an open policy back to 'draft' state."
+msgstr ""
+
+#. module: hr_benefit
+#: code:addons/hr_benefit/models/benefit_policy.py:0
+#, python-format
+msgid ""
+"You may not delete a policy that is not in a \"draft\" state.\n"
+"Policy No: %s"
+msgstr ""
diff --git a/hr_benefit/models/__init__.py b/hr_benefit/models/__init__.py
new file mode 100644
index 00000000..9e1aff28
--- /dev/null
+++ b/hr_benefit/models/__init__.py
@@ -0,0 +1,10 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013,2014 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import benefit
+from . import benefit_allwance
+from . import benefit_claim
+from . import benefit_policy
+from . import benefit_premium
+from . import hr_employee
diff --git a/hr_benefit/models/benefit.py b/hr_benefit/models/benefit.py
new file mode 100644
index 00000000..0e66008d
--- /dev/null
+++ b/hr_benefit/models/benefit.py
@@ -0,0 +1,85 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013,2014 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import fields, models
+
+
+class Benefit(models.Model):
+
+    _name = "hr.benefit"
+    _description = "Employee Benefit"
+    _check_company_auto = True
+
+    name = fields.Char(required=True)
+    code = fields.Char(required=True)
+    has_premium = fields.Boolean()
+    premium_ids = fields.One2many(
+        string="Premiums", comodel_name="hr.benefit.premium", inverse_name="benefit_id"
+    )
+    has_advantage = fields.Boolean()
+    advantage_ids = fields.One2many(
+        string="Earnings",
+        comodel_name="hr.benefit.advantage",
+        inverse_name="benefit_id",
+    )
+    min_employed_days = fields.Integer(string="Minimum Employed Days", default=0)
+    active = fields.Boolean(default=True)
+    multi_policy = fields.Boolean(string="Multiple Policies/Employee", default=False)
+    company_id = fields.Many2one(
+        "res.company", required=True, default=lambda self: self.env.company
+    )
+
+    def name_get(self):
+
+        res = []
+        for rec in self:
+            res.append((rec.id, "[%s] %s" % (rec.code, rec.name)))
+
+        return res
+
+    def _get_latest(self, dToday, ptype):
+        """
+        Return an advantage with an effective date before dToday but
+        greater than all others.
+        """
+
+        if not self or not dToday:
+            return None
+        self.ensure_one()
+
+        res = None
+        line_ids = None
+        if ptype == "advantage":
+            line_ids = self.advantage_ids
+        elif ptype == "premium":
+            line_ids = self.premium_ids
+
+        for line in line_ids:
+            dLine = line.effective_date
+            if dLine <= dToday:
+                if res is None:
+                    res = line
+                elif dLine > res.effective_date:
+                    res = line
+
+        return res
+
+    def get_latest_advantage(self, dToday):
+        """
+        Return an advantage with an effective date before dToday but
+        greater than all others.
+        """
+
+        if not dToday:
+            return None
+
+        return self._get_latest(dToday, "advantage")
+
+    def get_latest_premium(self, dToday):
+        """Return a premium with an effective date before dToday but greater than all others"""
+
+        if not dToday:
+            return None
+
+        return self._get_latest(dToday, "premium")
diff --git a/hr_benefit/models/benefit_allwance.py b/hr_benefit/models/benefit_allwance.py
new file mode 100644
index 00000000..34c9fcaf
--- /dev/null
+++ b/hr_benefit/models/benefit_allwance.py
@@ -0,0 +1,237 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013,2014 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import timedelta
+
+from dateutil.relativedelta import relativedelta
+
+from odoo import _, fields, models
+from odoo.exceptions import UserError
+
+DAY_SELECT = [
+    ("1", "1"),
+    ("2", "2"),
+    ("3", "3"),
+    ("4", "4"),
+    ("5", "5"),
+    ("6", "6"),
+    ("7", "7"),
+    ("8", "8"),
+    ("9", "9"),
+    ("10", "10"),
+    ("11", "11"),
+    ("12", "12"),
+    ("13", "13"),
+    ("14", "14"),
+    ("15", "15"),
+    ("16", "16"),
+    ("17", "17"),
+    ("18", "18"),
+    ("19", "19"),
+    ("20", "20"),
+    ("21", "21"),
+    ("22", "22"),
+    ("23", "23"),
+    ("24", "24"),
+    ("25", "25"),
+    ("26", "26"),
+    ("27", "27"),
+    ("28", "28"),
+    ("29", "29"),
+    ("30", "30"),
+    ("31", "31"),
+]
+
+
+class BenefitAdvantage(models.Model):
+
+    _name = "hr.benefit.advantage"
+    _description = "Employee Benefit Policy Earning Line"
+    _rec_name = "effective_date"
+    _order = "benefit_id,effective_date desc"
+    _sql_constraints = [
+        (
+            "unique_date_benefit_id",
+            "UNIQUE(effective_date,benefit_id)",
+            _("Effective date must be unique per advantage in a benefit!"),
+        )
+    ]
+
+    benefit_id = fields.Many2one(string="Benefit", comodel_name="hr.benefit")
+    effective_date = fields.Date(required=True)
+    min_employed_days = fields.Integer(
+        string="Minimum Employed Days",
+        help="Number of days of employment before employee is eligible for this advantage.",
+    )
+    type = fields.Selection(
+        string="Earning Type",
+        selection=[
+            ("allowance", "Allowance"),
+            ("reimburse", "Expense Reimbursement"),
+            ("loan", "Loan"),
+        ],
+        required=True,
+    )
+    allowance_amount = fields.Float(
+        string="Default Amount",
+        digits="Account",
+        help="If the allowance is not calculated in the salary "
+        "rule this is the amount of the allowance",
+    )
+    reim_nolimit = fields.Boolean(string="No Limit")
+    reim_limit_amount = fields.Float(string="Limit Amount", digits="Account")
+    reim_limit_period = fields.Selection(
+        string="Limit Period",
+        selection=[
+            ("monthly", "Monthly"),
+            ("annual", "Annual"),
+        ],
+    )
+    reim_period_month_day = fields.Selection(
+        string="First Day of Cycle",
+        selection=DAY_SELECT,
+    )
+    reim_period_annual_month = fields.Selection(
+        string="Month",
+        selection=[
+            ("1", "January"),
+            ("2", "February"),
+            ("3", "March"),
+            ("4", "April"),
+            ("5", "May"),
+            ("6", "June"),
+            ("7", "July"),
+            ("8", "August"),
+            ("9", "September"),
+            ("10", "October"),
+            ("11", "November"),
+            ("12", "December"),
+        ],
+    )
+    reim_period_annual_day = fields.Selection(
+        string="Day of Month",
+        selection=DAY_SELECT,
+    )
+    loan_amount = fields.Float(
+        digits="Payroll", help="The amount advanced to the employee"
+    )
+    category_ids = fields.Many2many(
+        string="Employee Categories",
+        comodel_name="hr.employee.category",
+        relation="benefit_advantage_category_rel",
+        column1="advantage_id",
+        column2="category_id",
+    )
+    job_ids = fields.Many2many(
+        string="Included Job Positions",
+        comodel_name="hr.job",
+        relation="benefit_advantage_job_rel",
+        column1="advantage_id",
+        column2="job_id",
+        help="Applies only to these job positions",
+    )
+    invert_categories = fields.Boolean(
+        string="Exclude Categories",
+        help="If this is checked invert the sense of the "
+        "match for the categories list. Exclude employees "
+        "in the selected categories.",
+    )
+    invert_jobs = fields.Boolean(
+        string="Exclude Jobs",
+        help="If this is checked invert the sense of the "
+        "match for the jobs list. Exclude employees in "
+        "the selected jobs.",
+    )
+    active = fields.Boolean(default=True)
+
+    def name_get(self):
+        res = []
+        for rec in self:
+            res.append(
+                (rec.id, "{} {}".format(rec.benefit_id.name, rec.effective_date))
+            )
+        return res
+
+    def get_claims_in_period(self, employee_id, day):
+
+        d = day
+        period = self.reim_limit_period
+        if period == "monthly":
+            diff = d.day - int(self.reim_period_month_day)
+            if diff == 0:
+                dStart = d
+            elif diff > 0:
+                dStart = d + timedelta(days=-(diff))
+            else:
+                dStart = d + relativedelta(months=-1, days=diff)
+            dNextStart = dStart + relativedelta(months=+1)
+        elif period == "annual":
+            day_diff = d.day - int(self.reim_period_annual_day)
+            month_diff = d.month - int(self.reim_period_annual_month)
+            if month_diff == 0:
+                dStart = d
+            elif month_diff > 0:
+                dStart = d + relativedelta(months=-(month_diff))
+            else:
+                # month_diff is negative, but: -(-) = +
+                dStart = d + relativedelta(months=-(month_diff))
+            if day_diff > 0:
+                dStart = dStart + timedelta(days=-(day_diff))
+            elif day_diff < 0:
+                dStart = dStart + relativedelta(months=-1, days=day_diff)
+            dNextStart = dStart + relativedelta(years=+1)
+        else:
+            return 0.00
+
+        claim_obj = self.env["hr.benefit.claim"]
+        claim_ids = claim_obj.search(
+            [
+                ("employee_id", "=", employee_id.id),
+                ("benefit_policy_id.benefit_id", "=", self.benefit_id.id),
+                ("benefit_policy_id.start_date", "<", dNextStart),
+                "|",
+                ("benefit_policy_id.end_date", "=", False),
+                ("benefit_policy_id.end_date", ">=", dStart),
+                ("date", ">=", dStart),
+                ("date", "<", dNextStart),
+                ("state", "=", "approve"),
+            ]
+        )
+        res = 0.00
+        if len(claim_ids) > 0:
+            self.env.cr.execute(
+                "SELECT SUM(amount_approved) FROM hr_benefit_claim " "WHERE id in %s",
+                (tuple(claim_ids.ids),),
+            )
+            res = self.env.cr.fetchall()[0][0]
+        return res
+
+    def get_reimburse_remaining(self, employee_id, day):
+
+        self.ensure_one()
+        if self.type != "reimburse":
+            raise UserError(
+                _(
+                    "Wrong earning type for this operation. "
+                    "Use 'Expense Re-imbursement' instead."
+                )
+            )
+        policies = self.env["hr.benefit.policy"].search(
+            [
+                ("benefit_id", "=", self.benefit_id.id),
+                ("employee_id", "=", employee_id.id),
+                "|",
+                ("end_date", "=", False),
+                ("end_date", ">=", day),
+            ]
+        )
+        if len(policies) == 0:
+            res = 0.0
+        elif self.reim_nolimit:
+            res = 0.0
+        elif self.reim_limit_period:
+            claims = self.get_claims_in_period(employee_id, day)
+            unclaimed = self.reim_limit_amount - claims
+            res = (unclaimed < 0.01) and 0.00 or unclaimed
+        return res
diff --git a/hr_benefit/models/benefit_claim.py b/hr_benefit/models/benefit_claim.py
new file mode 100644
index 00000000..e884353d
--- /dev/null
+++ b/hr_benefit/models/benefit_claim.py
@@ -0,0 +1,167 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013,2014 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import _, api, fields, models
+from odoo.exceptions import UserError
+
+
+class BenefitClaim(models.Model):
+
+    _name = "hr.benefit.claim"
+    _description = "Benefit claim"
+    _rec_name = "date"
+
+    date = fields.Date(
+        required=True,
+        readonly=True,
+        states={"draft": [("readonly", False)]},
+        help="The date the claim was made",
+        default=fields.Date.today(),
+    )
+    benefit_policy_id = fields.Many2one(
+        string="Policy",
+        required=True,
+        comodel_name="hr.benefit.policy",
+        readonly=True,
+        states={"draft": [("readonly", False)]},
+    )
+    employee_id = fields.Many2one(
+        string="Employee",
+        comodel_name="hr.employee",
+        required=True,
+        readonly=True,
+        states={"draft": [("readonly", False)]},
+    )
+    amount_requested = fields.Float(
+        string="Requested Amount",
+        digits="Account",
+        required=True,
+        readonly=True,
+        states={"draft": [("readonly", False)]},
+    )
+    amount_approved = fields.Float(
+        string="Approved Amount", digits="Account", readonly=True
+    )
+    state = fields.Selection(
+        selection=[
+            ("draft", "Draft"),
+            ("approve", "Approved"),
+            ("decline", "Declined"),
+        ],
+        readonly=True,
+        default="draft",
+    )
+
+    def name_get(self):
+
+        res = []
+        data = self.read(["date", "benefit_policy_id"])
+        for d in data:
+            res.append((d["id"], d["benefit_policy_id"][1] + " " + d["date"]))
+        return res
+
+    @api.onchange("employee_id")
+    def onchange_employee(self):
+
+        res = {"domain": {"benefit_policy_id": False}}
+        if not self.employee_id:
+            return res
+
+        res["domain"]["benefit_policy_id"] = [
+            ("employee_id", "=", self.employee_id.id),
+            ("benefit_id.has_advantage", "=", True),
+        ]
+        return res
+
+    def _get_approved_amount(self, dDate):
+
+        self.ensure_one()
+        approved = 0.00
+        if dDate:
+            policy = self.benefit_policy_id
+            d = dDate
+            adv_line = policy.benefit_id.get_latest_advantage(d)
+            if adv_line:
+                remaining = adv_line.get_reimburse_remaining(self.employee_id, dDate)
+                if adv_line.reim_nolimit:
+                    # No limit
+                    approved = self.amount_requested
+                elif -1 == fields.Float.compare(remaining, 0.0, precision_digits=2):
+                    # Over Limit
+                    approved = 0.00
+                else:
+                    if -1 == fields.Float.compare(
+                        remaining, self.amount_requested, precision_digits=2
+                    ):
+                        approved = remaining
+                    else:
+                        approved = self.amount_requested
+
+        return approved
+
+    @api.model
+    def create(self, vals):
+
+        res = super(BenefitClaim, self).create(vals)
+        for rec in res:
+            approved = res._get_approved_amount(vals["date"])
+            rec.amount_approved = approved
+
+        return res
+
+    def _check_state(self, to_state):
+        if self.state == "approve" and to_state == "draft":
+            raise UserError(
+                _("You cannot set an approved claim back to 'draft' state.")
+            )
+
+    def write(self, vals):
+
+        _fields = ["date", "employee_id", "amount_requested", "benefit_policy_id"]
+        do_calc = False
+        for k in vals:
+            if k in _fields:
+                do_calc = True
+                break
+
+        if "state" in vals.keys():
+            for clm in self:
+                clm._check_state(vals["state"])
+
+        res = super(BenefitClaim, self).write(vals)
+        if do_calc:
+            for clm in self:
+                approved = self._get_approved_amount(vals.get("date"))
+                clm.amount_approved = approved
+
+        return res
+
+    def unlink(self):
+
+        data = self.read(["state"])
+        for d in data:
+            if d["state"] in ["approve", "decline"] and not (
+                self.env.context and self.env.context.get("force_delete", False)
+            ):
+                raise UserError(
+                    _(
+                        "Error"
+                        'You may not a delete a claim that is not in a "Draft" state'
+                    )
+                )
+        return super(BenefitClaim, self).unlink()
+
+    def set_to_draft(self):
+        self.state = "draft"
+        return True
+
+    def claim_approve(self):
+
+        self.write({"state": "approve"})
+        return True
+
+    def claim_decline(self):
+
+        self.write({"state": "decline"})
+        return True
diff --git a/hr_benefit/models/benefit_policy.py b/hr_benefit/models/benefit_policy.py
new file mode 100644
index 00000000..2c12d918
--- /dev/null
+++ b/hr_benefit/models/benefit_policy.py
@@ -0,0 +1,300 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013,2014 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+import math
+from datetime import date, datetime, timedelta
+
+from dateutil.relativedelta import relativedelta
+
+from odoo import _, api, fields, models
+from odoo.exceptions import UserError
+
+
+class BenefitPolicy(models.Model):
+
+    _name = "hr.benefit.policy"
+    _description = "Benefit Enrollment"
+    _check_company_auto = True
+
+    name = fields.Char(string="Reference", readonly=True)
+    benefit_id = fields.Many2one(
+        string="Benefit",
+        comodel_name="hr.benefit",
+        required=True,
+        readonly=True,
+        states={"draft": [("readonly", False)]},
+        check_company=True,
+    )
+    benefit_code = fields.Char(readonly=True, related="benefit_id.code", store=True)
+    employee_id = fields.Many2one(
+        string="Employee",
+        comodel_name="hr.employee",
+        required=True,
+        readonly=True,
+        states={"draft": [("readonly", False)]},
+        check_company=True,
+    )
+    department_id = fields.Many2one(related="employee_id.department_id", store=True)
+    start_date = fields.Date(
+        string="Date of Enrollment",
+        required=True,
+        readonly=True,
+        states={"draft": [("readonly", False)]},
+    )
+    end_date = fields.Date(string="Termination Date")
+    active = fields.Boolean(default=True)
+    advantage_override = fields.Boolean(
+        string="Change Advantage Amount",
+        help="Check this field if the amount of the advantage should be changed in the policy.",
+    )
+    premium_override = fields.Boolean(
+        string="Change Premium Amount",
+        help="Check this field if the amount of the premium should be changed in the policy.",
+    )
+    advantage_override_amount = fields.Float(digits="Account")
+    premium_override_amount = fields.Float(digits="Account")
+    premium_override_total = fields.Float(digits="Account")
+    advantage_amount = fields.Float(
+        digits="Account",
+        compute="_compute_amounts",
+        inverse="_inverse_amounts",
+        store=True,
+    )
+    premium_amount = fields.Float(
+        digits="Account",
+        compute="_compute_amounts",
+        inverse="_inverse_amounts",
+        store=True,
+    )
+    premium_total = fields.Float(
+        digits="Account",
+        compute="_compute_amounts",
+        inverse="_inverse_amounts",
+        store=True,
+    )
+    premium_installments = fields.Integer(
+        string="No. of Installments",
+        compute="_compute_premium_installments",
+        store=True,
+    )
+    note = fields.Text(string="Remarks")
+    state = fields.Selection(
+        selection=[("draft", "Draft"), ("open", "Open"), ("done", "Done")],
+        readonly=True,
+        default="draft",
+    )
+    company_id = fields.Many2one(
+        "res.company", required=True, default=lambda self: self.env.company
+    )
+
+    def name_get(self):
+        res = []
+        for rec in self:
+            res.append((rec.id, "{} {}".format(rec.name, rec.benefit_id.name)))
+        return res
+
+    @api.depends(
+        "benefit_id",
+        "advantage_override",
+        "premium_override",
+        "advantage_override_amount",
+        "premium_override_amount",
+        "premium_override_total",
+    )
+    def _compute_amounts(self):
+
+        for rec in self:
+            res = {
+                "advantage_amount": 0,
+                "premium_amount": 0,
+                "premium_total": 0,
+            }
+
+            if not rec.benefit_id or not rec.start_date:
+                rec.write(res)
+                continue
+
+            dToday = date.today()
+            if rec.advantage_override:
+                res["advantage_amount"] = rec.advantage_override_amount
+            else:
+                adv = rec.benefit_id.get_latest_advantage(dToday)
+                if adv is not None:
+                    if adv.type == "allowance":
+                        res["advantage_amount"] = adv.allowance_amount
+            if rec.premium_override:
+                res["premium_amount"] = rec.premium_override_amount
+                res["premium_total"] = rec.premium_override_total
+            else:
+                prm = rec.benefit_id.get_latest_premium(dToday)
+                if prm is not None:
+                    res["premium_amount"] = prm.amount
+                    res["premium_total"] = prm.total_amount
+
+            rec.write(res)
+
+    def _inverse_amounts(self):
+        for rec in self:
+            if rec.advantage_override:
+                rec.advantage_override_amount = rec.advantage_amount
+            if rec.premium_override:
+                rec.premium_override_amount = rec.premium_amount
+                rec.premium_override_total = rec.premium_total
+
+    @api.depends("start_date", "premium_amount", "premium_total")
+    def _compute_premium_installments(self):
+
+        for rec in self:
+            res = {"end_date": False, "premium_installments": 0}
+            if rec.premium_amount == 0:
+                rec.write(res)
+                return
+
+            installments = int(
+                math.ceil(float(rec.premium_total) / float(rec.premium_amount))
+            )
+            if installments > 0:
+                dEnd = rec.start_date + relativedelta(months=+installments)
+                res["end_date"] = dEnd
+            res["premium_installments"] = installments
+            rec.write(res)
+
+    @api.model
+    def _fail_eligibility(self, benefit_id, employee_id):
+
+        res = False
+        benefit = self.env["hr.benefit"].browse(benefit_id)
+
+        # Check if employee has worked more than minimum number of days for benefit
+        #
+        if benefit.min_employed_days > 0:
+            ee = self.env["hr.employee"].browse(employee_id)
+            dToday = datetime.today().date()
+            dHire = ee.first_contract_date
+            srvc_months = ee.get_months_service_to_date(dToday=dToday)
+            srvc_months = int(srvc_months)
+
+            employed_days = 0
+            dCount = dHire
+            while dCount < dToday:
+                employed_days += 1
+                dCount += timedelta(days=+1)
+            if benefit.min_employed_days > employed_days:
+                res = True
+
+        return res
+
+    @api.model
+    def create(self, vals):
+
+        # Check if the employee is already enrolled
+        #
+        benefit = self.env["hr.benefit"].browse(vals["benefit_id"])
+        if not benefit.multi_policy:
+            domain = [
+                ("employee_id", "=", vals["employee_id"]),
+                ("benefit_id", "=", vals["benefit_id"]),
+            ]
+            if vals["start_date"] and not vals.get("end_date", False):
+                domain = domain + [
+                    "|",
+                    ("end_date", "=", False),
+                    ("end_date", ">=", vals["start_date"]),
+                ]
+            elif vals["start_date"] and vals["end_date"]:
+                domain = domain + [
+                    ("start_date", "<=", vals["end_date"]),
+                    "|",
+                    ("end_date", "=", False),
+                    ("end_date", ">=", vals["start_date"]),
+                ]
+
+            policy_ids = self.search(domain)
+            if len(policy_ids) > 0:
+                raise UserError(
+                    _(
+                        "The employee is already enrolled in this benefit program."
+                        "\n%s\nPolicy: %s"
+                    )
+                    % (policy_ids[0].employee_id.name, policy_ids[0].name)
+                )
+
+        # Check if eligibility requirements have been met
+        if self._fail_eligibility(vals["benefit_id"], vals["employee_id"]):
+            raise UserError(
+                _(
+                    "Eligibility Requirements Unmet. "
+                    "The employee does not meet eligibility requirements for this benefit."
+                )
+            )
+
+        ben_id = super(BenefitPolicy, self).create(vals)
+        if ben_id:
+            ref = self.env["ir.sequence"].next_by_code("benefit.policy.ref")
+            if not ref:
+                raise UserError(
+                    _("Critical Error. " "Unable to obtain a benefit policy number!")
+                )
+            ben_id.name = ref
+        return ben_id
+
+    def unlink(self):
+
+        for pol in self:
+            if pol.state != "draft" and not (
+                self.env.context and self.env.context.get("force_delete", False)
+            ):
+                raise UserError(
+                    _(
+                        'You may not delete a policy that is not in a "draft" state.'
+                        "\nPolicy No: %s" % (pol.name)
+                    )
+                )
+
+        return super(BenefitPolicy, self).unlink()
+
+    def _check_state(self, to_state):
+        for rec in self:
+            if to_state == "draft" and rec.state not in ["", "draft"]:
+                raise UserError(
+                    _("You cannot set an open policy back to 'draft' state.")
+                )
+            elif to_state == "done" and rec.state != "open":
+                raise UserError(
+                    _("You cannot set an open policy back to 'draft' state.")
+                )
+            elif rec.state == "done":
+                raise UserError(
+                    _("You cannot set a policy in 'Done' state to any other value.")
+                )
+
+    def write(self, vals):
+        if "state" in vals:
+            self._check_state(vals["state"])
+        return super(BenefitPolicy, self).write(vals)
+
+    def state_open(self):
+
+        self.write({"state": "open"})
+        return True
+
+    def state_done(self):
+
+        self.write({"state": "done"})
+        return True
+
+    def end_policy(self):
+
+        if len(self.ids) == 0:
+            return False
+
+        self.env.context.update({"end_benefit_policy_id": self.ids[0]})
+        return {
+            "view_type": "form",
+            "view_mode": "form",
+            "res_model": "hr.benefit.policy.end",
+            "type": "ir.actions.act_window",
+            "target": "new",
+            "context": self.env.context,
+        }
diff --git a/hr_benefit/models/benefit_premium.py b/hr_benefit/models/benefit_premium.py
new file mode 100644
index 00000000..99951e2a
--- /dev/null
+++ b/hr_benefit/models/benefit_premium.py
@@ -0,0 +1,56 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013,2014 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+import math
+
+from odoo import _, api, fields, models
+
+
+class BenefitPremium(models.Model):
+
+    _name = "hr.benefit.premium"
+    _description = "Employee Benefit Premium Policy Line"
+    _rec_name = "effective_date"
+    _order = "benefit_id,effective_date desc"
+    _sql_constraints = [
+        (
+            "unique_date_benefit_id",
+            "UNIQUE(effective_date,benefit_id)",
+            _("Effective dates must be unique per premium in a benefit!"),
+        )
+    ]
+
+    benefit_id = fields.Many2one(string="Benefit", comodel_name="hr.benefit")
+    effective_date = fields.Date(required=True)
+    type = fields.Selection(
+        string="Premium Type",
+        selection=[("monthly", "Monthly"), ("annual", "Annual")],
+        required=True,
+    )
+    amount = fields.Float(string="Premium Amount", digits="Account")
+    total_amount = fields.Float(string="Total", digits="Account")
+    no_of_installments = fields.Integer(
+        string="No. of Installments",
+        compute="_compute_installments",
+        store=True,
+        default=0,
+    )
+    active = fields.Boolean(default=True)
+
+    def name_get(self):
+        res = []
+        for rec in self:
+            res.append(
+                (rec.id, "{} {}".format(rec.benefit_id.name, rec.effective_date))
+            )
+        return res
+
+    @api.depends("amount", "total_amount")
+    def _compute_installments(self):
+        for prm in self:
+            prm.no_of_installments = (
+                (prm.amount > 0 and prm.total_amount > 0)
+                and int(math.ceil(float(prm.total_amount) / float(prm.amount)))
+                or 0
+            )
diff --git a/hr_benefit/models/hr_employee.py b/hr_benefit/models/hr_employee.py
new file mode 100644
index 00000000..d35838ab
--- /dev/null
+++ b/hr_benefit/models/hr_employee.py
@@ -0,0 +1,48 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013,2014 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import date
+
+from odoo import fields, models
+
+
+class HrEmployee(models.Model):
+
+    _inherit = "hr.employee"
+
+    benefit_policy_ids = fields.One2many(
+        string="Benefits", comodel_name="hr.benefit.policy", inverse_name="employee_id"
+    )
+    benefit_policies_count = fields.Integer(
+        string="Policies", compute="_compute_policies_count"
+    )
+    benefit_claims_count = fields.Integer(
+        string="Claims", compute="_compute_claims_count"
+    )
+
+    def _compute_policies_count(self):
+        HrBenefitPolicy = self.env["hr.benefit.policy"]
+        dToday = date.today()
+        for ee in self:
+            ee.benefit_policies_count = HrBenefitPolicy.search_count(
+                [
+                    ("id", "in", ee.benefit_policy_ids.ids),
+                    ("employee_id", "=", ee.id),
+                    ("start_date", "<=", dToday),
+                    ("state", "!=", "done"),
+                    "|",
+                    ("end_date", "=", False),
+                    ("end_date", ">=", dToday),
+                ]
+            )
+
+    def _compute_claims_count(self):
+        Claim = self.env["hr.benefit.claim"]
+        for ee in self:
+            ee.benefit_claims_count = Claim.search_count(
+                [
+                    ("employee_id", "=", ee.id),
+                    ("state", "!=", "decline"),
+                ]
+            )
diff --git a/hr_benefit/readme/CREDITS.rst b/hr_benefit/readme/CREDITS.rst
new file mode 100644
index 00000000..d264bc7e
--- /dev/null
+++ b/hr_benefit/readme/CREDITS.rst
@@ -0,0 +1 @@
+* Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/hr_benefit/readme/DESCRIPTION.rst b/hr_benefit/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..91fddeb9
--- /dev/null
+++ b/hr_benefit/readme/DESCRIPTION.rst
@@ -0,0 +1,11 @@
+Manage Employee Benefits
+========================
+This module provides a comprehensive employee benefits management solution.
+* Create benefits and their respective earnings and premiums
+* Earnings and Premiums have effective dates to reflect changes over time
+* The amounts in the benefit can be overriden in individual policies as necessary
+* Benefits can be linked to payroll through the benefit code
+
+Some possible uses:
+* Travel, Housing and other such allowances
+* Employee personal medical expenses re-imbursement plans
diff --git a/hr_benefit/readme/HISTORY.rst b/hr_benefit/readme/HISTORY.rst
new file mode 100644
index 00000000..55d9b75b
--- /dev/null
+++ b/hr_benefit/readme/HISTORY.rst
@@ -0,0 +1,4 @@
+14.0.1.0.1 (2022-04-07)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* [FIX] Creating a policy no longer fails because of a non-existent benefit
diff --git a/hr_benefit/security/ir.model.access.csv b/hr_benefit/security/ir.model.access.csv
new file mode 100644
index 00000000..3a11c280
--- /dev/null
+++ b/hr_benefit/security/ir.model.access.csv
@@ -0,0 +1,15 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_benefit_manager,access_hr_benefit,model_hr_benefit,hr.group_hr_manager,1,1,1,1
+access_hr_benefit_user,access_hr_benefit,model_hr_benefit,hr.group_hr_user,1,0,0,0
+access_hr_benefit_policy_mgr,access_hr_benefit_policy,model_hr_benefit_policy,hr.group_hr_manager,1,1,1,1
+access_hr_benefit_policy_user,access_hr_benefit_policy,model_hr_benefit_policy,hr.group_hr_user,1,1,1,0
+access_hr_benefit_policy_employee,access_hr_benefit_policy,model_hr_benefit_policy,base.group_user,1,0,0,0
+access_hr_benefit_premium_manager,access_hr_benefit_policy_premium,model_hr_benefit_premium,hr.group_hr_manager,1,1,1,1
+access_hr_benefit_premium_user,access_hr_benefit_policy_premium,model_hr_benefit_premium,hr.group_hr_user,1,0,0,0
+access_hr_benefit_claim_manager,access_hr_benefit_claim,model_hr_benefit_claim,hr.group_hr_manager,1,1,1,1
+access_hr_benefit_claim_user,access_hr_benefit_claim,model_hr_benefit_claim,hr.group_hr_user,1,0,0,0
+access_hr_benefit_adv_manager,access_hr_benefit_policy_adv,model_hr_benefit_advantage,hr.group_hr_manager,1,1,1,1
+access_hr_benefit_adv_user,access_hr_benefit_policy_adv,model_hr_benefit_advantage,hr.group_hr_user,1,0,0,0
+access_hr_benefit_policy_end,access_hr_benefit_policy_end,model_hr_benefit_policy_end,hr.group_hr_user,1,1,1,1
+access_hr_benefit_enroll_employee,access_hr_benefit_enroll_employee,model_hr_benefit_enroll_employee,hr.group_hr_user,1,1,1,1
+access_hr_benefit_enroll_multi_employee,access_hr_benefit_enroll_multi_employee,model_hr_benefit_enroll_multi_employee,hr.group_hr_user,1,1,1,1
diff --git a/hr_benefit/security/security.xml b/hr_benefit/security/security.xml
new file mode 100644
index 00000000..bd28ad85
--- /dev/null
+++ b/hr_benefit/security/security.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data noupdate="1">
+
+        <record id="hr_benefit_policy_rule_own" model="ir.rule">
+            <field name="name">Benefit Policy: Own and Subordinates</field>
+            <field name="model_id" ref="model_hr_benefit_policy" />
+            <field name="domain_force">
+                ['|',('employee_id.user_id', '=', user.id),
+                ('employee_id.department_id.manager_id.user_id', '=', user.id)]
+            </field>
+            <field name="groups" eval="[(4, ref('base.group_user'))]" />
+        </record>
+
+        <record id="hr_benefit_policy_rule_officer" model="ir.rule">
+            <field name="name">Benefit Policy: HR Officer can see all</field>
+            <field name="model_id" ref="model_hr_benefit_policy" />
+            <field name="domain_force">[(1, '=', 1)]</field>
+            <field name="groups" eval="[(4, ref('hr.group_hr_user'))]" />
+        </record>
+
+    </data>
+
+    <data noupdate="1">
+
+        <!-- hr.benefit: Multi-company -->
+        <record model="ir.rule" id="hr_benefit_restricted_company_rule">
+            <field name="name">Benefit: multi-company</field>
+            <field name="model_id" ref="hr_benefit.model_hr_benefit" />
+            <field name="global" eval="True" />
+            <field name="domain_force">
+                [('company_id', 'in', company_ids)]
+            </field>
+        </record>
+
+        <!-- Only show policies for employees in the user's current company -->
+        <record model="ir.rule" id="hr_benefit_policy_restricted_company_rule">
+            <field name="name">Benefit Policy: multi-company</field>
+            <field name="model_id" ref="hr_benefit.model_hr_benefit_policy" />
+            <field name="global" eval="True" />
+            <field name="domain_force">
+                [('company_id', 'in', company_ids)]
+            </field>
+        </record>
+
+
+    </data>
+</odoo>
diff --git a/hr_benefit/static/description/icon.png b/hr_benefit/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/hr_benefit/static/description/icon.png differ
diff --git a/hr_benefit/static/description/index.html b/hr_benefit/static/description/index.html
new file mode 100644
index 00000000..ac1b7130
--- /dev/null
+++ b/hr_benefit/static/description/index.html
@@ -0,0 +1,425 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Benefit Management</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="benefit-management">
+<h1 class="title">Benefit Management</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:6d8231e1e849f6c64514bb282ee18348de44836c96e61ad253f584952dbf1da7
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/hr_benefit"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<div class="section" id="manage-employee-benefits">
+<h1>Manage Employee Benefits</h1>
+<p>This module provides a comprehensive employee benefits management solution.
+* Create benefits and their respective earnings and premiums
+* Earnings and Premiums have effective dates to reflect changes over time
+* The amounts in the benefit can be overriden in individual policies as necessary
+* Benefits can be linked to payroll through the benefit code</p>
+<p>Some possible uses:
+* Travel, Housing and other such allowances
+* Employee personal medical expenses re-imbursement plans</p>
+<p><strong>Table of contents</strong></p>
+</div>
+<div class="section" id="changelog">
+<h1>Changelog</h1>
+<div class="section" id="section-1">
+<h2>14.0.1.0.1 (2022-04-07)</h2>
+<ul class="simple">
+<li>[FIX] Creating a policy no longer fails because of a non-existent benefit</li>
+</ul>
+</div>
+</div>
+<div class="section" id="bug-tracker">
+<h1>Bug Tracker</h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20hr_benefit%0Aversion:%2014.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>Credits</h1>
+<div class="section" id="authors">
+<h2>Authors</h2>
+<ul class="simple">
+<li>TREVI Software</li>
+<li>Michael Telahun Makonnen</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2>Other credits</h2>
+<ul class="simple">
+<li>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2>Maintainers</h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/hr_benefit">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/hr_benefit/static/src/img/main_screenshot.png b/hr_benefit/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/hr_benefit/static/src/img/main_screenshot.png differ
diff --git a/hr_benefit/tests/__init__.py b/hr_benefit/tests/__init__.py
new file mode 100644
index 00000000..b9322c47
--- /dev/null
+++ b/hr_benefit/tests/__init__.py
@@ -0,0 +1,7 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import common
+from . import test_benefit_access
+from . import test_benefit
+from . import test_benefit_policy
diff --git a/hr_benefit/tests/common.py b/hr_benefit/tests/common.py
new file mode 100644
index 00000000..0867618e
--- /dev/null
+++ b/hr_benefit/tests/common.py
@@ -0,0 +1,225 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import date
+
+from odoo.exceptions import AccessError
+from odoo.tests import common, new_test_user
+
+
+class TestBenefitCommon(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super(TestBenefitCommon, cls).setUpClass()
+
+        cls.Benefit = cls.env["hr.benefit"]
+        cls.Premium = cls.env["hr.benefit.premium"]
+        cls.Earning = cls.env["hr.benefit.advantage"]
+        cls.Policy = cls.env["hr.benefit.policy"]
+        cls.Claim = cls.env["hr.benefit.claim"]
+        cls.EndWizard = cls.env["hr.benefit.policy.end"]
+        cls.EnrollWizard = cls.env["hr.benefit.enroll.employee"]
+        cls.EnrollMultiWizard = cls.env["hr.benefit.enroll.multi.employee"]
+
+        # Company A
+        cls.company1 = cls.env["res.company"].create({"name": "A company"})
+
+        # Normal User John
+        cls.userJohn = new_test_user(
+            cls.env,
+            login="john",
+            groups="base.group_user",
+            name="John",
+            company_ids=[(6, 0, cls.env.companies.ids)],
+        )
+        cls.eeJohn = cls.env["hr.employee"].create(
+            {"name": "John", "user_id": cls.userJohn.id}
+        )
+
+        # Normal User Paul
+        cls.userPaul = new_test_user(
+            cls.env,
+            login="paul",
+            groups="base.group_user",
+            name="Paul",
+            company_ids=[(6, 0, cls.env.companies.ids)],
+        )
+        cls.eePaul = cls.env["hr.employee"].create(
+            {"name": "Paul", "user_id": cls.userPaul.id}
+        )
+
+        # Company A User James
+        cls.userJames = new_test_user(
+            cls.env,
+            login="james",
+            groups="base.group_user",
+            name="James",
+            company_id=cls.company1.id,
+            company_ids=[(6, 0, cls.company1.ids)],
+        )
+        cls.eeJames = (
+            cls.env["hr.employee"]
+            .with_context(allowed_company_ids=cls.company1.ids)
+            .create({"name": "James", "user_id": cls.userJames.id})
+        )
+
+        cls.benefit_create_vals = {"name": "A", "code": "A"}
+
+        # HR Manager
+        cls.userHRM = new_test_user(
+            cls.env,
+            login="hrm",
+            groups="base.group_user,hr.group_hr_manager",
+            name="Payroll manager",
+            email="hrm@example.com",
+            company_ids=[(6, 0, cls.env.companies.ids)],
+        )
+        # HR User
+        cls.userHRO = new_test_user(
+            cls.env,
+            login="hro",
+            groups="base.group_user,hr.group_hr_user",
+            name="Payroll officer",
+            email="hro@example.com",
+            company_ids=[(6, 0, cls.env.companies.ids)],
+        )
+
+    def create_policy(
+        self,
+        employee,
+        benefit,
+        start=False,
+        end=False,
+        advantage=False,
+        premium=False,
+        premium_total=False,
+    ):
+        _dict = {
+            "employee_id": employee.id,
+            "benefit_id": benefit.id,
+            "start_date": start is False and date.today() or start,
+            "end_date": end,
+        }
+        if advantage is not False:
+            _dict["advantage_override"] = True
+            _dict["advantage_amount"] = advantage
+        if premium is not False:
+            _dict["premium_override"] = True
+            _dict["premium_override_amount"] = premium
+            _dict["premium_override_total"] = premium_total
+        return self.Policy.create(_dict)
+
+    def create_premium(
+        self, benefit, start=False, ptype="monthly", amount=0, total=False
+    ):
+        _dict = {
+            "benefit_id": benefit.id,
+            "effective_date": start is False and date.today() or start,
+            "type": ptype,
+            "amount": amount,
+        }
+        if total is not False:
+            _dict["total_amount"] = total
+        benefit.has_premium = True
+        return self.Premium.create(_dict)
+
+    def create_earning(
+        self,
+        benefit,
+        start=False,
+        ptype="allowance",
+        limit=0,
+        limit_period="monthly",
+        limit_mo_day="1",
+        allowance=0,
+        loan=0,
+        mindays=0,
+    ):
+        _dict = {
+            "benefit_id": benefit.id,
+            "effective_date": start is False and date.today() or start,
+            "type": ptype,
+            "allowance_amount": allowance,
+            "loan_amount": loan,
+            "min_employed_days": mindays,
+        }
+        if ptype == "reimburse":
+            _dict["reim_limit_amount"] = limit
+            _dict["reim_limit_period"] = limit_period
+            _dict["reim_period_month_day"] = limit_mo_day
+        benefit.has_advantage = True
+        return self.Earning.create(_dict)
+
+    def create_claim(self, policy, amount, dt=None):
+        if dt is None:
+            dt = date.today()
+        return self.Claim.create(
+            {
+                "date": dt,
+                "benefit_policy_id": policy.id,
+                "employee_id": policy.employee_id.id,
+                "amount_requested": amount,
+            }
+        )
+
+    def create_benefit(self, vals):
+
+        return self.Benefit.create(vals)
+
+    def create_contract(self, state, kanban_state, start, end=None, trial_end=None):
+        return self.env["hr.contract"].create(
+            {
+                "name": "Contract",
+                "employee_id": self.eeJohn.id,
+                "state": state,
+                "kanban_state": kanban_state,
+                "wage": 1,
+                "date_start": start,
+                "trial_date_end": trial_end,
+                "date_end": end,
+            }
+        )
+
+    def create_fails(self, user, obj, vals):
+        with self.assertRaises(AccessError):
+            obj.with_user(user).create(vals)
+
+    def create_succeeds(self, user, obj, vals):
+        res = None
+        try:
+            res = obj.with_user(user).create(vals)
+        except AccessError:
+            self.fail("Caught unexpected exception creating {}".format(obj._name))
+        return res
+
+    def unlink_fails(self, user, obj):
+        with self.assertRaises(AccessError):
+            obj.with_user(user).unlink()
+
+    def unlink_succeeds(self, user, obj):
+        try:
+            obj.with_user(user).unlink()
+        except AccessError:
+            self.fail("Caught unexpected exception unlinking {}".format(obj._name))
+
+    def read_succeeds(self, user, obj, obj_id):
+        try:
+            obj.with_user(user).browse(obj_id).read([])
+        except AccessError:
+            self.fail("Caught an unexpected exception reading {}".format(obj._name))
+
+    def read_fails(self, user, obj, obj_id):
+        with self.assertRaises(AccessError):
+            obj.with_user(user).browse(obj_id).read([])
+
+    # Pre-requisite: READ Access
+    def write_fails(self, user, obj, obj_id, write_vals):
+        with self.assertRaises(AccessError):
+            obj.with_user(user).browse(obj_id).write(write_vals)
+
+    # Pre-requisite: READ Access
+    def write_succeeds(self, user, obj, obj_id, write_vals):
+        try:
+            obj.with_user(user).browse(obj_id).write(write_vals)
+        except AccessError:
+            self.fail("Caught an unexpected exception writing {}".format(obj._name))
diff --git a/hr_benefit/tests/test_benefit.py b/hr_benefit/tests/test_benefit.py
new file mode 100644
index 00000000..3ba34e4d
--- /dev/null
+++ b/hr_benefit/tests/test_benefit.py
@@ -0,0 +1,187 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import date
+
+from dateutil.relativedelta import relativedelta
+
+from odoo import fields
+from odoo.exceptions import UserError
+
+from . import common
+
+
+class TestBenefit(common.TestBenefitCommon):
+    def test_get_advantage_no_benefit(self):
+        """#29 Try getting an advantage from an empty benefit recordset"""
+
+        self.Benefit.get_latest_advantage(date.today())
+
+    def test_get_premium_no_benefit(self):
+        """#29 Try getting a premium from an empty benefit recordset"""
+
+        self.Benefit.get_latest_premium(date.today())
+
+    def test_get_latest_earning(self):
+        """Get the earning with the latest effective date that is not in the future"""
+
+        bn = self.create_benefit(self.benefit_create_vals)
+        self.create_earning(bn, date.today() - relativedelta(days=1))
+        earnToday = self.create_earning(bn, date.today())
+        self.create_earning(bn, date.today() + relativedelta(days=1))
+        latest = bn.get_latest_advantage(date.today())
+
+        self.assertEqual(3, len(bn.advantage_ids))
+        self.assertEqual(earnToday, latest)
+
+    def test_get_latest_premium(self):
+        """Get the premium with the latest effective date that is not in the future"""
+
+        bn = self.create_benefit(self.benefit_create_vals)
+        self.create_premium(bn, date.today() - relativedelta(days=1))
+        prmToday = self.create_premium(bn, date.today())
+        self.create_premium(bn, date.today() + relativedelta(days=1))
+        latest = bn.get_latest_premium(date.today())
+
+        self.assertEqual(3, len(bn.premium_ids))
+        self.assertEqual(prmToday, latest)
+
+    def test_monthly_premium_no_installments(self):
+        """If amount and total are equal only 1 installment"""
+
+        bn = self.create_benefit(self.benefit_create_vals)
+        prm = self.create_premium(
+            bn, date.today() - relativedelta(days=1), "monthly", 100, 100
+        )
+
+        self.assertEqual(1, prm.no_of_installments)
+        self.assertEqual(100, prm.amount)
+        self.assertEqual(100, prm.total_amount)
+
+    def test_monthly_premium_installments(self):
+        """If total is a multiple of amount then installment = total/amount"""
+
+        bn = self.create_benefit(self.benefit_create_vals)
+        prm = self.create_premium(
+            bn, date.today() - relativedelta(days=1), "monthly", 100, 300
+        )
+
+        self.assertEqual(3, prm.no_of_installments)
+        self.assertEqual(100, prm.amount)
+        self.assertEqual(300, prm.total_amount)
+
+    def test_monthly_premium_installments_plus(self):
+        """
+        If total is not an even multiple of amount then
+        installment = (total/amount) + 1
+        """
+
+        bn = self.create_benefit(self.benefit_create_vals)
+        prm = self.create_premium(
+            bn, date.today() - relativedelta(days=1), "monthly", 100, 350
+        )
+
+        self.assertEqual(4, prm.no_of_installments)
+        self.assertEqual(100, prm.amount)
+        self.assertEqual(350, prm.total_amount)
+
+    def test_reimburse_remaining_no_policy(self):
+        """
+        If the employee does not have a re-imbursement policy then the
+        amount to be re-imbursed is zero.
+        """
+
+        bn = self.create_benefit(self.benefit_create_vals)
+        earn = self.create_earning(bn, date.today(), "reimburse", 1000)
+
+        self.assertTrue(
+            fields.Float.is_zero(
+                earn.get_reimburse_remaining(self.eeJohn, date.today()),
+                precision_digits=2,
+            )
+        )
+
+    def test_reimburse_remaining_no_claims(self):
+        """
+        If no claims have been made in the period the full amount
+        remains to be re-imbursed
+        """
+
+        bn = self.create_benefit(self.benefit_create_vals)
+        self.create_policy(self.eeJohn, bn, date.today())
+        earn = self.create_earning(bn, date.today(), "reimburse", 1000)
+
+        self.assertEqual(
+            0,
+            fields.Float.compare(
+                earn.get_reimburse_remaining(self.eeJohn, date.today()),
+                1000,
+                precision_digits=2,
+            ),
+        )
+
+    def test_reimburse_remaining_with_claims(self):
+        """
+        If claims have been made in the period for the full amount then
+        nothing remains to be re-imbursed
+        """
+
+        bn = self.create_benefit(self.benefit_create_vals)
+        earn = self.create_earning(bn, date.today(), "reimburse", 1000)
+        pol = self.create_policy(self.eeJohn, bn, date.today())
+        clm = self.create_claim(pol, 1000)
+        clm.claim_approve()
+
+        self.assertTrue(
+            fields.Float.is_zero(
+                earn.get_reimburse_remaining(self.eeJohn, date.today()),
+                precision_digits=2,
+            )
+        )
+
+    def test_delete_claim(self):
+        """A claim may not be deleted unless it's in a 'draft' state"""
+
+        bn = self.create_benefit(self.benefit_create_vals)
+        self.create_earning(bn, date.today(), "reimburse", 1000)
+        pol = self.create_policy(self.eeJohn, bn, date.today())
+        clm = self.create_claim(pol, 500)
+        clm2 = self.create_claim(pol, 500)
+        clm2.claim_approve()
+
+        try:
+            clm.unlink()
+        except UserError:
+            self.fail("Unexpected exception")
+
+        with self.assertRaises(UserError):
+            clm2.unlink()
+
+    def test_set_draft_from_approve(self):
+        """Setting state to 'draft' when it is 'approv' raises an error"""
+
+        bn = self.create_benefit(self.benefit_create_vals)
+        pol = self.create_policy(self.eeJohn, bn, date.today())
+        clm = self.create_claim(pol, 1000)
+        clm.claim_approve()
+        with self.assertRaises(UserError):
+            clm.set_to_draft()
+
+    def test_multicompany_nosearch(self):
+        """A benefit in one company does not appear in searches by another"""
+
+        bn = self.create_benefit(self.benefit_create_vals)
+        self.assertNotEqual(
+            bn.company_id,
+            self.company1,
+            "Company of benefit is not equal to 'A Company'",
+        )
+
+        lst = (
+            self.Benefit.with_user(self.userHRO)
+            .with_context(allowed_company_ids=self.company1.ids)
+            .search([("code", "=", "A")])
+        )
+        self.assertEqual(
+            len(lst), 0, "Benefit does not appear in searches by 'A Company'"
+        )
diff --git a/hr_benefit/tests/test_benefit_access.py b/hr_benefit/tests/test_benefit_access.py
new file mode 100644
index 00000000..2802cd89
--- /dev/null
+++ b/hr_benefit/tests/test_benefit_access.py
@@ -0,0 +1,136 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import date
+
+from dateutil.relativedelta import relativedelta
+
+from . import common
+
+
+class TestBenefitAccess(common.TestBenefitCommon):
+    def test_benefit_access(self):
+        """hr.benefit access: HRM - full access, HRO read-only"""
+
+        bn = self.create_benefit(self.benefit_create_vals)
+
+        # HRM
+        self.create_succeeds(self.userHRM, self.Benefit, self.benefit_create_vals)
+        self.read_succeeds(self.userHRM, self.Benefit, bn.id)
+        self.write_succeeds(self.userHRM, self.Benefit, bn.id, {"name": "tba"})
+        self.unlink_succeeds(self.userHRM, bn)
+
+        # HRO
+        self.create_fails(self.userHRO, self.Benefit, self.benefit_create_vals)
+        self.unlink_fails(self.userHRO, bn)
+        self.read_succeeds(self.userHRO, self.Benefit, bn.id)
+        self.write_fails(self.userHRO, self.Benefit, bn.id, {"name": "tba"})
+
+    def test_premium_access(self):
+        """hr.benefit.premium access: HRM - full access, HRO read-only"""
+
+        bn = self.create_benefit(self.benefit_create_vals)
+        create_vals = {
+            "benefit_id": bn.id,
+            "effective_date": date.today(),
+            "type": "monthly",
+        }
+        prm = self.create_premium(bn, date.today() + relativedelta(days=30))
+
+        # HRM
+        self.create_succeeds(self.userHRM, self.Premium, create_vals)
+        self.unlink_succeeds(self.userHRM, prm)
+        self.read_succeeds(self.userHRM, self.Premium, prm.id)
+        self.write_succeeds(self.userHRM, self.Premium, prm.id, {"type": "annual"})
+
+        # HRO
+        self.create_fails(self.userHRO, self.Premium, create_vals)
+        self.unlink_fails(self.userHRO, prm)
+        self.read_succeeds(self.userHRO, self.Premium, prm.id)
+        self.write_fails(self.userHRO, self.Premium, prm.id, {"type": "annual"})
+
+    def test_earning_access(self):
+        """hr.benefit.advantage access: HRM - full access, HRO read-only"""
+
+        bn = self.create_benefit(self.benefit_create_vals)
+        create_vals = {
+            "benefit_id": bn.id,
+            "effective_date": date.today(),
+            "type": "allowance",
+        }
+        earn = self.create_earning(bn, date.today() + relativedelta(days=30))
+
+        # HRM
+        self.create_succeeds(self.userHRM, self.Earning, create_vals)
+        self.unlink_succeeds(self.userHRM, earn)
+        self.read_succeeds(self.userHRM, self.Earning, earn.id)
+        self.write_succeeds(self.userHRM, self.Earning, earn.id, {"type": "reimburse"})
+
+        # HRO
+        self.create_fails(self.userHRO, self.Earning, create_vals)
+        self.unlink_fails(self.userHRO, earn)
+        self.read_succeeds(self.userHRO, self.Earning, earn.id)
+        self.write_fails(self.userHRO, self.Earning, earn.id, {"type": "reimburse"})
+
+    def test_policy_access(self):
+        """hr.benefit.policy access: HRM - full access, HRO read-only"""
+
+        bn1 = self.create_benefit(self.benefit_create_vals)
+        bn2 = self.create_benefit(
+            {
+                "name": "BenefitB",
+                "code": "B",
+                "multi_policy": True,
+            }
+        )
+        pol = self.create_policy(self.eeJohn, bn1, date.today())
+
+        # HRM
+        hroPol = self.create_succeeds(
+            self.userHRM,
+            self.Policy,
+            {
+                "name": "tbp",
+                "employee_id": self.eeJohn.id,
+                "benefit_id": bn2.id,
+                "start_date": date.today(),
+            },
+        )
+        self.unlink_succeeds(self.userHRM, hroPol)
+        self.read_succeeds(self.userHRM, self.Policy, pol.id)
+        self.write_succeeds(self.userHRM, self.Policy, pol.id, {"name": "tbp2"})
+
+        # HRO
+        hroPol = self.create_succeeds(
+            self.userHRO,
+            self.Policy,
+            {
+                "name": "tbp",
+                "employee_id": self.eeJohn.id,
+                "benefit_id": bn2.id,
+                "start_date": date.today(),
+            },
+        )
+        self.unlink_fails(self.userHRO, hroPol)
+        self.read_succeeds(self.userHRO, self.Policy, pol.id)
+        self.write_succeeds(self.userHRO, self.Policy, pol.id, {"name": "tbp2"})
+
+    def test_policy_user_own(self):
+        """A user can only read his/her own policies"""
+
+        bn1 = self.create_benefit(self.benefit_create_vals)
+        polJohn = self.create_policy(self.eeJohn, bn1, date.today())
+        polPaul = self.create_policy(self.eePaul, bn1, date.today())
+        grpOfficer = self.env.ref("hr.group_hr_user")
+        self.assertNotIn(grpOfficer, self.userJohn.groups_id)
+        self.assertNotEqual(polJohn, polPaul)
+        self.assertEqual(self.userJohn, polJohn.employee_id.user_id)
+        self.assertEqual(self.userPaul, polPaul.employee_id.user_id)
+
+        # John can read his own policy
+        self.read_succeeds(self.userJohn, self.Policy, polJohn.id)
+        # but not Paul's
+        self.read_fails(self.userJohn, self.Policy, polPaul.id)
+        # John can't modify his own policy or Paul's
+        self.write_fails(self.userJohn, self.Policy, polJohn.id, {"note": "A"})
+        self.write_fails(self.userJohn, self.Policy, polPaul.id, {"note": "A"})
diff --git a/hr_benefit/tests/test_benefit_policy.py b/hr_benefit/tests/test_benefit_policy.py
new file mode 100644
index 00000000..c15ff7cf
--- /dev/null
+++ b/hr_benefit/tests/test_benefit_policy.py
@@ -0,0 +1,287 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import date
+
+from dateutil.relativedelta import relativedelta
+
+from odoo import fields
+from odoo.exceptions import UserError
+
+from . import common
+
+
+class TestBenefit(common.TestBenefitCommon):
+    def test_policy_onchange_benefit(self):
+        """When the benefit changes so should the code, premium and earnings amounts"""
+
+        bn1 = self.create_benefit(self.benefit_create_vals)
+        self.create_premium(
+            bn1, date.today() - relativedelta(days=1), "monthly", 100, 100
+        )
+        bn2 = self.create_benefit({"name": "B", "code": "B"})
+        self.create_earning(bn2, date.today(), allowance=1000)
+        pol = self.create_policy(self.eeJohn, bn1, date.today())
+        self.assertEqual(bn1, pol.benefit_id)
+        self.assertEqual(bn1.code, pol.benefit_code)
+        self.assertEqual("draft", pol.state)
+        self.assertTrue(fields.Float.is_zero(pol.advantage_amount, precision_digits=2))
+        self.assertEqual(100, pol.premium_amount)
+        self.assertEqual(100, pol.premium_total)
+
+        pol.benefit_id = bn2.id
+
+        self.assertEqual(bn2, pol.benefit_id)
+        self.assertEqual(bn2.code, pol.benefit_code)
+        self.assertEqual("draft", pol.state)
+        self.assertEqual(
+            0, fields.Float.compare(1000, pol.advantage_amount, precision_digits=2)
+        )
+        self.assertTrue(fields.Float.is_zero(pol.premium_amount, precision_digits=2))
+        self.assertTrue(fields.Float.is_zero(pol.premium_total, precision_digits=2))
+
+    def test_policy_premium_latest(self):
+        """
+        If there are multiple premiums get the lastest one as of today, even if
+        it was after the policy creation date.
+        """
+
+        bn = self.create_benefit(self.benefit_create_vals)
+        self.create_premium(
+            bn,
+            date.today() - relativedelta(days=60),
+            ptype="monthly",
+            amount=100,
+        )
+        self.create_premium(
+            bn,
+            date.today() - relativedelta(days=30),
+            ptype="monthly",
+            amount=200,
+        )
+        pol = self.create_policy(self.eeJohn, bn, date.today() - relativedelta(days=45))
+
+        self.assertEqual(200, pol.premium_amount)
+
+    def test_policy_premium_installments(self):
+        """If total is a multiple of amount then installment = total/amount"""
+
+        bn = self.create_benefit(self.benefit_create_vals)
+        self.create_premium(
+            bn,
+            date.today() - relativedelta(days=1),
+            ptype="monthly",
+            amount=100,
+            total=300,
+        )
+        pol = self.create_policy(self.eeJohn, bn, date.today())
+
+        self.assertEqual(100, pol.premium_amount)
+        self.assertEqual(300, pol.premium_total)
+        self.assertEqual(3, pol.premium_installments)
+
+    def test_monthly_premium_installments_plus(self):
+        """
+        If total is not an even multiple of amount then
+        installment = (total/amount) + 1
+        """
+
+        bn = self.create_benefit(self.benefit_create_vals)
+        self.create_premium(
+            bn, date.today() - relativedelta(days=1), "monthly", 100, 350
+        )
+        pol = self.create_policy(self.eeJohn, bn, date.today())
+
+        self.assertEqual(100, pol.premium_amount)
+        self.assertEqual(350, pol.premium_total)
+        self.assertEqual(4, pol.premium_installments)
+
+    def test_min_employed_days(self):
+        """
+        If the employee has been employed less than the min. days specified in
+        the benefit a UserError exception is raised
+        """
+
+        cc = self.create_contract(
+            "draft", "done", date.today() - relativedelta(days=10)
+        )
+        cc.signal_confirm()
+        bn = self.create_benefit({"name": "B", "code": "B", "min_employed_days": 30})
+        self.create_earning(bn, date.today(), allowance=1000)
+
+        with self.assertRaises(UserError):
+            self.create_policy(self.eeJohn, bn, date.today())
+
+    def test_no_multipolicy(self):
+        """
+        If the benefit hasn't enabled concurrent policies an attempt to enroll an
+        employee more than once will cause a UserError exception to be raised
+        """
+
+        bnNoMulti = self.create_benefit({"name": "B", "code": "B"})
+        bnMulti = self.create_benefit({"name": "C", "code": "C", "multi_policy": True})
+        self.create_earning(bnNoMulti, date.today(), allowance=1000)
+        self.create_earning(bnMulti, date.today(), allowance=3000)
+        self.create_policy(self.eeJohn, bnNoMulti, date.today())
+        self.create_policy(self.eeJohn, bnMulti, date.today())
+
+        with self.assertRaises(UserError):
+            self.create_policy(self.eeJohn, bnNoMulti, date.today())
+
+        try:
+            self.create_policy(self.eeJohn, bnMulti, date.today())
+        except UserError:
+            self.fail("An unexpected exception was raised")
+
+    def test_policy_unlink(self):
+        """Deleting a policy not in 'Draft' state raises a UserError"""
+
+        bn = self.create_benefit({"name": "B", "code": "B"})
+        self.create_earning(bn, date.today(), allowance=1000)
+        pol = self.create_policy(self.eeJohn, bn, date.today())
+        pol.state_open()
+
+        with self.assertRaises(UserError):
+            pol.unlink()
+
+    def test_set_draft_from_open(self):
+        """Setting state to 'Draft' when it is 'open' raises an error"""
+
+        bn = self.create_benefit({"name": "B", "code": "B"})
+        self.create_earning(bn, date.today(), allowance=1000)
+        pol = self.create_policy(self.eeJohn, bn, date.today())
+        pol.state_open()
+
+        with self.assertRaises(UserError):
+            pol.state = "draft"
+
+    def test_set_done_from_draft(self):
+        """Setting state to 'Done' when it isn't 'open' raises an error"""
+
+        bn = self.create_benefit({"name": "B", "code": "B"})
+        self.create_earning(bn, date.today(), allowance=1000)
+        pol = self.create_policy(self.eeJohn, bn, date.today())
+
+        with self.assertRaises(UserError):
+            pol.state_done()
+
+    def test_change_from_done(self):
+        """Setting state to any value when it is 'done' raises an error"""
+
+        bn = self.create_benefit({"name": "B", "code": "B"})
+        self.create_earning(bn, date.today(), allowance=1000)
+        pol = self.create_policy(self.eeJohn, bn, date.today())
+        pol.state_open()
+        pol.state_done()
+
+        with self.assertRaises(UserError):
+            pol.state = "draft"
+        with self.assertRaises(UserError):
+            pol.state = "open"
+
+    def test_override_earning(self):
+        """User can override the calculated earning amount"""
+
+        bn = self.create_benefit({"name": "B", "code": "B"})
+        self.create_earning(bn, date.today(), allowance=1000)
+        pol = self.create_policy(self.eeJohn, bn, date.today(), advantage=4400)
+        pol.state_open()
+
+        self.assertEqual(4400, pol.advantage_amount)
+
+    def test_end_policy_wizard(self):
+        """Calling end_policy() method of wizard sets end date and state = 'done'"""
+
+        bn = self.create_benefit({"name": "B", "code": "B"})
+        self.create_earning(bn, date.today(), allowance=1000)
+        pol = self.create_policy(self.eeJohn, bn, date.today())
+        pol.state_open()
+        self.assertFalse(pol.end_date)
+        self.assertEqual("open", pol.state)
+
+        wiz = self.EndWizard.with_context({"end_benefit_policy_id": pol.id}).create({})
+        wiz.date = date.today()
+        wiz.end_policy()
+
+        self.assertEqual(date.today(), pol.end_date)
+        self.assertEqual(pol.state, "done")
+
+    def test_endroll_single_employee(self):
+        """Running the enroll employee wizard creates a policy for the employee"""
+
+        bn = self.create_benefit({"name": "B", "code": "B"})
+        self.create_earning(bn, date.today(), allowance=1000)
+
+        wiz = self.EnrollWizard.with_context({"active_id": bn.id}).create(
+            {"employee_id": self.eeJohn.id, "start_date": date.today()}
+        )
+        wiz.do_enroll()
+
+        policy_ids = self.Policy.search([("employee_id", "=", self.eeJohn.id)])
+        self.assertEqual(1, len(policy_ids))
+        self.assertEqual(bn, policy_ids[0].benefit_id)
+        self.assertEqual(date.today(), policy_ids[0].start_date)
+        self.assertFalse(policy_ids[0].end_date)
+
+    def test_endroll_multi_employee(self):
+        """
+        Running the enroll multiple employees wizard creates a policy for
+        multiple employees
+        """
+
+        bn = self.create_benefit({"name": "B", "code": "B"})
+        self.create_earning(bn, date.today(), allowance=1000)
+
+        wiz = self.EnrollMultiWizard.with_context({"active_id": bn.id}).create(
+            {"employee_ids": [(6, 0, [self.eeJohn.id])], "start_date": date.today()}
+        )
+        wiz.do_multi_enroll()
+
+        policy_ids = self.Policy.search([("employee_id", "=", self.eeJohn.id)])
+        self.assertEqual(1, len(policy_ids))
+        self.assertEqual(bn, policy_ids[0].benefit_id)
+        self.assertEqual(date.today(), policy_ids[0].start_date)
+        self.assertFalse(policy_ids[0].end_date)
+
+    def test_multicompany_nosearch(self):
+        """A policy in one company does not appear in searches by another"""
+
+        bn = self.create_benefit(self.benefit_create_vals)
+        pol = self.create_policy(self.eeJohn, bn, date.today())
+        self.assertNotEqual(
+            pol.company_id,
+            self.company1,
+            "Company of policy is not equal to 'A Company'",
+        )
+
+        lst = (
+            self.Policy.with_user(self.userHRO)
+            .with_context(allowed_company_ids=self.company1.ids)
+            .search([("name", "=", pol.name)])
+        )
+        self.assertEqual(
+            len(lst), 0, "Policy does not appear in searches by 'A Company'"
+        )
+
+    def test_multicompany_employee(self):
+        """Creating policy for employee from different company raises exception"""
+
+        self.assertEqual(
+            self.eeJames.company_id, self.company1, "Company of employee is 'A Company'"
+        )
+
+        bn = self.create_benefit(self.benefit_create_vals)
+        self.assertNotEqual(
+            bn.company_id,
+            self.company1,
+            "Company of benefit is not equal to 'A Company'",
+        )
+
+        with self.assertRaises(UserError):
+            pol = self.create_policy(self.eeJames, bn, date.today())
+
+            self.assertNotEqual(
+                pol.company_id,
+                self.company1,
+                "Company of policy is not equal to 'A Company'",
+            )
diff --git a/hr_benefit/views/benefit_claim_view.xml b/hr_benefit/views/benefit_claim_view.xml
new file mode 100644
index 00000000..d4459c02
--- /dev/null
+++ b/hr_benefit/views/benefit_claim_view.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+
+        <!-- All Claims -->
+
+        <record id="view_claims_filter" model="ir.ui.view">
+            <field name="name">hr.benefit.claim.filter</field>
+            <field name="model">hr.benefit.claim</field>
+            <field name="arch" type="xml">
+                <search string="Search All Claims">
+                    <field name="date" />
+                    <field name="benefit_policy_id" />
+                    <field name="amount_requested" />
+                    <field name="amount_approved" />
+                    <separator />
+                    <filter
+                        string="My Claims"
+                        icon="terp-personal"
+                        name="my_claims"
+                        domain="[('benefit_policy_id.employee_id.user_id','=', uid)]"
+                    />
+                    <separator />
+                    <field name="employee_id" />
+                    <field name="state" />
+                    <group expand="0" string="Group By...">
+                        <filter
+                            name="group_date"
+                            string="Date"
+                            icon="terp-personal"
+                            domain="[]"
+                            context="{'group_by':'date'}"
+                        />
+                        <filter
+                            name="group_policy"
+                            string="Policy"
+                            icon="terp-stock_symbol-selection"
+                            domain="[]"
+                            context="{'group_by':'benefit_policy_id'}"
+                        />
+                        <filter
+                            name="group_employee"
+                            string="Employee"
+                            icon="terp-personal"
+                            domain="[]"
+                            context="{'group_by':'employee_id'}"
+                        />
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record id="view_all_claims_tree" model="ir.ui.view">
+            <field name="name">hr.benefit.claim.tree</field>
+            <field name="model">hr.benefit.claim</field>
+            <field name="arch" type="xml">
+                <tree string="All Claims">
+                    <field name="date" />
+                    <field name="employee_id" />
+                    <field name="benefit_policy_id" />
+                    <field name="amount_requested" />
+                    <field name="amount_approved" />
+                    <field name="state" />
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_all_claims_form" model="ir.ui.view">
+            <field name="name">hr.benefit.claim.form</field>
+            <field name="model">hr.benefit.claim</field>
+            <field name="priority" eval="10" />
+            <field name="arch" type="xml">
+                <form string="Claim">
+                    <header>
+                        <button
+                            name="signal_approve"
+                            type="workflow"
+                            states="draft"
+                            string="Approve"
+                            class="oe_highlight"
+                        />
+                        <button
+                            name="signal_decline"
+                            type="workflow"
+                            states="draft,approve"
+                            string="Decline"
+                            class="oe_highlight"
+                        />
+                        <button
+                            string="Reset to New"
+                            name="set_to_draft"
+                            states="decline"
+                            type="object"
+                            groups="hr.group_hr_manager"
+                        />
+                        <field
+                            name="state"
+                            widget="statusbar"
+                            statusbar_visible="draft,approve"
+                        />
+                    </header>
+                    <group>
+                        <group>
+                            <field name="employee_id" />
+                            <field name="benefit_policy_id" />
+                            <field name="date" />
+                            <field name="amount_requested" />
+                            <label for="amount_approved" />
+                            <h2>
+                                <field name="amount_approved" />
+                            </h2>
+                        </group>
+                        <group>
+                        </group>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="open_all_claims_view" model="ir.actions.act_window">
+            <field name="name">All Claims</field>
+            <field name="res_model">hr.benefit.claim</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_claims_filter" />
+        </record>
+        <menuitem
+            id="menu_all_claims"
+            action="open_all_claims_view"
+            parent="menu_claims_root"
+            groups="base.group_user"
+            sequence="5"
+        />
+
+    </data>
+</odoo>
diff --git a/hr_benefit/views/benefit_earning_view.xml b/hr_benefit/views/benefit_earning_view.xml
new file mode 100644
index 00000000..936a85a8
--- /dev/null
+++ b/hr_benefit/views/benefit_earning_view.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+
+        <!-- Policy Advantages -->
+
+        <record id="view_benefit_policy_advantage_tree" model="ir.ui.view">
+            <field name="name">hr.benefit.advantage.tree</field>
+            <field name="model">hr.benefit.advantage</field>
+            <field name="arch" type="xml">
+                <tree string="Benefit Advantages">
+                    <field name="benefit_id" />
+                    <field name="effective_date" />
+                    <field name="type" />
+                    <field name="min_employed_days" />
+                    <field name="active" />
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_benefit_policy_advantage_form" model="ir.ui.view">
+            <field name="name">hr.benefit.advantage.form</field>
+            <field name="model">hr.benefit.advantage</field>
+            <field name="arch" type="xml">
+                <form string="Benefit Advantage">
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="effective_date" />
+                                <field name="min_employed_days" />
+                                <field name="type" />
+                            </group>
+                            <group>
+                                <field name="benefit_id" />
+                                <field name="active" />
+                            </group>
+                        </group>
+                        <group string="Elegibility">
+                            <group>
+                                <field name="category_ids" />
+                                <field name="job_ids" />
+                            </group>
+                            <group>
+                                <field name="invert_categories" />
+                                <field name="invert_jobs" />
+                            </group>
+                        </group>
+                        <group
+                            string="Allowance"
+                            attrs="{'invisible': [('type', '!=', 'allowance')]}"
+                        >
+                            <group>
+                                <group>
+                                    <field
+                                        name="allowance_amount"
+                                        attrs="{'required': [('type', '=', 'allowance')]}"
+                                    />
+                                </group>
+                            </group>
+                        </group>
+                        <group
+                            string="Loan"
+                            attrs="{'invisible': [('type', '!=', 'loan')]}"
+                        >
+                            <group>
+                                <group>
+                                    <field
+                                        name="loan_amount"
+                                        attrs="{'required': [('type', '=', 'loan')]}"
+                                    />
+                                </group>
+                            </group>
+                        </group>
+                        <group
+                            string="Re-imbursement"
+                            attrs="{'invisible': [('type', '!=', 'reimburse')]}"
+                        >
+                            <group>
+                                <field name="reim_nolimit" />
+                            </group>
+                            <group
+                                string="Limit"
+                                attrs="{'invisible': [('reim_nolimit', '!=', False)]}"
+                            >
+                                <field name="reim_limit_amount" />
+                                <field
+                                    name="reim_limit_period"
+                                    attrs="{'required': [('type', '=', 'reimburse')]}"
+                                />
+                                <field
+                                    name="reim_period_month_day"
+                                    attrs="{'invisible': [('reim_limit_period', '!=', 'monthly')]}"
+                                />
+                                <label
+                                    for="reim_period_annual_month"
+                                    string="First Day of Cycle"
+                                    attrs="{'invisible': [('reim_limit_period', '!=', 'annual')]}"
+                                />
+                                <field
+                                    name="reim_period_annual_month"
+                                    nolabel="1"
+                                    class="oe_inline"
+                                    attrs="{'invisible': [('reim_limit_period', '!=', 'annual')]}"
+                                />
+                                <field
+                                    name="reim_period_annual_day"
+                                    nolabel="1"
+                                    class="oe_inline"
+                                    attrs="{'invisible': [('reim_limit_period', '!=', 'annual')]}"
+                                />
+                            </group>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="open_benefits_policy_advantage_view" model="ir.actions.act_window">
+            <field name="name">Earnings</field>
+            <field name="res_model">hr.benefit.advantage</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem
+            id="menu_benefits_policy_advantage"
+            action="open_benefits_policy_advantage_view"
+            parent="menu_benefits_configuration"
+            groups="base.group_user"
+            sequence="8"
+        />
+
+    </data>
+</odoo>
diff --git a/hr_benefit/views/benefit_policy_view.xml b/hr_benefit/views/benefit_policy_view.xml
new file mode 100644
index 00000000..e0983486
--- /dev/null
+++ b/hr_benefit/views/benefit_policy_view.xml
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+
+        <!-- Policies -->
+
+        <record id="view_benefit_policy_filter" model="ir.ui.view">
+            <field name="name">hr.benefit.policy.filter</field>
+            <field name="model">hr.benefit.policy</field>
+            <field name="arch" type="xml">
+                <search string="Search Benefit Policies">
+                    <field name="name" string="Policies" />
+                    <field name="employee_id" />
+                    <field name="benefit_id" />
+                    <separator />
+                    <filter
+                        icon="terp-go-year"
+                        name="is_active"
+                        string="Active Policies"
+                        domain="[('state','in', ['draft', 'open'])]"
+                        help="Filters policies that are not terminated."
+                    />
+                    <filter
+                        string="My Policies"
+                        icon="terp-personal"
+                        name="my_policies"
+                        domain="[('employee_id.user_id','=', uid)]"
+                    />
+                    <filter
+                        name="current_policies"
+                        string="Current Policies"
+                        domain="['&amp;', '|',  ('end_date', '=', False), ('end_date', '&gt;=', context_today().strftime('%Y-%m-%d')), ('state', '!=', 'done')]"
+                    />
+                    <group expand="0" string="Group By...">
+                        <filter
+                            name="group_benefit_id"
+                            string="Benefit"
+                            icon="terp-stock_symbol-selection"
+                            domain="[]"
+                            context="{'group_by':'benefit_id'}"
+                        />
+                        <filter
+                            name="group_employee_id"
+                            string="Employee"
+                            icon="terp-personal"
+                            domain="[]"
+                            context="{'group_by':'employee_id'}"
+                        />
+                        <filter
+                            name="group_department_id"
+                            string="Department"
+                            icon="terp-personal"
+                            domain="[]"
+                            context="{'group_by':'department_id'}"
+                        />
+                        <filter
+                            name="group_start_date"
+                            string="Start Date"
+                            icon="terp-personal"
+                            domain="[]"
+                            context="{'group_by':'start_date'}"
+                        />
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record id="view_benefits_policy_tree" model="ir.ui.view">
+            <field name="name">hr.benefit.policy.tree</field>
+            <field name="model">hr.benefit.policy</field>
+            <field name="arch" type="xml">
+                <tree string="Benefit Policies">
+                    <field name="name" />
+                    <field name="employee_id" />
+                    <field name="department_id" />
+                    <field name="benefit_id" />
+                    <field name="start_date" />
+                    <field name="end_date" />
+                    <field name="active" />
+                    <field name="state" />
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_benefits_policy_form" model="ir.ui.view">
+            <field name="name">hr.benefit.policy.form</field>
+            <field name="model">hr.benefit.policy</field>
+            <field name="arch" type="xml">
+                <form string="Benefit Policy">
+                    <header>
+                        <button
+                            name='state_open'
+                            type="object"
+                            states="draft"
+                            string="Start Policy"
+                            class="oe_highlight"
+                        />
+                        <button
+                            name='end_policy'
+                            type="object"
+                            states="open"
+                            string="End Policy"
+                            class="oe_highlight"
+                        />
+                        <field name="state" widget="statusbar" />
+                    </header>
+                    <sheet>
+                        <label for="name" class="oe_edit_only" />
+                        <h1>
+                            <field name="name" />
+                        </h1>
+                        <group>
+                            <group string="Details">
+                                <field name="employee_id" />
+                                <label for="start_date" string="Duration" />
+                                <div>
+                                    <field
+                                        name="start_date"
+                                        class="oe_inline"
+                                    /> - <field name="end_date" class="oe_inline" />
+                                </div>
+                                <field name="advantage_override" />
+                                <field name="premium_override" />
+                                <field
+                                    name="company_id"
+                                    groups="base.group_multi_company"
+                                />
+                            </group>
+                            <group string="Benefit">
+                                <field name="department_id" />
+                                <field name="benefit_id" />
+                                <field name="active" />
+                                <field name="benefit_code" invisible="1" />
+                            </group>
+                        </group>
+                        <notebook>
+                            <page string="General">
+                                <group name="left">
+                                    <field
+                                        name="advantage_override_amount"
+                                        invisible="1"
+                                    />
+                                    <field
+                                        name="premium_override_amount"
+                                        invisible="1"
+                                    />
+                                    <field
+                                        name="premium_override_total"
+                                        invisible="1"
+                                    />
+                                    <field
+                                        name="advantage_amount"
+                                        attrs="{'readonly': [('advantage_override', '=', False)], 'required': [('advantage_override', '=', True)]}"
+                                    />
+                                    <field
+                                        name="premium_amount"
+                                        attrs="{'readonly': [('premium_override', '=', False)], 'required': [('premium_override', '=', True)]}"
+                                    />
+                                    <field
+                                        name="premium_total"
+                                        attrs="{'readonly': [('premium_override', '=', False)], 'required': [('premium_override', '=', True)]}"
+                                    />
+                                    <field name="premium_installments" readonly="1" />
+                                </group>
+                            </page>
+                        </notebook>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="open_benefits_policy_view" model="ir.actions.act_window">
+            <field name="name">Policies</field>
+            <field name="res_model">hr.benefit.policy</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'search_default_is_active': 1}</field>
+            <field name="search_view_id" ref="view_benefit_policy_filter" />
+        </record>
+<!--
+        <menuitem id="menu_benefits_policy"
+            action="open_benefits_policy_view"
+            parent="menu_benefits_root"
+            groups="base.group_user"
+            sequence="5"/>
+-->
+        <record id="open_my_benefit_policies" model="ir.actions.act_window">
+            <field name="name">Policies</field>
+            <field name="res_model">hr.benefit.policy</field>
+            <field name="view_mode">tree,form</field>
+            <field
+                name="context"
+            >{'search_default_my_policies':1, 'search_default_is_active':1}</field>
+            <field name="search_view_id" ref="view_benefit_policy_filter" />
+        </record>
+        <menuitem
+            id="menu_my_benefit_policies"
+            action="open_my_benefit_policies"
+            parent="menu_benefits_root"
+            groups="base.group_user"
+            sequence="6"
+        />
+
+    </data>
+</odoo>
diff --git a/hr_benefit/views/benefit_premium_view.xml b/hr_benefit/views/benefit_premium_view.xml
new file mode 100644
index 00000000..02b0d7a7
--- /dev/null
+++ b/hr_benefit/views/benefit_premium_view.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+
+        <!-- Premiums -->
+
+        <record id="view_benefit_policy_premium_tree" model="ir.ui.view">
+            <field name="name">hr.benefit.premium.tree</field>
+            <field name="model">hr.benefit.premium</field>
+            <field name="arch" type="xml">
+                <tree string="Benefit Premium Policies">
+                    <field name="benefit_id" />
+                    <field name="effective_date" />
+                    <field name="type" />
+                    <field name="amount" />
+                    <field name="no_of_installments" />
+                    <field name="total_amount" />
+                    <field name="active" />
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_benefit_policy_premium_form" model="ir.ui.view">
+            <field name="name">hr.benefit.premium.form</field>
+            <field name="model">hr.benefit.premium</field>
+            <field name="arch" type="xml">
+                <form string="Benefit Premium">
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="effective_date" />
+                                <field name="type" />
+                                <field name="amount" />
+                                <field name="total_amount" />
+                                <field name="no_of_installments" />
+                            </group>
+                            <group>
+                                <field name="benefit_id" />
+                                <field name="active" />
+                            </group>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="open_benefits_policy_premium_view" model="ir.actions.act_window">
+            <field name="name">Premiums</field>
+            <field name="res_model">hr.benefit.premium</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem
+            id="menu_benefits_policy_premium"
+            action="open_benefits_policy_premium_view"
+            parent="menu_benefits_configuration"
+            groups="base.group_user"
+            sequence="6"
+        />
+
+    </data>
+</odoo>
diff --git a/hr_benefit/views/benefit_view.xml b/hr_benefit/views/benefit_view.xml
new file mode 100644
index 00000000..adeefdfd
--- /dev/null
+++ b/hr_benefit/views/benefit_view.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+
+        <!-- Main Menu Parent -->
+        <menuitem
+            id="menu_benefits_root"
+            name="Benefits Management"
+            parent="hr.menu_hr_root"
+            groups="base.group_user"
+            sequence="30"
+        />
+
+        <!-- Configuration Menu Parent -->
+        <menuitem
+            id="menu_benefits_configuration"
+            name="Benefits"
+            parent="hr.menu_human_resources_configuration"
+            groups="base.group_user"
+            sequence="5"
+        />
+
+        <!-- Claims Menu Parent -->
+        <menuitem
+            id="menu_claims_root"
+            name="Claims &amp; Payments"
+            parent="menu_benefits_root"
+            groups="base.group_user"
+            sequence="10"
+        />
+
+        <record id="view_benefits_tree" model="ir.ui.view">
+            <field name="name">hr.benefit.tree</field>
+            <field name="model">hr.benefit</field>
+            <field name="arch" type="xml">
+                <tree string="Benefits">
+                    <field name="name" />
+                    <field name="code" />
+                    <field name="has_advantage" />
+                    <field name="has_premium" />
+                    <field name="min_employed_days" />
+                    <field name="multi_policy" />
+                    <field name="company_id" groups="base.group_multi_company" />
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_benefits_form" model="ir.ui.view">
+            <field name="name">hr.benefit.form</field>
+            <field name="model">hr.benefit</field>
+            <field name="arch" type="xml">
+                <form string="Benefit">
+                    <sheet>
+                        <label for="name" class="oe_edit_only" />
+                        <h1>
+                            <field name="name" />
+                        </h1>
+                        <label for="active" class="oe_inline" /> <field
+                            name="active"
+                            class="oe_inline"
+                        />
+                        <newline />
+                        <group>
+                            <group>
+                                <field name="code" />
+                                <field name="min_employed_days" />
+                                <field name="multi_policy" />
+                            </group>
+                            <group>
+                                <field name="has_advantage" />
+                                <field name="has_premium" />
+                                <field
+                                    name="company_id"
+                                    groups="base.group_multi_company"
+                                />
+                            </group>
+                            <group>
+                                <group
+                                    string="Earnings"
+                                    attrs="{'invisible': [('has_advantage', '!=', True)]}"
+                                >
+                                    <field name="advantage_ids" nolabel="1">
+                                        <tree string="Earnings">
+                                            <field name="effective_date" />
+                                            <field name="type" />
+                                            <field name="allowance_amount" />
+                                            <field name="reim_limit_amount" />
+                                            <field name="min_employed_days" />
+                                        </tree>
+                                    </field>
+                                </group>
+                            </group>
+                            <group>
+                                <group
+                                    string="Premiums"
+                                    attrs="{'invisible': [('has_premium', '!=', True)]}"
+                                >
+                                    <field name="premium_ids" nolabel="1">
+                                        <tree string="Premium">
+                                            <field name="effective_date" />
+                                            <field name="type" />
+                                            <field name="amount" />
+                                            <field name="total_amount" />
+                                        </tree>
+                                    </field>
+                                </group>
+                            </group>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="open_benefits_view" model="ir.actions.act_window">
+            <field name="name">Benefits</field>
+            <field name="res_model">hr.benefit</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem
+            id="menu_benefits"
+            action="open_benefits_view"
+            parent="menu_benefits_configuration"
+            groups="hr.group_hr_manager"
+            sequence="5"
+        />
+
+    </data>
+</odoo>
diff --git a/hr_benefit/views/hr_employee_view.xml b/hr_benefit/views/hr_employee_view.xml
new file mode 100644
index 00000000..1cbdda00
--- /dev/null
+++ b/hr_benefit/views/hr_employee_view.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+
+        <!-- Benefit Policies Button on Employee Form -->
+
+        <record id="act_hr_employee_2_hr_benefit_policy" model="ir.actions.act_window">
+            <field name="res_model">hr.benefit.policy</field>
+            <field name="name">Benefits</field>
+            <field name="view_mode">tree,form</field>
+            <field
+                name="context"
+            >{'search_default_employee_id': [active_id], 'default_employee_id': active_id, 'search_default_group_employee_id': 0}</field>
+        </record>
+        <record id="act_hr_employee_2_hr_benefit_claims" model="ir.actions.act_window">
+            <field name="res_model">hr.benefit.claim</field>
+            <field name="name">Claims on Benefits</field>
+            <field name="view_mode">tree,form</field>
+            <field
+                name="context"
+            >{'search_default_employee_id': [active_id], 'default_employee_id': active_id}</field>
+        </record>
+        <record id="hr_employee_view_form" model="ir.ui.view">
+            <field name="name">hr.employee.view.inherit.benefits</field>
+            <field name="model">hr.employee</field>
+            <field name="inherit_id" ref="hr.view_employee_form" />
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="//div[@name='button_box']" position="inside">
+                        <button
+                            name="%(act_hr_employee_2_hr_benefit_policy)d"
+                            class="oe_stat_button"
+                            icon="fa-umbrella"
+                            type="action"
+                            context="{'search_default_current_policies': 1}"
+                            groups="hr.group_hr_user"
+                        >
+                            <field
+                                name="benefit_policies_count"
+                                widget="statinfo"
+                                string="Benefits"
+                            />
+                        </button>
+                        <button
+                            name="%(act_hr_employee_2_hr_benefit_claims)d"
+                            class="oe_stat_button"
+                            icon="fa-files-o"
+                            type="action"
+                            groups="hr.group_hr_user"
+                        >
+                            <field
+                                name="benefit_claims_count"
+                                widget="statinfo"
+                                string="Claims"
+                            />
+                        </button>
+                    </xpath>
+                </data>
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/hr_benefit/wizard/__init__.py b/hr_benefit/wizard/__init__.py
new file mode 100644
index 00000000..d4822a80
--- /dev/null
+++ b/hr_benefit/wizard/__init__.py
@@ -0,0 +1,7 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013,2014 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import end_policy
+from . import enroll_employee
+from . import enroll_multi_employee
diff --git a/hr_benefit/wizard/end_policy.py b/hr_benefit/wizard/end_policy.py
new file mode 100644
index 00000000..c0e1d589
--- /dev/null
+++ b/hr_benefit/wizard/end_policy.py
@@ -0,0 +1,30 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2014 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import _, api, fields, models
+from odoo.exceptions import ValidationError
+
+
+class PolicyEnd(models.TransientModel):
+
+    _name = "hr.benefit.policy.end"
+    _description = "Benefit Policy Termination Wizard"
+
+    date = fields.Date(string="End Date", required=True, default=fields.Date.today())
+
+    @api.model
+    def _get_policy(self):
+
+        return self.env.context.get("end_benefit_policy_id", False)
+
+    def end_policy(self):
+
+        policy_id = self._get_policy()
+        if not policy_id:
+            raise ValidationError(_("Unable to determine Benefit Policy."))
+
+        policy = self.env["hr.benefit.policy"].browse(policy_id)
+        policy.end_date = self.date
+        policy.state_done()
+        return {"type": "ir.actions.act_window_close"}
diff --git a/hr_benefit/wizard/end_policy.xml b/hr_benefit/wizard/end_policy.xml
new file mode 100644
index 00000000..a92be317
--- /dev/null
+++ b/hr_benefit/wizard/end_policy.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+
+        <record id="end_benefit_policy_form" model="ir.ui.view">
+            <field name="name">hr.benefit.policy.end.form</field>
+            <field name="model">hr.benefit.policy.end</field>
+            <field name="arch" type="xml">
+                <form string="End Benefit Policy">
+                    <header>
+                        <button
+                            name="end_policy"
+                            type="object"
+                            string="Finish"
+                            class="oe_highlight"
+                        />
+                    </header>
+                    <newline />
+                    <h3>
+                        Please enter the last day of the policy in the field provided below.
+                    </h3>
+                    <group>
+                        <group>
+                            <field name="date" />
+                        </group>
+                        <group>
+                        </group>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/hr_benefit/wizard/enroll_employee.py b/hr_benefit/wizard/enroll_employee.py
new file mode 100644
index 00000000..bfae7235
--- /dev/null
+++ b/hr_benefit/wizard/enroll_employee.py
@@ -0,0 +1,47 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import api, fields, models
+
+
+class EnrollEmployee(models.TransientModel):
+
+    _name = "hr.benefit.enroll.employee"
+    _description = "Employee Benefit Enrollment Form"
+
+    benefit_id = fields.Many2one(
+        string="Benefit",
+        comodel_name="hr.benefit",
+        required=True,
+        default=lambda self: self._get_benefit(),
+    )
+    employee_id = fields.Many2one(
+        comodel_name="hr.employee", string="Employee", required=True
+    )
+    start_date = fields.Date(
+        string="Enrollment Date", required=True, default=fields.Date.today()
+    )
+    end_date = fields.Date(string="Termination Date")
+
+    @api.model
+    def _get_benefit(self):
+
+        if self.env.context is None:
+            self.env.with_context({})
+        return self.env.context.get("active_id", False)
+
+    def do_enroll(self):
+
+        if not self.benefit_id or not self.employee_id:
+            return {"type": "ir.actions.act_window_close"}
+
+        vals = {
+            "benefit_id": self.benefit_id.id,
+            "employee_id": self.employee_id.id,
+            "start_date": self.start_date,
+            "end_date": self.end_date,
+        }
+        self.env["hr.benefit.policy"].create(vals)
+
+        return {"type": "ir.actions.act_window_close"}
diff --git a/hr_benefit/wizard/enroll_employee_view.xml b/hr_benefit/wizard/enroll_employee_view.xml
new file mode 100644
index 00000000..f3d4b8f6
--- /dev/null
+++ b/hr_benefit/wizard/enroll_employee_view.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+
+        <record id="enroll_employee_form" model="ir.ui.view">
+            <field name="name">hr.benefit.enroll.employee.form</field>
+            <field name="model">hr.benefit.enroll.employee</field>
+            <field name="arch" type="xml">
+                <form string="Enroll Employee">
+                    <header>
+                        <button
+                            name="do_enroll"
+                            type="object"
+                            string="Enroll"
+                            class="oe_highlight"
+                        />
+                    </header>
+                    <group>
+                        <group>
+                            <field name="benefit_id" />
+                            <field name="employee_id" />
+                            <field name="start_date" />
+                            <field name="end_date" />
+                        </group>
+                    </group>
+                </form>
+            </field>
+        </record>
+        <record id="action_enroll_employee" model="ir.actions.act_window">
+            <field name="name">Enroll Employee</field>
+            <field name="res_model">hr.benefit.enroll.employee</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="enroll_employee_form" />
+            <field name="target">new</field>
+        </record>
+        <record id="server_action_enroll_employee" model="ir.actions.server">
+            <field name="name">Enroll Employee</field>
+            <field name="model_id" ref="model_hr_benefit_enroll_employee" />
+            <field name="binding_model_id" ref="model_hr_benefit" />
+            <field name="binding_view_types">form</field>
+            <field name="state">code</field>
+            <field name="code">
+action_values = env.ref("hr_benefit.action_enroll_employee").sudo().read()[0]
+action_values.update({"context": env.context})
+action = action_values
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/hr_benefit/wizard/enroll_multi_employee.py b/hr_benefit/wizard/enroll_multi_employee.py
new file mode 100644
index 00000000..f6a19318
--- /dev/null
+++ b/hr_benefit/wizard/enroll_multi_employee.py
@@ -0,0 +1,116 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+import math
+from datetime import date
+
+from dateutil.relativedelta import relativedelta
+
+from odoo import api, fields, models
+
+
+class EnrollEmployee(models.TransientModel):
+
+    _name = "hr.benefit.enroll.multi.employee"
+    _description = "Employee Benefit Enrollment Form"
+
+    benefit_id = fields.Many2one(
+        string="Benefit",
+        comodel_name="hr.benefit",
+        required=True,
+        default=lambda self: self._get_benefit(),
+    )
+    employee_ids = fields.Many2many(
+        string="Employee",
+        comodel_name="hr.employee",
+        relation="hr_employee_benefit_rel",
+        column1="employee_id",
+        column2="benefit_id",
+    )
+    start_date = fields.Date(
+        string="Enrollment Date", required=True, default=date.today()
+    )
+    end_date = fields.Date(string="Termination Date")
+    advantage_override = fields.Boolean(string="Override Advantage")
+    premium_override = fields.Boolean(string="Override Premium")
+    advantage_amount = fields.Float(compute="_compute_amounts", digits="Account")
+    premium_amount = fields.Float(compute="_compute_amounts", digits="Account")
+    premium_total = fields.Float(compute="_compute_amounts", digits="Account")
+    premium_installments = fields.Integer(
+        compute="_compute_premium_installments", string="No. of Installments"
+    )
+
+    @api.model
+    def _get_benefit(self):
+
+        if self.env.context is None:
+            self.env.context = {}
+        return self.env.context.get("active_id", False)
+
+    @api.depends("benefit_id")
+    def _compute_amounts(self):
+
+        for rec in self:
+            res = {
+                "advantage_amount": 0,
+                "premium_amount": 0,
+                "premium_total": 0,
+            }
+
+            if not rec.benefit_id or not rec.start_date:
+                rec.write(res)
+
+            dToday = rec.start_date
+            adv = rec.benefit_id.get_latest_advantage(dToday)
+            prm = rec.benefit_id.get_latest_premium(dToday)
+            if adv is not None:
+                if adv.type == "allowance":
+                    res["advantage_amount"] = adv.allowance_amount
+
+            if prm is not None:
+                res["premium_amount"] = prm.amount
+                res["premium_total"] = prm.total_amount
+
+            rec.write(res)
+
+    @api.depends("start_date", "premium_amount", "premium_total")
+    def _compute_premium_installments(self):
+
+        for rec in self:
+            res = {"end_date": False, "premium_installments": 0}
+            if rec.premium_amount == 0:
+                rec.write(res)
+                return
+
+            installments = int(
+                math.ceil(float(rec.premium_total) / float(rec.premium_amount))
+            )
+            if installments > 0:
+                dEnd = rec.start_date + relativedelta(months=+installments)
+                res["end_date"] = dEnd
+            res["premium_installments"] = installments
+            rec.write(res)
+
+    def do_multi_enroll(self):
+
+        if not self.benefit_id or len(self.employee_ids) == 0:
+            return {"type": "ir.actions.act_window_close"}
+
+        for employee in self.employee_ids:
+
+            vals = {
+                "benefit_id": self.benefit_id.id,
+                "employee_id": employee.id,
+                "start_date": self.start_date,
+                "end_date": self.end_date,
+                "advantage_override": self.advantage_override,
+                "premium_override": self.premium_override,
+                "advantage_amount": self.advantage_amount,
+                "premium_amount": self.premium_amount,
+                "premium_total": self.premium_total,
+            }
+            pol_id = self.env["hr.benefit.policy"].create(vals)
+            pol_id.state_open()
+
+        return {"type": "ir.actions.act_window_close"}
diff --git a/hr_benefit/wizard/enroll_multi_employee_view.xml b/hr_benefit/wizard/enroll_multi_employee_view.xml
new file mode 100644
index 00000000..12d2aea5
--- /dev/null
+++ b/hr_benefit/wizard/enroll_multi_employee_view.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+
+        <record id="enroll_multi_employee_form" model="ir.ui.view">
+            <field name="name">hr.benefit.enroll.employee.multi.form</field>
+            <field name="model">hr.benefit.enroll.multi.employee</field>
+            <field name="arch" type="xml">
+                <form string="Enroll Employee">
+                    <header>
+                        <button
+                            name="do_multi_enroll"
+                            type="object"
+                            string="Enroll"
+                            class="oe_highlight"
+                        />
+                    </header>
+                    <group>
+                        <group>
+                            <field name="benefit_id" />
+                            <field name="start_date" />
+                            <field name="end_date" />
+                        </group>
+                        <group>
+                            <field name="advantage_override" />
+                            <field name="premium_override" />
+                        </group>
+                    </group>
+                    <group>
+                        <group name="left">
+                            <field
+                                name="advantage_amount"
+                                attrs="{'readonly': [('advantage_override', '=', False)], 'required': [('advantage_override', '=', True)]}"
+                            />
+                            <field
+                                name="premium_amount"
+                                attrs="{'readonly': [('premium_override', '=', False)], 'required': [('premium_override', '=', True)]}"
+                            />
+                            <field
+                                name="premium_total"
+                                attrs="{'readonly': [('premium_override', '=', False)], 'required': [('premium_override', '=', True)]}"
+                            />
+                            <field name="premium_installments" readonly="1" />
+                        </group>
+                    </group>
+                    <newline />
+                    <group string="Employees">
+                            <field name="employee_ids" nolabel="1" />
+                    </group>
+                </form>
+            </field>
+        </record>
+        <record id="action_enroll_multiemployee" model="ir.actions.act_window">
+            <field name="name">Enroll Multiple Employees</field>
+            <field name="res_model">hr.benefit.enroll.multi.employee</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="enroll_multi_employee_form" />
+            <field name="target">new</field>
+        </record>
+        <record id="server_action_enroll_multiemployee" model="ir.actions.server">
+            <field name="name">Enroll Multiple Employees</field>
+            <field name="model_id" ref="model_hr_benefit_enroll_multi_employee" />
+            <field name="binding_model_id" ref="model_hr_benefit" />
+            <field name="binding_view_types">form</field>
+            <field name="state">code</field>
+            <field name="code">
+action_values = env.ref("hr_benefit.action_enroll_multiemployee").sudo().read()[0]
+action_values.update({"context": env.context})
+action = action_values
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/hr_benefit_payroll/README.rst b/hr_benefit_payroll/README.rst
new file mode 100644
index 00000000..70331637
--- /dev/null
+++ b/hr_benefit_payroll/README.rst
@@ -0,0 +1,86 @@
+================
+Benefits Payroll
+================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:284204823bfbe256db00a02ca5635fb5ce22d4c9852bcb61cd9e2491875d03d7
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/hr_benefit_payroll
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+Apply Employee Benefits to Payroll
+==================================
+* Benefits can be linked to payroll
+    * Choose the 'Allowance' type for earnings
+    * Choose the 'Deduction' type for premiums
+    * Use Salary Rules to integrate them in to Payroll Structures
+    * Information about the benefits are available to Salary Rules in a top-level 'benefits' object
+        - Example: result = hr_benefit.<CODE>.deductions
+    * The available fields are:
+        - qty: the number of policies of this type found
+        - earnings: the money to add
+        - deductions: the money to deduct
+        - ppf (Percentage Payroll Factor): 1 if the policy was active for the entire payroll period; less than 1 if it was active only for a fraction of the payroll period
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Changelog
+=========
+
+14.0.1.2.1 (2022-08-17)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* [FIX] Catch up to changes in OCA/Payroll. Update your salary rules to take into account the dictionary naming changes.
+
+14.0.1.0.1 (2022-08-09)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* [FIX] Slightly off PPF calculation of benefit policy when the payslip period lengths don't equal the policy period lengths.
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20hr_benefit_payroll%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+* Michael Telahun Makonnen
+
+Other credits
+~~~~~~~~~~~~~
+
+* Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/hr_benefit_payroll>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/hr_benefit_payroll/__init__.py b/hr_benefit_payroll/__init__.py
new file mode 100644
index 00000000..f4515d9a
--- /dev/null
+++ b/hr_benefit_payroll/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013,2014 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
diff --git a/hr_benefit_payroll/__manifest__.py b/hr_benefit_payroll/__manifest__.py
new file mode 100644
index 00000000..adf04344
--- /dev/null
+++ b/hr_benefit_payroll/__manifest__.py
@@ -0,0 +1,29 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013,2014 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Benefits Payroll",
+    "summary": "Access benefits in payroll through salary rules.",
+    "version": "15.0.1.0.0",
+    "category": "Payroll",
+    "author": "TREVI Software, Michael Telahun Makonnen",
+    "license": "AGPL-3",
+    "images": ["static/src/img/main_screenshot.png"],
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "hr_benefit",
+        "payroll",
+    ],
+    "data": [
+        "security/ir.model.access.csv",
+        "security/security.xml",
+        "views/benefit_view.xml",
+        "views/benefit_policy_view.xml",
+        "views/benefit_premium_payment_view.xml",
+        "views/hr_employee_view.xml",
+        "views/hr_payslip_view.xml",
+        "views/hr_salary_rule_view.xml",
+    ],
+    "installable": True,
+}
diff --git a/hr_benefit_payroll/i18n/hr_benefit_payroll.pot b/hr_benefit_payroll/i18n/hr_benefit_payroll.pot
new file mode 100644
index 00000000..3bb28c3d
--- /dev/null
+++ b/hr_benefit_payroll/i18n/hr_benefit_payroll.pot
@@ -0,0 +1,302 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* hr_benefit_payroll
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: hr_benefit_payroll
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_benefit_premium_payment__amount
+msgid "Amount"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_payslip_line__benefit_id
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_salary_rule__benefit_id
+msgid "Benefit"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model:ir.model,name:hr_benefit_payroll.model_hr_benefit_policy
+msgid "Benefit Enrollment"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_payslip__premium_payment_ids
+#: model_terms:ir.ui.view,arch_db:hr_benefit_payroll.view_hr_payslip_form
+msgid "Benefit Premium Payments"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model:ir.model,name:hr_benefit_payroll.model_hr_benefit_premium_payment
+msgid "Benefit premium payment"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_payslip__benefit_line_ids
+#: model_terms:ir.ui.view,arch_db:hr_benefit_payroll.view_hr_payslip_form
+msgid "Benefits"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model_terms:ir.ui.view,arch_db:hr_benefit_payroll.view_premium_payments_form
+msgid "Cancel"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model:ir.model.fields.selection,name:hr_benefit_payroll.selection__hr_benefit_premium_payment__state__cancel
+msgid "Cancelled"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_payslip_benefit__code
+msgid "Code"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_benefit_premium_payment__create_uid
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_payslip_benefit__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_benefit_premium_payment__create_date
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_payslip_benefit__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_benefit_premium_payment__date
+#: model_terms:ir.ui.view,arch_db:hr_benefit_payroll.view_premium_payments_filter
+msgid "Date"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model_terms:ir.ui.view,arch_db:hr_benefit_payroll.view_premium_payments_form
+msgid "Decline"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_payslip_benefit__deductions
+msgid "Deductions"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_payslip_benefit__name
+msgid "Description"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_benefit__display_name
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_benefit_policy__display_name
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_benefit_premium_payment__display_name
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_payslip__display_name
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_payslip_benefit__display_name
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_salary_rule__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model:ir.model.fields.selection,name:hr_benefit_payroll.selection__hr_benefit_premium_payment__state__done
+msgid "Done"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model:ir.model.fields.selection,name:hr_benefit_payroll.selection__hr_benefit_premium_payment__state__draft
+msgid "Draft"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_payslip_benefit__earnings
+msgid "Earnings"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_benefit_premium_payment__employee_id
+#: model_terms:ir.ui.view,arch_db:hr_benefit_payroll.view_premium_payments_filter
+msgid "Employee"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model:ir.model,name:hr_benefit_payroll.model_hr_benefit
+msgid "Employee Benefit"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: code:addons/hr_benefit_payroll/models/hr_payslip.py:0
+#, python-format
+msgid ""
+"Error creating benefit premium payment records!Unable to find a valid benefit policy:\n"
+"Employee: %s\n"
+"Benefit: %s"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model_terms:ir.ui.view,arch_db:hr_benefit_payroll.view_premium_payments_filter
+msgid "Group By..."
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_benefit__id
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_benefit_policy__id
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_benefit_premium_payment__id
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_payslip__id
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_payslip_benefit__id
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_salary_rule__id
+msgid "ID"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_benefit____last_update
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_benefit_policy____last_update
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_benefit_premium_payment____last_update
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_payslip____last_update
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_payslip_benefit____last_update
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_salary_rule____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_benefit_premium_payment__write_uid
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_payslip_benefit__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_benefit_premium_payment__write_date
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_payslip_benefit__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_benefit__link2payroll
+msgid "Link to Payroll"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model_terms:ir.ui.view,arch_db:hr_benefit_payroll.view_premium_payments_filter
+msgid "My Payments"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_payslip_benefit__payslip_id
+msgid "Pay Slip"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_payslip_benefit__ppf
+msgid "Payroll Period Factor"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model:ir.model,name:hr_benefit_payroll.model_hr_payslip
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_benefit_premium_payment__payslip_id
+msgid "Payslip"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model_terms:ir.ui.view,arch_db:hr_benefit_payroll.view_hr_payslip_form
+msgid "Payslip Benefit Lines"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model:ir.model,name:hr_benefit_payroll.model_hr_payslip_benefit
+msgid "Payslip Benefits"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model:ir.model.fields.selection,name:hr_benefit_payroll.selection__hr_benefit_premium_payment__state__pending
+#: model_terms:ir.ui.view,arch_db:hr_benefit_payroll.view_premium_payments_form
+msgid "Pending"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: code:addons/hr_benefit_payroll/models/benefit_premium_payment.py:0
+#, python-format
+msgid ""
+"Permission DeniedYou may not delete a premium payment that is past the \"draft\" stage.\n"
+"Policy: %s\n"
+"Payment Date: %s"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_benefit_premium_payment__policy_id
+#: model_terms:ir.ui.view,arch_db:hr_benefit_payroll.view_premium_payments_filter
+msgid "Policy"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model_terms:ir.ui.view,arch_db:hr_benefit_payroll.view_premium_payments_form
+msgid "Premium Payment"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model:ir.actions.act_window,name:hr_benefit_payroll.open_premium_payments_view
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_benefit_policy__premium_payment_ids
+#: model:ir.ui.menu,name:hr_benefit_payroll.menu_premium_payments
+#: model_terms:ir.ui.view,arch_db:hr_benefit_payroll.view_benefits_policy_form
+#: model_terms:ir.ui.view,arch_db:hr_benefit_payroll.view_hr_payslip_form
+#: model_terms:ir.ui.view,arch_db:hr_benefit_payroll.view_premium_payments_tree
+msgid "Premium Payments"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_payslip_line__has_premium_payment
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_salary_rule__has_premium_payment
+msgid "Premium payment?"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model_terms:ir.ui.view,arch_db:hr_benefit_payroll.view_benefits_policy_form
+msgid "Premiums"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_payslip_benefit__qty
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model:ir.model,name:hr_benefit_payroll.model_hr_salary_rule
+msgid "Salary Rule"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model_terms:ir.ui.view,arch_db:hr_benefit_payroll.view_premium_payments_filter
+msgid "Search All Payments"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_payslip_benefit__sequence
+msgid "Sequence"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model:ir.model.fields,field_description:hr_benefit_payroll.field_hr_benefit_premium_payment__state
+msgid "State"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model:ir.model.fields,help:hr_benefit_payroll.field_hr_payslip_benefit__code
+msgid "The code used in the salary rules"
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model:ir.model.fields,help:hr_benefit_payroll.field_hr_payslip_benefit__qty
+msgid "The number of policies of this benefit that apply to this payslip."
+msgstr ""
+
+#. module: hr_benefit_payroll
+#: model:ir.model.fields,help:hr_benefit_payroll.field_hr_payslip_benefit__ppf
+msgid ""
+"The percentage of this benefit applied to the payslip. Directly related to "
+"the percentage of the contract that applies to the payslip."
+msgstr ""
diff --git a/hr_benefit_payroll/models/__init__.py b/hr_benefit_payroll/models/__init__.py
new file mode 100644
index 00000000..6a2f8619
--- /dev/null
+++ b/hr_benefit_payroll/models/__init__.py
@@ -0,0 +1,10 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013,2014 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import benefit
+from . import benefit_policy
+from . import benefit_premium_payment
+from . import hr_payslip
+from . import hr_payslip_benefits
+from . import hr_salary_rule
diff --git a/hr_benefit_payroll/models/benefit.py b/hr_benefit_payroll/models/benefit.py
new file mode 100644
index 00000000..3043671e
--- /dev/null
+++ b/hr_benefit_payroll/models/benefit.py
@@ -0,0 +1,12 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013,2014 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import fields, models
+
+
+class Benefit(models.Model):
+
+    _inherit = "hr.benefit"
+
+    link2payroll = fields.Boolean(string="Link to Payroll")
diff --git a/hr_benefit_payroll/models/benefit_policy.py b/hr_benefit_payroll/models/benefit_policy.py
new file mode 100644
index 00000000..700d2aef
--- /dev/null
+++ b/hr_benefit_payroll/models/benefit_policy.py
@@ -0,0 +1,73 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013,2014 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+import math
+
+from odoo import fields, models
+
+
+class BenefitPolicy(models.Model):
+
+    _inherit = "hr.benefit.policy"
+
+    premium_payment_ids = fields.One2many(
+        string="Premium Payments",
+        comodel_name="hr.benefit.premium.payment",
+        inverse_name="policy_id",
+        readonly=True,
+    )
+
+    def calculate_advantage(self, dE):
+
+        self.ensure_one()
+        adv_amount = 0
+        adv = self.benefit_id.get_latest_advantage(dE)
+        if self.advantage_override:
+            adv_amount = self.advantage_amount
+        elif adv:
+            if adv.type == "allowance":
+                adv_amount = adv.allowance_amount
+            elif adv.type == "loan":
+                adv_amount = adv.loan_amount
+        return adv_amount
+
+    def _get_paid_amount(self):
+
+        self.ensure_one()
+        res = 0
+        for payment in self.premium_payment_ids:
+            if payment.state not in ["draft", "cancel"]:
+                res += payment.amount
+        return res
+
+    def calculate_premium(self, dE, annual_pay_periods, refund=False):
+
+        self.ensure_one()
+        prm_amount = 0
+        prm = self.benefit_id.get_latest_premium(dE)
+        paid = self._get_paid_amount()
+        if refund:
+            payments = self.premium_payment_ids.filtered(
+                lambda r: r.date <= dE and r.state not in ["draft", "cancel"]
+            ).sorted("date")
+            prm_amount = len(payments) > 0 and payments[-1].amount or 0
+        elif self.premium_override:
+            total = self.premium_override_total
+            prm_amount = self.premium_override_amount
+            if total:
+                prm_amount = (
+                    (total - paid) > prm_amount and prm_amount or (total - paid)
+                )
+                if prm_amount < 0:
+                    prm_amount = 0
+        elif prm:
+            if prm.type == "annual":
+                prm_amount = math.floor(prm.amount / float(annual_pay_periods))
+            else:
+                prm_amount = math.floor(prm.amount / float(annual_pay_periods / 12))
+            if prm.total_amount and (prm.total_amount - paid) < prm_amount:
+                prm_amount = (
+                    (prm.total_amount - paid) > 0 and (prm.total_amount - paid) or 0
+                )
+        return prm_amount
diff --git a/hr_benefit_payroll/models/benefit_premium_payment.py b/hr_benefit_payroll/models/benefit_premium_payment.py
new file mode 100644
index 00000000..ec10c0e6
--- /dev/null
+++ b/hr_benefit_payroll/models/benefit_premium_payment.py
@@ -0,0 +1,102 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013,2014 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import _, fields, models
+from odoo.exceptions import UserError
+
+
+class PremiumPayment(models.Model):
+
+    _name = "hr.benefit.premium.payment"
+    _description = "Benefit premium payment"
+    _rec_name = "date"
+
+    def _compute_policy_id_domain(self):
+        policy_ids = self.env["hr.benefit.policy"].search(
+            [
+                ("employee_id", "in", self.mapped("employee_id").ids),
+            ]
+        )
+        policy_ids = policy_ids.filtered(lambda rec: rec.benefit_id.has_premium)
+        return [("id", "in", policy_ids.ids)]
+
+    date = fields.Date(required=True, default=fields.Date.today())
+    policy_id = fields.Many2one(
+        string="Policy",
+        comodel_name="hr.benefit.policy",
+        domain=_compute_policy_id_domain,
+        required=True,
+        readonly=True,
+        states={"draft": [("readonly", False)]},
+    )
+    employee_id = fields.Many2one(
+        string="Employee",
+        comodel_name="hr.employee",
+        required=True,
+        readonly=True,
+        states={"draft": [("readonly", False)]},
+    )
+    amount = fields.Float(
+        digits="Account",
+        required=True,
+        readonly=True,
+        states={"draft": [("readonly", False)]},
+    )
+    payslip_id = fields.Many2one(
+        string="Payslip", comodel_name="hr.payslip", ondelete="cascade"
+    )
+    state = fields.Selection(
+        selection=[
+            ("draft", "Draft"),
+            ("pending", "Pending"),
+            ("cancel", "Cancelled"),
+            ("done", "Done"),
+        ],
+        readonly=True,
+        default="draft",
+    )
+
+    def name_get(self):
+
+        res = []
+        for payment in self:
+            res.append(
+                (
+                    payment.id,
+                    "{} {} {}".format(
+                        payment.policy_id.name, payment.date, payment.amount
+                    ),
+                )
+            )
+
+        return res
+
+    def unlink(self):
+
+        for payment in self:
+            if payment.state != "draft" and not (
+                payment.env.context and payment.env.context.get("force_delete", False)
+            ):
+                raise UserError(
+                    _(
+                        "Permission Denied"
+                        'You may not delete a premium payment that is past the "draft" stage.'
+                        "\nPolicy: %s\nPayment Date: %s"
+                    )
+                    % (payment.policy_id.name, payment.date)
+                )
+
+        return super(PremiumPayment, self).unlink()
+
+    def state_pending(self):
+
+        return self.write({"state": "pending"})
+
+    def state_done(self):
+
+        return self.write({"state": "done"})
+
+    def state_cancel(self):
+
+        return self.write({"state": "cancel"})
diff --git a/hr_benefit_payroll/models/hr_payslip.py b/hr_benefit_payroll/models/hr_payslip.py
new file mode 100644
index 00000000..ed2909c4
--- /dev/null
+++ b/hr_benefit_payroll/models/hr_payslip.py
@@ -0,0 +1,261 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013,2014 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import timedelta
+
+from odoo import _, api, fields, models
+from odoo.exceptions import UserError
+
+from odoo.addons.payroll.models.hr_payslip import BaseBrowsableObject
+
+
+class HrPayslip(models.Model):
+
+    _inherit = "hr.payslip"
+
+    benefit_line_ids = fields.One2many(
+        string="Benefits", comodel_name="hr.payslip.benefit", inverse_name="payslip_id"
+    )
+    premium_payment_ids = fields.One2many(
+        string="Benefit Premium Payments",
+        comodel_name="hr.benefit.premium.payment",
+        inverse_name="payslip_id",
+    )
+
+    @api.onchange("date_from", "date_to")
+    def onchange_dates(self):
+        super().onchange_dates()
+        for rec in self:
+            if not rec.date_from or not rec.date_to:
+                continue
+            rec.benefit_line_ids.unlink()
+            benefit_lines_dict = rec.get_benefit_lines(
+                rec._get_employee_contracts(), rec.date_from, rec.date_to
+            )
+            write_vals = [(0, 0, v) for _k, v in benefit_lines_dict.items()]
+            rec.write({"benefit_line_ids": write_vals})
+
+    def get_payslip_vals(
+        self, date_from, date_to, employee_id=False, contract_id=False, struct_id=False
+    ):
+        res = super().get_payslip_vals(
+            date_from, date_to, employee_id, contract_id, struct_id
+        )
+
+        # Delete old lines
+        res["value"].update(
+            {"benefit_line_ids": [(2, x) for x in self.benefit_line_ids.ids]}
+        )
+
+        # Get benefit lines
+        contracts = self._get_employee_contracts()
+        benefit_lines = self.get_benefit_lines(contracts, date_from, date_to)
+        res["value"].update(
+            {
+                "benefit_line_ids": benefit_lines,
+            }
+        )
+        return res
+
+    @api.model
+    def get_benefit_lines(self, contracts, date_from, date_to, credit_note=False):
+
+        res = {}
+        if not contracts:
+            return res
+        employee = contracts[0].employee_id
+
+        # Search policies for those employees that are linked to payroll
+        policy_ids = self.env["hr.benefit.policy"].search(
+            [
+                ("employee_id", "=", employee.id),
+                ("benefit_id.link2payroll", "=", True),
+                ("start_date", "<=", date_to),
+                "|",
+                ("end_date", "=", False),
+                ("end_date", ">=", date_from),
+            ]
+        )
+        benefit_ids = policy_ids.mapped("benefit_id")
+        for bd in benefit_ids:
+            res.update(
+                {
+                    bd.code: {
+                        "code": bd.code,
+                        "name": bd.name,
+                        "qty": 0,
+                        "ppf": 0,
+                        "earnings": 0,
+                        "deductions": 0,
+                    }
+                }
+            )
+
+        # One dict per benefit
+        #
+        dSlipStart = date_from
+        dSlipEnd = date_to
+        d = dSlipStart
+        deltaSlip = 0
+        while d <= dSlipEnd:
+            deltaSlip += 1
+            d += timedelta(days=+1)
+
+        # Test for installation of payroll_period
+        if hasattr(contracts[0], "annual_pay_periods"):
+            app = contracts[0].annual_pay_periods
+        else:
+            app = 12
+
+        for policy in policy_ids:
+
+            # Calculate partial period factor relative to the policy
+            dPolStart = policy.start_date
+            dPolEnd = dSlipEnd
+            if policy.end_date:
+                dPolEnd = policy.end_date
+            dS = (dPolStart > dSlipStart) and dPolStart or dSlipStart
+            dE = (dPolEnd < dSlipEnd) and dPolEnd or dSlipEnd
+
+            if (dPolEnd <= dSlipStart) or (dPolStart >= dSlipEnd):
+                continue
+
+            d = dS
+            deltaPol = 0
+            while d <= dE:
+                deltaPol += 1
+                d += timedelta(days=+1)
+
+            # Calculate advantage
+            #
+            adv_amount = policy.calculate_advantage(dE)
+
+            # Calculate premium
+            #
+            prm_amount = policy.calculate_premium(dE, app, refund=credit_note)
+
+            res[policy.benefit_id.code]["qty"] += 1
+            res[policy.benefit_id.code]["ppf"] += float(deltaPol) / float(deltaSlip)
+            res[policy.benefit_id.code]["earnings"] += adv_amount
+            res[policy.benefit_id.code]["deductions"] += prm_amount
+
+        return res
+
+    def action_payslip_done(self):
+        res = super().action_payslip_done()
+
+        for payslip in self:
+            policy_ids = self.env["hr.benefit.policy"].search(
+                [
+                    ("employee_id", "=", payslip.employee_id.id),
+                    ("benefit_id.link2payroll", "=", True),
+                    ("start_date", "<=", payslip.date_to),
+                    "|",
+                    ("end_date", "=", False),
+                    ("end_date", ">=", payslip.date_from),
+                ]
+            )
+            benefits = {}
+            for p in policy_ids:
+                benefits.update(
+                    {p.name: {"id": p.benefit_id.id, "amount": p.premium_amount}}
+                )
+            payslip.record_benefit_premium_payments(benefits)
+            payslip.finalize_benefit_premium_payments()
+
+        return res
+
+    def record_benefit_premium_payments(self, benefits):
+
+        policy_obj = self.env["hr.benefit.policy"]
+        premium_obj = self.env["hr.benefit.premium.payment"]
+        for payslip in self:
+            for k, v in benefits.items():
+                pol_ids = policy_obj.search(
+                    [
+                        ("employee_id", "=", payslip.employee_id.id),
+                        ("benefit_id", "=", v["id"]),
+                    ]
+                )
+                if len(pol_ids) == 0:
+                    UserError(
+                        _(
+                            "Error creating benefit premium payment records!"
+                            "Unable to find a valid benefit policy:\nEmployee: %s\nBenefit: %s"
+                        )
+                        % (payslip.employee_id.name, k)
+                    )
+
+                premium_obj.create(
+                    {
+                        "payslip_id": payslip.id,
+                        "date": payslip.date_to,
+                        "employee_id": payslip.employee_id.id,
+                        "policy_id": pol_ids[0].id,
+                        "amount": payslip.credit_note and -v["amount"] or v["amount"],
+                    }
+                )
+        return
+
+    def remove_benefit_premium_payments(self):
+
+        pay_obj = self.env["hr.benefit.premium.payment"]
+        pay_ids = pay_obj.search([("payslip_id", "in", self.ids)])
+        pay_ids.unlink()
+
+        return
+
+    def finalize_benefit_premium_payments(self):
+
+        payments = self.mapped("premium_payment_ids")
+        payments.state_done()
+
+    def refund_sheet(self):
+
+        res = super(HrPayslip, self).refund_sheet()
+        payments = self.mapped("premium_payment_ids")
+        if payments:
+            payments.state_cancel()
+
+        return res
+
+    def get_benefits_dictionary(self, contracts):
+        """
+        @return: returns a dictionary dic:
+            * hr_benefit.<CODE>.qty        - the number policies for this benefit
+            * hr_benefit.<CODE>.ppf        - the ppf of policy with respect to payslip
+            * hr_benefit.<CODE>.deductions - the amount to deduct or 0
+            * hr_benefit.<CODE>.earnings   - the earning amount or 0
+        """
+
+        self.ensure_one()
+        res = {}
+
+        for line in self.benefit_line_ids:
+            res.update(
+                {
+                    line.code: BaseBrowsableObject(
+                        {
+                            "qty": line.qty,
+                            "ppf": line.ppf,
+                            "deductions": line.deductions,
+                            "earnings": line.earnings,
+                        }
+                    )
+                }
+            )
+
+        return res
+
+    def _get_baselocaldict(self, contracts):
+
+        res = super()._get_baselocaldict(contracts)
+        res.update(
+            {
+                "hr_benefit": BaseBrowsableObject(
+                    self.get_benefits_dictionary(contracts)
+                ),
+            }
+        )
+        return res
diff --git a/hr_benefit_payroll/models/hr_payslip_benefits.py b/hr_benefit_payroll/models/hr_payslip_benefits.py
new file mode 100644
index 00000000..620eb5ad
--- /dev/null
+++ b/hr_benefit_payroll/models/hr_payslip_benefits.py
@@ -0,0 +1,28 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import fields, models
+
+
+class HrPayslipWorkedDays(models.Model):
+    _name = "hr.payslip.benefit"
+    _description = "Payslip Benefits"
+    _order = "payslip_id, sequence"
+
+    name = fields.Char(string="Description", required=True)
+    payslip_id = fields.Many2one(
+        "hr.payslip", "Pay Slip", required=True, ondelete="cascade", index=True
+    )
+    code = fields.Char(required=True, help="The code used in the salary rules")
+    sequence = fields.Integer(required=True, index=True, default=10)
+    qty = fields.Integer(
+        "Quantity",
+        help="The number of policies of this benefit that apply to this payslip.",
+    )
+    ppf = fields.Float(
+        "Payroll Period Factor",
+        help="The percentage of this benefit applied to the payslip. Directly "
+        "related to the percentage of the contract that applies to the payslip.",
+    )
+    earnings = fields.Float()
+    deductions = fields.Float()
diff --git a/hr_benefit_payroll/models/hr_salary_rule.py b/hr_benefit_payroll/models/hr_salary_rule.py
new file mode 100644
index 00000000..884d94dc
--- /dev/null
+++ b/hr_benefit_payroll/models/hr_salary_rule.py
@@ -0,0 +1,13 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013,2014 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import fields, models
+
+
+class HrSalaryRule(models.Model):
+
+    _inherit = "hr.salary.rule"
+
+    benefit_id = fields.Many2one(string="Benefit", comodel_name="hr.benefit")
+    has_premium_payment = fields.Boolean(string="Premium payment?")
diff --git a/hr_benefit_payroll/readme/CREDITS.rst b/hr_benefit_payroll/readme/CREDITS.rst
new file mode 100644
index 00000000..d264bc7e
--- /dev/null
+++ b/hr_benefit_payroll/readme/CREDITS.rst
@@ -0,0 +1 @@
+* Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/hr_benefit_payroll/readme/DESCRIPTION.rst b/hr_benefit_payroll/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..2f84b8c4
--- /dev/null
+++ b/hr_benefit_payroll/readme/DESCRIPTION.rst
@@ -0,0 +1,13 @@
+Apply Employee Benefits to Payroll
+==================================
+* Benefits can be linked to payroll
+    * Choose the 'Allowance' type for earnings
+    * Choose the 'Deduction' type for premiums
+    * Use Salary Rules to integrate them in to Payroll Structures
+    * Information about the benefits are available to Salary Rules in a top-level 'benefits' object
+        - Example: result = hr_benefit.<CODE>.deductions
+    * The available fields are:
+        - qty: the number of policies of this type found
+        - earnings: the money to add
+        - deductions: the money to deduct
+        - ppf (Percentage Payroll Factor): 1 if the policy was active for the entire payroll period; less than 1 if it was active only for a fraction of the payroll period
diff --git a/hr_benefit_payroll/readme/HISTORY.rst b/hr_benefit_payroll/readme/HISTORY.rst
new file mode 100644
index 00000000..fdac68cc
--- /dev/null
+++ b/hr_benefit_payroll/readme/HISTORY.rst
@@ -0,0 +1,9 @@
+14.0.1.2.1 (2022-08-17)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* [FIX] Catch up to changes in OCA/Payroll. Update your salary rules to take into account the dictionary naming changes.
+
+14.0.1.0.1 (2022-08-09)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* [FIX] Slightly off PPF calculation of benefit policy when the payslip period lengths don't equal the policy period lengths.
diff --git a/hr_benefit_payroll/security/ir.model.access.csv b/hr_benefit_payroll/security/ir.model.access.csv
new file mode 100644
index 00000000..e38e6d07
--- /dev/null
+++ b/hr_benefit_payroll/security/ir.model.access.csv
@@ -0,0 +1,10 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_benefit_pu,access_hr_benefit,hr_benefit.model_hr_benefit,payroll.group_payroll_user,1,0,0,0
+access_hr_benefit_policy_pu,access_hr_benefit_policy,hr_benefit.model_hr_benefit_policy,payroll.group_payroll_user,1,0,0,0
+access_hr_benefit_premium_pu,access_hr_benefit_policy_premium,hr_benefit.model_hr_benefit_premium,payroll.group_payroll_user,1,0,0,0
+access_hr_benefit_premium_payment_all,access_hr_benefit_policy_premium_payment,model_hr_benefit_premium_payment,base.group_user,1,0,0,0
+access_hr_benefit_premium_payment_user,access_hr_benefit_policy_premium_payment,model_hr_benefit_premium_payment,hr.group_hr_user,1,0,0,0
+access_hr_benefit_premium_payment_pm,access_hr_benefit_policy_premium_payment,model_hr_benefit_premium_payment,payroll.group_payroll_user,1,1,1,1
+access_hr_benefit_claim_pu,access_hr_benefit_claim,hr_benefit.model_hr_benefit_claim,payroll.group_payroll_user,1,0,0,0
+access_hr_benefit_adv_pu,access_hr_benefit_policy_adv,hr_benefit.model_hr_benefit_advantage,payroll.group_payroll_user,1,0,0,0
+access_hr_payslip_benefit_user,access_hr_payslip_benefit,hr_benefit_payroll.model_hr_payslip_benefit,payroll.group_payroll_user,1,1,1,1
diff --git a/hr_benefit_payroll/security/security.xml b/hr_benefit_payroll/security/security.xml
new file mode 100644
index 00000000..fad085e2
--- /dev/null
+++ b/hr_benefit_payroll/security/security.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data noupdate="1">
+
+        <record id="hr_benefit_premium_payment_rule_own" model="ir.rule">
+            <field name="name">Benefit Premium Payment: Own and Subordinates</field>
+            <field name="model_id" ref="model_hr_benefit_policy" />
+            <field name="domain_force">
+                ['|',('employee_id.user_id', '=', user.id),
+                ('employee_id.department_id.manager_id.user_id', '=', user.id)]
+            </field>
+            <field name="groups" eval="[(4, ref('base.group_user'))]" />
+        </record>
+
+        <record id="hr_benefit_premium_payment_rule_officer" model="ir.rule">
+            <field name="name">Benefit Policy: Payroll Officer can see all</field>
+            <field name="model_id" ref="model_hr_benefit_policy" />
+            <field name="perm_write" eval="False" />
+            <field name="perm_create" eval="False" />
+            <field name="perm_unlink" eval="False" />
+            <field name="domain_force">[(1, '=', 1)]</field>
+            <field name="groups" eval="[(4, ref('payroll.group_payroll_user'))]" />
+        </record>
+
+    </data>
+</odoo>
diff --git a/hr_benefit_payroll/static/description/icon.png b/hr_benefit_payroll/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/hr_benefit_payroll/static/description/icon.png differ
diff --git a/hr_benefit_payroll/static/description/index.html b/hr_benefit_payroll/static/description/index.html
new file mode 100644
index 00000000..775e82fc
--- /dev/null
+++ b/hr_benefit_payroll/static/description/index.html
@@ -0,0 +1,454 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Benefits Payroll</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="benefits-payroll">
+<h1 class="title">Benefits Payroll</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:284204823bfbe256db00a02ca5635fb5ce22d4c9852bcb61cd9e2491875d03d7
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/hr_benefit_payroll"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<div class="section" id="apply-employee-benefits-to-payroll">
+<h1>Apply Employee Benefits to Payroll</h1>
+<ul class="simple">
+<li><dl class="first docutils">
+<dt>Benefits can be linked to payroll</dt>
+<dd><ul class="first last">
+<li>Choose the ‘Allowance’ type for earnings</li>
+<li>Choose the ‘Deduction’ type for premiums</li>
+<li>Use Salary Rules to integrate them in to Payroll Structures</li>
+<li><dl class="first docutils">
+<dt>Information about the benefits are available to Salary Rules in a top-level ‘benefits’ object</dt>
+<dd><ul class="first last">
+<li>Example: result = hr_benefit.&lt;CODE&gt;.deductions</li>
+</ul>
+</dd>
+</dl>
+</li>
+<li><dl class="first docutils">
+<dt>The available fields are:</dt>
+<dd><ul class="first last">
+<li>qty: the number of policies of this type found</li>
+<li>earnings: the money to add</li>
+<li>deductions: the money to deduct</li>
+<li>ppf (Percentage Payroll Factor): 1 if the policy was active for the entire payroll period; less than 1 if it was active only for a fraction of the payroll period</li>
+</ul>
+</dd>
+</dl>
+</li>
+</ul>
+</dd>
+</dl>
+</li>
+</ul>
+<p><strong>Table of contents</strong></p>
+</div>
+<div class="section" id="changelog">
+<h1>Changelog</h1>
+<div class="section" id="section-1">
+<h2>14.0.1.2.1 (2022-08-17)</h2>
+<ul class="simple">
+<li>[FIX] Catch up to changes in OCA/Payroll. Update your salary rules to take into account the dictionary naming changes.</li>
+</ul>
+</div>
+<div class="section" id="section-2">
+<h2>14.0.1.0.1 (2022-08-09)</h2>
+<ul class="simple">
+<li>[FIX] Slightly off PPF calculation of benefit policy when the payslip period lengths don’t equal the policy period lengths.</li>
+</ul>
+</div>
+</div>
+<div class="section" id="bug-tracker">
+<h1>Bug Tracker</h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20hr_benefit_payroll%0Aversion:%2014.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>Credits</h1>
+<div class="section" id="authors">
+<h2>Authors</h2>
+<ul class="simple">
+<li>TREVI Software</li>
+<li>Michael Telahun Makonnen</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2>Other credits</h2>
+<ul class="simple">
+<li>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2>Maintainers</h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/hr_benefit_payroll">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/hr_benefit_payroll/tests/__init__.py b/hr_benefit_payroll/tests/__init__.py
new file mode 100644
index 00000000..9655609b
--- /dev/null
+++ b/hr_benefit_payroll/tests/__init__.py
@@ -0,0 +1,7 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import test_benefit_access
+from . import test_benefit_policy
+from . import test_benefit_premium_payment
+from . import test_hr_payslip
diff --git a/hr_benefit_payroll/tests/test_benefit_access.py b/hr_benefit_payroll/tests/test_benefit_access.py
new file mode 100644
index 00000000..39f044cf
--- /dev/null
+++ b/hr_benefit_payroll/tests/test_benefit_access.py
@@ -0,0 +1,97 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import date
+
+from odoo.tests import new_test_user
+
+from odoo.addons.hr_benefit.tests import common as benefit_common
+
+
+class TestBenefit(benefit_common.TestBenefitCommon):
+    @classmethod
+    def setUpClass(cls):
+        super(TestBenefit, cls).setUpClass()
+
+        cls.PremiumPayment = cls.env["hr.benefit.premium.payment"]
+        # Payroll Manager user
+        cls.userPM = new_test_user(
+            cls.env,
+            login="pm",
+            groups="base.group_user,payroll.group_payroll_manager",
+            name="Payroll manager",
+        )
+        # Payroll user
+        cls.userPU = new_test_user(
+            cls.env,
+            login="pu",
+            groups="base.group_user,payroll.group_payroll_user",
+            name="Payroll manager",
+        )
+
+    def test_policy_access(self):
+        """
+        hr.benefit.policy access: Payroll Mgr - read-only, Payroll User read-only
+        """
+
+        bn1 = self.create_benefit(self.benefit_create_vals)
+        bn2 = self.create_benefit(
+            {
+                "name": "BenefitB",
+                "code": "B",
+                "multi_policy": True,
+            }
+        )
+        pol = self.create_policy(self.eeJohn, bn1, date.today())
+
+        # Mgr
+        # Succeeds because of payroll user rights
+        self.create_succeeds(
+            self.userPM,
+            self.Policy,
+            {
+                "name": "tbp",
+                "employee_id": self.eeJohn.id,
+                "benefit_id": bn2.id,
+                "start_date": date.today(),
+            },
+        )
+        self.unlink_fails(self.userPM, pol)
+        self.read_succeeds(self.userPM, self.Policy, pol.id)
+        self.write_succeeds(self.userPM, self.Policy, pol.id, {"name": "tbp2"})
+
+        # User
+        # addons/payroll where payroll officer is created implies group: HR Officer
+        self.create_succeeds(
+            self.userPU,
+            self.Policy,
+            {
+                "name": "tbp",
+                "employee_id": self.eeJohn.id,
+                "benefit_id": bn2.id,
+                "start_date": date.today(),
+            },
+        )
+        self.unlink_fails(self.userPU, pol)
+        self.read_succeeds(self.userPU, self.Policy, pol.id)
+        self.write_succeeds(self.userPU, self.Policy, pol.id, {"name": "tbp2"})
+
+    def test_policy_user_own(self):
+        """A user can only read his/her own policies"""
+
+        bn1 = self.create_benefit(self.benefit_create_vals)
+        polJohn = self.create_policy(self.eeJohn, bn1, date.today())
+        polPaul = self.create_policy(self.eePaul, bn1, date.today())
+        grpOfficer = self.env.ref("hr.group_hr_user")
+        self.assertNotIn(grpOfficer, self.userJohn.groups_id)
+        self.assertNotEqual(polJohn, polPaul)
+        self.assertEqual(self.userJohn, polJohn.employee_id.user_id)
+        self.assertEqual(self.userPaul, polPaul.employee_id.user_id)
+
+        # John can read his own policy
+        self.read_succeeds(self.userJohn, self.Policy, polJohn.id)
+        # but not Paul's
+        self.read_fails(self.userJohn, self.Policy, polPaul.id)
+        # John can't modify his own policy or Paul's
+        self.write_fails(self.userJohn, self.Policy, polJohn.id, {"note": "A"})
+        self.write_fails(self.userJohn, self.Policy, polPaul.id, {"note": "A"})
diff --git a/hr_benefit_payroll/tests/test_benefit_policy.py b/hr_benefit_payroll/tests/test_benefit_policy.py
new file mode 100644
index 00000000..76ac7cb5
--- /dev/null
+++ b/hr_benefit_payroll/tests/test_benefit_policy.py
@@ -0,0 +1,253 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import date
+
+from dateutil.relativedelta import relativedelta
+
+from odoo.addons.hr_benefit.tests import common as benefit_common
+
+
+class TestBenefit(benefit_common.TestBenefitCommon):
+    @classmethod
+    def setUpClass(cls):
+        super(TestBenefit, cls).setUpClass()
+
+        cls.PremiumPayment = cls.env["hr.benefit.premium.payment"]
+
+    def test_benefit_policy_allowance_default_amount(self):
+
+        today = date.today()
+        bn = self.create_benefit(self.benefit_create_vals)
+        self.create_earning(bn, start=today, allowance=1000)
+        pol = self.create_policy(self.eeJohn, bn, start=today)
+        pol.state_open()
+
+        self.assertEqual(
+            pol.calculate_advantage(today),
+            1000,
+            "Calculated advantage must be benefit amount.",
+        )
+
+    def test_benefit_policy_allowance_override_amount(self):
+
+        today = date.today()
+        bn = self.create_benefit(self.benefit_create_vals)
+        self.create_earning(bn, start=today, allowance=1000)
+        pol = self.create_policy(self.eeJohn, bn, start=today, advantage=4400)
+        pol.state_open()
+
+        self.assertEqual(
+            pol.calculate_advantage(today),
+            4400,
+            "Calculated advantage must be override amount from policy.",
+        )
+
+    def test_benefit_policy_loan_amount(self):
+
+        today = date.today()
+        bn = self.create_benefit(self.benefit_create_vals)
+        self.create_earning(bn, start=today, ptype="loan", loan=15000)
+        pol = self.create_policy(self.eeJohn, bn, start=today)
+        pol.state_open()
+
+        self.assertEqual(
+            pol.calculate_advantage(today),
+            15000,
+            "Calculated loan amount must match amount from earning creation.",
+        )
+
+    def test_benefit_policy_first_premium(self):
+
+        bn = self.create_benefit(self.benefit_create_vals)
+        self.create_premium(
+            bn,
+            date.today() - relativedelta(days=1),
+            ptype="monthly",
+            amount=100,
+            total=300,
+        )
+        pol = self.create_policy(self.eeJohn, bn, date.today())
+
+        self.assertEqual(
+            100,
+            pol.calculate_premium(date.today(), 12),
+            "Initial premium amount and calculated premium should match",
+        )
+
+    def test_benefit_policy_last_premium(self):
+
+        today = date.today()
+        policy_start = today - relativedelta(days=4)
+        dtPayment1 = today - relativedelta(days=3)
+        dtPayment2 = today - relativedelta(days=2)
+        dtPayment3 = today - relativedelta(days=1)
+        bn = self.create_benefit(self.benefit_create_vals)
+        self.create_premium(
+            bn,
+            date.today() - relativedelta(days=3),
+            ptype="monthly",
+            amount=100,
+            total=340,
+        )
+        pol = self.create_policy(self.eeJohn, bn, policy_start)
+        # Make first 3 payments (with one additional cancelled payment)
+        self.PremiumPayment.create(
+            {
+                "employee_id": self.eeJohn.id,
+                "policy_id": pol.id,
+                "amount": pol.calculate_premium(dtPayment1, 12),
+                "date": dtPayment1,
+            }
+        ).state_cancel()
+        self.PremiumPayment.create(
+            {
+                "employee_id": self.eeJohn.id,
+                "policy_id": pol.id,
+                "amount": pol.calculate_premium(dtPayment1, 12),
+                "date": dtPayment1,
+            }
+        ).state_done()
+        self.PremiumPayment.create(
+            {
+                "employee_id": self.eeJohn.id,
+                "policy_id": pol.id,
+                "amount": pol.calculate_premium(dtPayment2, 12),
+                "date": dtPayment2,
+            }
+        ).state_done()
+        self.PremiumPayment.create(
+            {
+                "employee_id": self.eeJohn.id,
+                "policy_id": pol.id,
+                "amount": pol.calculate_premium(dtPayment3, 12),
+                "date": dtPayment3,
+            }
+        ).state_done()
+
+        self.assertEqual(
+            len(pol.premium_payment_ids),
+            4,
+            "There should be 4 payments (including the cancelled one)",
+        )
+        self.assertEqual(
+            40,
+            pol.calculate_premium(today, 12),
+            "The last payment must be the residual amount after previous payments",
+        )
+
+    def test_benefit_policy_premium_override(self):
+
+        today = date.today()
+        policy_start = today - relativedelta(days=4)
+        dtPayment1 = today - relativedelta(days=3)
+        bn = self.create_benefit(self.benefit_create_vals)
+        self.create_premium(
+            bn,
+            date.today() - relativedelta(days=3),
+            ptype="monthly",
+            amount=100,
+            total=340,
+        )
+        pol = self.create_policy(
+            self.eeJohn, bn, policy_start, premium=200, premium_total=340
+        )
+        # Make first 1 payments (with one additional payment in 'draft')
+        self.PremiumPayment.create(
+            {
+                "employee_id": self.eeJohn.id,
+                "policy_id": pol.id,
+                "amount": pol.calculate_premium(dtPayment1, 12),
+                "date": dtPayment1,
+            }
+        )
+        self.PremiumPayment.create(
+            {
+                "employee_id": self.eeJohn.id,
+                "policy_id": pol.id,
+                "amount": pol.calculate_premium(dtPayment1, 12),
+                "date": dtPayment1,
+            }
+        ).state_done()
+
+        self.assertEqual(
+            len(pol.premium_payment_ids),
+            2,
+            "There should be 2 payments (including the 'draft' one)",
+        )
+        self.assertEqual(
+            140,
+            pol.calculate_premium(today, 12),
+            "The last payment must be the residual amount after previous payments",
+        )
+
+    def test_benefit_policy_premium_refund(self):
+
+        today = date.today()
+        policy_start = today - relativedelta(days=4)
+        dtPayment1 = today - relativedelta(days=3)
+        dtPayment2 = today - relativedelta(days=2)
+        dtPayment3 = today - relativedelta(days=1)
+        bn = self.create_benefit(self.benefit_create_vals)
+        self.create_premium(
+            bn,
+            policy_start,
+            ptype="monthly",
+            amount=100,
+            total=340,
+        )
+        pol = self.create_policy(self.eeJohn, bn, policy_start)
+
+        # Try to refund cancelled payment
+        self.PremiumPayment.create(
+            {
+                "employee_id": self.eeJohn.id,
+                "policy_id": pol.id,
+                "amount": pol.calculate_premium(dtPayment1, 12),
+                "date": dtPayment1,
+            }
+        ).state_cancel()
+        self.assertEqual(
+            0,
+            pol.calculate_premium(today, 12, refund=True),
+            "A Cancelled payment should not be refunded",
+        )
+
+        # Make all payments and try to refund last residual payment
+        self.PremiumPayment.create(
+            {
+                "employee_id": self.eeJohn.id,
+                "policy_id": pol.id,
+                "amount": pol.calculate_premium(dtPayment1, 12),
+                "date": dtPayment1,
+            }
+        ).state_done()
+        self.PremiumPayment.create(
+            {
+                "employee_id": self.eeJohn.id,
+                "policy_id": pol.id,
+                "amount": pol.calculate_premium(dtPayment2, 12),
+                "date": dtPayment2,
+            }
+        ).state_done()
+        self.PremiumPayment.create(
+            {
+                "employee_id": self.eeJohn.id,
+                "policy_id": pol.id,
+                "amount": pol.calculate_premium(dtPayment3, 12),
+                "date": dtPayment3,
+            }
+        ).state_done()
+        self.PremiumPayment.create(
+            {
+                "employee_id": self.eeJohn.id,
+                "policy_id": pol.id,
+                "amount": pol.calculate_premium(dtPayment3, 12),
+                "date": today,
+            }
+        ).state_done()
+        self.assertEqual(
+            40,
+            pol.calculate_premium(today, 12, refund=True),
+            "The premium to be refunded must be the last payment made",
+        )
diff --git a/hr_benefit_payroll/tests/test_benefit_premium_payment.py b/hr_benefit_payroll/tests/test_benefit_premium_payment.py
new file mode 100644
index 00000000..026b0d08
--- /dev/null
+++ b/hr_benefit_payroll/tests/test_benefit_premium_payment.py
@@ -0,0 +1,179 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo.exceptions import UserError
+from odoo.tests import new_test_user
+
+from odoo.addons.hr_benefit.tests import common as benefit_common
+
+
+class TestBenefit(benefit_common.TestBenefitCommon):
+    @classmethod
+    def setUpClass(cls):
+        super(TestBenefit, cls).setUpClass()
+
+        cls.PremiumPayment = cls.env["hr.benefit.premium.payment"]
+        # Payroll Manager user
+        cls.userPM = new_test_user(
+            cls.env,
+            login="pm",
+            groups="base.group_user,payroll.group_payroll_manager",
+            name="Payroll manager",
+        )
+        # Payroll user
+        cls.userPU = new_test_user(
+            cls.env,
+            login="pu",
+            groups="base.group_user,payroll.group_payroll_user",
+            name="Payroll manager",
+        )
+
+    def test_premium_payment_initial_state(self):
+        benefit = self.create_benefit(self.benefit_create_vals)
+        policy = self.create_policy(self.eeJohn, benefit)
+        pp = self.PremiumPayment.create(
+            {
+                "employee_id": self.eeJohn.id,
+                "policy_id": policy.id,
+                "amount": 100.00,
+            }
+        )
+        self.assertEqual(pp.state, "draft", "Initial state must be 'draft'")
+
+    def test_premium_payment_domain_policy_id(self):
+        benefit = self.create_benefit(self.benefit_create_vals)
+        self.create_premium(benefit, amount=100.00)
+        self.create_policy(self.eePaul, benefit)
+        policy = self.create_policy(self.eeJohn, benefit)
+        pp = self.PremiumPayment.create(
+            {
+                "employee_id": self.eeJohn.id,
+                "policy_id": policy.id,
+                "amount": 100.00,
+            }
+        )
+
+        domain = (
+            self.env["hr.benefit.premium.payment"]
+            ._fields["policy_id"]
+            .get_domain_list(pp)
+        )
+        domain_list = self.Policy.search(domain)
+        self.assertEqual(
+            len(domain_list),
+            1,
+            "Only the policy for 'John' should be in the list of policies",
+        )
+        self.assertIn(
+            policy,
+            domain_list,
+            "The policy for 'John' should be in the list of policies",
+        )
+
+    def test_premium_payment_unlink(self):
+        benefit = self.create_benefit(self.benefit_create_vals)
+        benefit.multi_policy = True
+        self.create_premium(benefit, amount=100.00)
+        polDraft = self.create_policy(self.eeJohn, benefit)
+        polPending = self.create_policy(self.eeJohn, benefit)
+        polCancel = self.create_policy(self.eeJohn, benefit)
+        polDone = self.create_policy(self.eeJohn, benefit)
+        ppDraft = self.PremiumPayment.create(
+            {
+                "employee_id": self.eeJohn.id,
+                "policy_id": polDraft.id,
+                "amount": 100.00,
+            }
+        )
+        ppPending = self.PremiumPayment.create(
+            {
+                "employee_id": self.eeJohn.id,
+                "policy_id": polPending.id,
+                "amount": 100.00,
+            }
+        )
+        ppPending.state_pending()
+        ppCancel = self.PremiumPayment.create(
+            {
+                "employee_id": self.eeJohn.id,
+                "policy_id": polCancel.id,
+                "amount": 100.00,
+            }
+        )
+        ppCancel.state_cancel()
+        ppDone = self.PremiumPayment.create(
+            {
+                "employee_id": self.eeJohn.id,
+                "policy_id": polDone.id,
+                "amount": 100.00,
+            }
+        )
+        ppDone.state_done()
+
+        self.assertEqual(ppDraft.state, "draft")
+        try:
+            ppDraft.unlink()
+        except UserError:
+            self.fail("Unexpected UserError exception!")
+
+        self.assertEqual(ppPending.state, "pending")
+        with self.assertRaises(UserError):
+            ppPending.unlink()
+
+        self.assertEqual(ppCancel.state, "cancel")
+        with self.assertRaises(UserError):
+            ppCancel.unlink()
+
+        self.assertEqual(ppDone.state, "done")
+        with self.assertRaises(UserError):
+            ppDone.unlink()
+
+    def test_premium_payment_unlink_force_delete(self):
+        benefit = self.create_benefit(self.benefit_create_vals)
+        benefit.multi_policy = True
+        self.create_premium(benefit, amount=100.00)
+        polPending = self.create_policy(self.eeJohn, benefit)
+        polCancel = self.create_policy(self.eeJohn, benefit)
+        polDone = self.create_policy(self.eeJohn, benefit)
+        ppPending = self.PremiumPayment.create(
+            {
+                "employee_id": self.eeJohn.id,
+                "policy_id": polPending.id,
+                "amount": 100.00,
+            }
+        )
+        ppPending.state_pending()
+        ppCancel = self.PremiumPayment.create(
+            {
+                "employee_id": self.eeJohn.id,
+                "policy_id": polCancel.id,
+                "amount": 100.00,
+            }
+        )
+        ppCancel.state_cancel()
+        ppDone = self.PremiumPayment.create(
+            {
+                "employee_id": self.eeJohn.id,
+                "policy_id": polDone.id,
+                "amount": 100.00,
+            }
+        )
+        ppDone.state_done()
+
+        self.assertEqual(ppPending.state, "pending")
+        try:
+            ppPending.with_context(force_delete=True).unlink()
+        except UserError:
+            self.fail("Unexpected UserError exception!")
+
+        self.assertEqual(ppCancel.state, "cancel")
+        try:
+            ppCancel.with_context(force_delete=True).unlink()
+        except UserError:
+            self.fail("Unexpected UserError exception!")
+
+        self.assertEqual(ppDone.state, "done")
+        try:
+            ppDone.with_context(force_delete=True).unlink()
+        except UserError:
+            self.fail("Unexpected UserError exception!")
diff --git a/hr_benefit_payroll/tests/test_hr_payslip.py b/hr_benefit_payroll/tests/test_hr_payslip.py
new file mode 100644
index 00000000..c521d150
--- /dev/null
+++ b/hr_benefit_payroll/tests/test_hr_payslip.py
@@ -0,0 +1,380 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import date, timedelta
+
+from odoo import fields
+from odoo.tests.common import Form
+
+from odoo.addons.hr_benefit.tests import common as benefit_common
+
+
+class TestBenefit(benefit_common.TestBenefitCommon):
+    @classmethod
+    def setUpClass(cls):
+        super(TestBenefit, cls).setUpClass()
+
+        cls.Payslip = cls.env["hr.payslip"]
+        cls.PayrollStructure = cls.env["hr.payroll.structure"]
+        cls.SalaryRule = cls.env["hr.salary.rule"]
+        cls.SalaryRuleCateg = cls.env["hr.salary.rule.category"]
+
+        cls.categ_basic = cls.SalaryRuleCateg.create(
+            {
+                "name": "Basic",
+                "code": "BASIC",
+            }
+        )
+
+        cls.rule_basic = cls.SalaryRule.create(
+            {
+                "name": "Basic Salary",
+                "code": "BASIC",
+                "sequence": 1,
+                "category_id": cls.categ_basic.id,
+                "condition_select": "none",
+                "amount_select": "code",
+                "amount_python_compute": "result = contract.wage",
+            }
+        )
+
+        cls.payroll_structure = cls.PayrollStructure.create(
+            {
+                "name": "Salary Structure for Sales Person",
+                "code": "SP",
+                "company_id": cls.env.ref("base.main_company").id,
+                "rule_ids": [
+                    (4, cls.rule_basic.id),
+                ],
+            }
+        )
+
+    def create_contract(
+        self, eid, state, kanban_state, start, end=None, trial_end=None, pps_id=None
+    ):
+        return self.env["hr.contract"].create(
+            {
+                "name": "Contract",
+                "employee_id": eid,
+                "state": state,
+                "kanban_state": kanban_state,
+                "wage": 1,
+                "date_start": start,
+                "trial_date_end": trial_end,
+                "date_end": end,
+                "struct_id": self.payroll_structure.id,
+            }
+        )
+
+    def test_get_benefit_policies_for_payslip_premium(self):
+
+        start = date(2021, 1, 1)
+        end = date(2021, 1, 31)
+        bvals = self.benefit_create_vals.copy()
+        bvals.update({"link2payroll": True})
+        benefit = self.create_benefit(bvals)
+        self.create_premium(benefit, start=start, amount=100.00)
+        self.create_policy(self.eeJohn, benefit, start)
+        self.create_contract(self.eeJohn.id, "draft", "done", start).signal_confirm()
+        slip = self.Payslip.create(
+            {
+                "employee_id": self.eeJohn.id,
+                "date_from": start,
+                "date_to": end,
+            }
+        )
+        slip.onchange_employee()
+
+        self.assertEqual(
+            len(slip.benefit_line_ids),
+            1,
+            "There should be only 1 benefit line attached to payslip",
+        )
+        self.assertEqual(
+            slip.benefit_line_ids[0].earnings, 0, "Benefit line should show no earnings"
+        )
+        self.assertEqual(
+            slip.benefit_line_ids[0].deductions,
+            100,
+            "Benefit line should show a deduction of benefit premium amount",
+        )
+
+    def test_get_benefit_policies_for_payslip_premium_override(self):
+
+        start = date(2021, 1, 1)
+        end = date(2021, 1, 31)
+        bvals = self.benefit_create_vals.copy()
+        bvals.update({"link2payroll": True})
+        benefit = self.create_benefit(bvals)
+        self.create_premium(benefit, start=start, amount=100.00)
+        self.create_policy(self.eeJohn, benefit, start, premium=200.00)
+        self.create_contract(self.eeJohn.id, "draft", "done", start).signal_confirm()
+        slip = self.Payslip.create(
+            {
+                "employee_id": self.eeJohn.id,
+                "date_from": start,
+                "date_to": end,
+            }
+        )
+        slip.onchange_employee()
+
+        self.assertEqual(
+            len(slip.benefit_line_ids),
+            1,
+            "There should be only 1 benefit line attached to payslip",
+        )
+        self.assertEqual(
+            slip.benefit_line_ids[0].earnings, 0, "Benefit line should show no earnings"
+        )
+        self.assertEqual(
+            slip.benefit_line_ids[0].deductions,
+            200,
+            "Benefit line should show a deduction of the override amount",
+        )
+
+    def test_get_benefit_policies_for_payslip_premium_total(self):
+
+        start = date(2021, 1, 1)
+        end = date(2021, 1, 31)
+        bvals = self.benefit_create_vals.copy()
+        bvals.update({"link2payroll": True})
+        benefit = self.create_benefit(bvals)
+        self.create_premium(benefit, start=start, amount=100.00, total=500.00)
+        self.create_policy(self.eeJohn, benefit, start)
+        self.create_contract(self.eeJohn.id, "draft", "done", start).signal_confirm()
+        slip = self.Payslip.create(
+            {
+                "employee_id": self.eeJohn.id,
+                "date_from": start,
+                "date_to": end,
+            }
+        )
+        slip.onchange_employee()
+
+        self.assertEqual(
+            len(slip.benefit_line_ids),
+            1,
+            "There should be only 1 benefit line attached to payslip",
+        )
+        self.assertEqual(
+            slip.benefit_line_ids[0].earnings, 0, "Benefit line should show no earnings"
+        )
+        self.assertEqual(
+            slip.benefit_line_ids[0].deductions,
+            100,
+            "Benefit line should show a deduction of benefit premium amount",
+        )
+
+    def test_get_benefit_policies_for_payslip_allowance(self):
+
+        start = date(2021, 1, 1)
+        end = date(2021, 1, 31)
+        bvals = self.benefit_create_vals.copy()
+        bvals.update({"link2payroll": True})
+        benefit = self.create_benefit(bvals)
+        self.create_earning(benefit, start=start, allowance=500.00)
+        self.create_policy(self.eeJohn, benefit, start)
+        self.create_contract(self.eeJohn.id, "draft", "done", start).signal_confirm()
+        slip = self.Payslip.create(
+            {
+                "employee_id": self.eeJohn.id,
+                "date_from": start,
+                "date_to": end,
+            }
+        )
+        slip.onchange_employee()
+
+        self.assertEqual(
+            len(slip.benefit_line_ids),
+            1,
+            "There should be only 1 benefit line attached to payslip",
+        )
+        self.assertEqual(
+            slip.benefit_line_ids[0].earnings,
+            500,
+            "Benefit line should show 500.00 earnings",
+        )
+        self.assertEqual(
+            slip.benefit_line_ids[0].deductions,
+            0,
+            "Benefit line should show NO deductions",
+        )
+
+    def test_get_benefit_policy_partial(self):
+
+        start = date(2021, 1, 1)
+        end = date(2021, 1, 31)
+        policy_end = date(2021, 1, 15)
+        self.benefit_create_vals.update({"link2payroll": True})
+        benefit = self.create_benefit(self.benefit_create_vals)
+        self.create_premium(benefit, start=start, amount=100.00)
+        self.create_policy(self.eeJohn, benefit, start, policy_end)
+        self.create_contract(self.eeJohn.id, "draft", "done", start).signal_confirm()
+        slip = self.Payslip.create(
+            {
+                "employee_id": self.eeJohn.id,
+                "date_from": start,
+                "date_to": end,
+            }
+        )
+        slip.onchange_employee()
+
+        self.assertEqual(
+            fields.Float.compare(slip.benefit_line_ids[0].ppf, 0.5, precision_digits=1),
+            0,
+            "The benefit ppf should be 0.5 because the policy lasted 1/2 month",
+        )
+
+    def test_get_benefit_policy_allowance(self):
+
+        start = date(2021, 1, 1)
+        end = date(2021, 1, 31)
+        self.benefit_create_vals.update({"link2payroll": True})
+        benefit = self.create_benefit(self.benefit_create_vals)
+        self.create_earning(benefit, start=start, allowance=100.00)
+        self.create_policy(self.eeJohn, benefit, start)
+        self.create_contract(self.eeJohn.id, "draft", "done", start).signal_confirm()
+        slip = self.Payslip.create(
+            {
+                "employee_id": self.eeJohn.id,
+                "date_from": start,
+                "date_to": end,
+            }
+        )
+        slip.onchange_employee()
+
+        self.assertEqual(
+            len(slip.benefit_line_ids),
+            1,
+            "There should be only 1 benefit line attached to payslip",
+        )
+        self.assertEqual(
+            slip.benefit_line_ids[0].earnings,
+            100,
+            "Benefit should indicate allowance of 100",
+        )
+        self.assertEqual(
+            slip.benefit_line_ids[0].deductions,
+            0,
+            "Benefit line should show no dedections",
+        )
+
+    def test_benefit_policy_ppf(self):
+        """
+        Test for off-by-one error when calculating policy and payroll days.
+        29 / 30 as opposed to 30 / 31. Manifests as ppf calculation error.
+        """
+
+        start = date(2021, 1, 1)
+        end = date(2021, 1, 31)
+        self.benefit_create_vals.update({"link2payroll": True})
+        benefit = self.create_benefit(self.benefit_create_vals)
+        self.create_earning(benefit, start=start, allowance=100.00)
+        self.create_policy(self.eeJohn, benefit, start + timedelta(days=1))
+        self.create_contract(self.eeJohn.id, "draft", "done", start).signal_confirm()
+        slip = self.Payslip.create(
+            {
+                "employee_id": self.eeJohn.id,
+                "date_from": start,
+                "date_to": end,
+            }
+        )
+        slip.onchange_employee()
+
+        self.assertEqual(
+            len(slip.benefit_line_ids),
+            1,
+            "There should be only 1 benefit line attached to payslip",
+        )
+        self.assertEqual(
+            round(slip.benefit_line_ids[0].ppf, 4),
+            0.9677,
+            "Benefit should indicate PPF of 0.9677",
+        )
+        self.assertEqual(
+            benefit.code,
+            slip.benefit_line_ids[0].code,
+            "The benefit appears in the payslip's benefit lines",
+        )
+
+    def test_onchange_deletes_old_values(self):
+
+        start = date(2021, 1, 1)
+        end = date(2021, 1, 31)
+        self.benefit_create_vals.update({"link2payroll": True})
+        benefit = self.create_benefit(self.benefit_create_vals)
+        self.create_earning(benefit, start=start, allowance=100.00)
+        self.create_policy(self.eeJohn, benefit, start)
+        self.create_contract(self.eeJohn.id, "draft", "done", start).signal_confirm()
+        slip = self.Payslip.create(
+            {
+                "employee_id": self.eeJohn.id,
+                "date_from": start,
+                "date_to": end,
+            }
+        )
+        slip.onchange_employee()
+        slip.onchange_employee()
+
+        self.assertEqual(
+            len(slip.benefit_line_ids),
+            1,
+            "There should be only 1 benefit line attached to payslip",
+        )
+
+    def test_no_employee_no_contract(self):
+
+        frm = Form(self.Payslip)
+        frm.date_from = date(2021, 1, 1)
+        frm.date_to = date(2021, 1, 31)
+        self.assertTrue(
+            True, "If we've reached this far without an exception thrown we're good"
+        )
+
+    def test_benefit_policy_premium_refund(self):
+
+        start = date(2021, 1, 1)
+        end = date(2021, 1, 31)
+        self.benefit_create_vals.update({"link2payroll": True})
+        bn = self.create_benefit(self.benefit_create_vals)
+        self.create_premium(
+            bn,
+            start,
+            ptype="monthly",
+            amount=100,
+            total=300,
+        )
+        pol = self.create_policy(self.eeJohn, bn, start)
+        pol.state_open()
+        self.create_contract(self.eeJohn.id, "draft", "done", start).signal_confirm()
+        slip = self.Payslip.create(
+            {
+                "employee_id": self.eeJohn.id,
+                "date_from": start,
+                "date_to": end,
+            }
+        )
+        slip.onchange_employee()
+        self.assertEqual(
+            bn.code,
+            slip.benefit_line_ids[0].code,
+            "The benefit appears in the payslip's benefit lines",
+        )
+        slip.compute_sheet()
+        slip.action_payslip_done()
+        self.assertEqual(
+            len(slip.premium_payment_ids), 1, "There is one premium payment"
+        )
+        self.assertEqual(
+            slip.premium_payment_ids[0].state,
+            "done",
+            "The premium payment is done",
+        )
+
+        slip.refund_sheet()
+
+        self.assertEqual(
+            slip.premium_payment_ids[0].state,
+            "cancel",
+            "The premium payment has been cancelled",
+        )
diff --git a/hr_benefit_payroll/views/benefit_policy_view.xml b/hr_benefit_payroll/views/benefit_policy_view.xml
new file mode 100644
index 00000000..d30f167f
--- /dev/null
+++ b/hr_benefit_payroll/views/benefit_policy_view.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+
+        <!-- Policies -->
+
+        <record id="view_benefits_policy_form" model="ir.ui.view">
+            <field name="name">hr.benefit.policy.form.inherit.payroll</field>
+            <field name="model">hr.benefit.policy</field>
+            <field name="inherit_id" ref="hr_benefit.view_benefits_policy_form" />
+            <field name="arch" type="xml">
+                <xpath expr="//form/sheet/notebook" position="inside">
+                    <page string="Premiums">
+                        <group string="Premium Payments">
+                            <field name="premium_payment_ids" nolabel="1" />
+                        </group>
+                    </page>
+            </xpath>
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/hr_benefit_payroll/views/benefit_premium_payment_view.xml b/hr_benefit_payroll/views/benefit_premium_payment_view.xml
new file mode 100644
index 00000000..844b67ea
--- /dev/null
+++ b/hr_benefit_payroll/views/benefit_premium_payment_view.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+
+        <!-- Premium Payments -->
+
+        <record id="view_premium_payments_filter" model="ir.ui.view">
+            <field name="name">hr.benefit.premium.payment.filter</field>
+            <field name="model">hr.benefit.premium.payment</field>
+            <field name="arch" type="xml">
+                <search string="Search All Payments">
+                    <field name="date" />
+                    <field name="policy_id" />
+                    <separator />
+                    <filter
+                        string="My Payments"
+                        icon="terp-personal"
+                        name="my_payments"
+                        domain="[('employee_id.user_id','=', uid)]"
+                    />
+                    <separator />
+                    <field name="employee_id" />
+                    <field name="state" />
+                    <group expand="0" string="Group By...">
+                        <filter
+                            name="group_date"
+                            string="Date"
+                            icon="terp-personal"
+                            domain="[]"
+                            context="{'group_by':'date'}"
+                        />
+                        <filter
+                            name="group_policy"
+                            string="Policy"
+                            icon="terp-stock_symbol-selection"
+                            domain="[]"
+                            context="{'group_by':'policy_id'}"
+                        />
+                        <filter
+                            name="group_employee"
+                            string="Employee"
+                            icon="terp-personal"
+                            domain="[]"
+                            context="{'group_by':'employee_id'}"
+                        />
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record id="view_premium_payments_tree" model="ir.ui.view">
+            <field name="name">hr.benefit.premium.payment.tree</field>
+            <field name="model">hr.benefit.premium.payment</field>
+            <field name="arch" type="xml">
+                <tree string="Premium Payments">
+                    <field name="policy_id" />
+                    <field name="employee_id" />
+                    <field name="date" />
+                    <field name="amount" />
+                    <field name="state" />
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_premium_payments_form" model="ir.ui.view">
+            <field name="name">hr.benefit.premium.payment.from</field>
+            <field name="model">hr.benefit.premium.payment</field>
+            <field name="arch" type="xml">
+                <form string="Premium Payment">
+                    <header>
+                        <button
+                            name="signal_pending"
+                            type="workflow"
+                            states="draft"
+                            string="Pending"
+                            class="oe_highlight"
+                        />
+                        <button
+                            name="signal_done"
+                            type="workflow"
+                            states="pending"
+                            string="Decline"
+                            class="oe_highlight"
+                        />
+                        <button
+                            name="signal_cancel"
+                            type="workflow"
+                            states="draft,pending"
+                            string="Cancel"
+                            class="oe_highlight"
+                        />
+                        <field name="state" widget="statusbar" />
+                    </header>
+                    <group>
+                        <group>
+                            <field name="employee_id" />
+                            <field name="policy_id" />
+                            <field name="date" />
+                            <field name="amount" />
+                        </group>
+                        <group>
+                            <field name="payslip_id" />
+                        </group>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="open_premium_payments_view" model="ir.actions.act_window">
+            <field name="name">Premium Payments</field>
+            <field name="res_model">hr.benefit.premium.payment</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_premium_payments_filter" />
+        </record>
+        <menuitem
+            id="menu_premium_payments"
+            action="open_premium_payments_view"
+            parent="hr_benefit.menu_claims_root"
+            groups="base.group_user"
+            sequence="10"
+        />
+
+    </data>
+</odoo>
diff --git a/hr_benefit_payroll/views/benefit_view.xml b/hr_benefit_payroll/views/benefit_view.xml
new file mode 100644
index 00000000..c4fa24b5
--- /dev/null
+++ b/hr_benefit_payroll/views/benefit_view.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+        <record id="view_benefits_tree" model="ir.ui.view">
+            <field name="name">hr.benefit.tree.payroll</field>
+            <field name="model">hr.benefit</field>
+            <field name="inherit_id" ref="hr_benefit.view_benefits_tree" />
+            <field name="priority">99</field>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='min_employed_days']" position="after">
+                    <field name="link2payroll" />
+                </xpath>
+            </field>
+        </record>
+
+        <record id="view_benefits_form" model="ir.ui.view">
+            <field name="name">hr.benefit.form.payroll</field>
+            <field name="model">hr.benefit</field>
+            <field name="inherit_id" ref="hr_benefit.view_benefits_form" />
+            <field name="priority">99</field>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='min_employed_days']" position="after">
+                    <field name="link2payroll" />
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/hr_benefit_payroll/views/hr_employee_view.xml b/hr_benefit_payroll/views/hr_employee_view.xml
new file mode 100644
index 00000000..08359490
--- /dev/null
+++ b/hr_benefit_payroll/views/hr_employee_view.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+
+        <record id="hr_employee_view_form" model="ir.ui.view">
+            <field name="name">hr.employee.view.inherit.benefits</field>
+            <field name="model">hr.employee</field>
+            <field name="priority">99</field>
+            <field name="inherit_id" ref="hr_benefit.hr_employee_view_form" />
+            <field name="arch" type="xml">
+                <xpath
+                    expr="//button[@name='%(hr_benefit.act_hr_employee_2_hr_benefit_policy)d']"
+                    position="attributes"
+                >
+                    <attribute
+                        name="groups"
+                    >hr.group_hr_user,payroll.group_payroll_user</attribute>
+                </xpath>
+                <xpath
+                    expr="//button[@name='%(hr_benefit.act_hr_employee_2_hr_benefit_claims)d']"
+                    position="attributes"
+                >
+                    <attribute
+                        name="groups"
+                    >hr.group_hr_user,payroll.group_payroll_user</attribute>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/hr_benefit_payroll/views/hr_payslip_view.xml b/hr_benefit_payroll/views/hr_payslip_view.xml
new file mode 100644
index 00000000..af7ff2f0
--- /dev/null
+++ b/hr_benefit_payroll/views/hr_payslip_view.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+
+        <!-- Payslip -->
+        <record id="view_hr_payslip_form" model="ir.ui.view">
+            <field name="name">hr.payslip.form</field>
+            <field name="model">hr.payslip</field>
+            <field name="inherit_id" ref="payroll.hr_payslip_view_form" />
+            <field name="arch" type="xml">
+                <data>
+                    <xpath
+                        expr="/form/sheet/notebook/page/field[@name='worked_days_line_ids']"
+                        position="after"
+                    >
+                        <group string="Benefits">
+                            <field name="benefit_line_ids" nolabel="1">
+                                <tree string="Payslip Benefit Lines">
+                                    <field name="name" />
+                                    <field name="code" />
+                                    <field name="qty" />
+                                    <field name="ppf" />
+                                    <field name="earnings" />
+                                    <field name="deductions" />
+                                </tree>
+                            </field>
+                        </group>
+                    </xpath>
+                    <xpath expr="/form/sheet/notebook" position="inside">
+                        <page name="benefits" string="Benefits">
+                            <group string="Benefit Premium Payments">
+                                <field
+                                    name="premium_payment_ids"
+                                    nolabel="1"
+                                    readonly="1"
+                                >
+                                    <tree string="Premium Payments">
+                                        <field name="date" />
+                                        <field name="policy_id" />
+                                        <field name="amount" />
+                                        <field name="state" />
+                                    </tree>
+                                </field>
+                            </group>
+                        </page>
+                    </xpath>
+                </data>
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/hr_benefit_payroll/views/hr_salary_rule_view.xml b/hr_benefit_payroll/views/hr_salary_rule_view.xml
new file mode 100644
index 00000000..cdd3c306
--- /dev/null
+++ b/hr_benefit_payroll/views/hr_salary_rule_view.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+
+        <!-- Salary Rule -->
+        <record id="view_salary_rule_form" model="ir.ui.view">
+            <field name="name">hr.salary.rule.form.inherit</field>
+            <field name="model">hr.salary.rule</field>
+            <field name="inherit_id" ref="payroll.hr_salary_rule_view_form" />
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="//field[@name='appears_on_payslip']" position="after">
+                        <field name="has_premium_payment" />
+                        <field name="benefit_id" />
+                    </xpath>
+                </data>
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/hr_contract_status/README.rst b/hr_contract_status/README.rst
new file mode 100644
index 00000000..cd35a97a
--- /dev/null
+++ b/hr_contract_status/README.rst
@@ -0,0 +1,72 @@
+===========================
+Stateful Employee Contracts
+===========================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:ab0d674ed4edb1c0395cafc17f6f418d6387e4e97fea2e2e40a5ac16d230eee0
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/hr_contract_status
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+This module implements employee contract workflow and notifications.
+* Mangae an employee contract life-cycle
+* Get notified when employees near the end of their trial period
+* Get notified when an employee's contract is about to expire
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Changelog
+=========
+
+14.0.1.0.1 (2021-10-07)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* [FIX] Scheduled actions related to contract state no longer fail because of a programming error
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20hr_contract_status%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+* Michael Telahun Makonnen
+
+Other credits
+~~~~~~~~~~~~~
+
+* Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/hr_contract_status>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/hr_contract_status/__init__.py b/hr_contract_status/__init__.py
new file mode 100644
index 00000000..2b0f2dca
--- /dev/null
+++ b/hr_contract_status/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
diff --git a/hr_contract_status/__manifest__.py b/hr_contract_status/__manifest__.py
new file mode 100644
index 00000000..7efea25a
--- /dev/null
+++ b/hr_contract_status/__manifest__.py
@@ -0,0 +1,27 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Stateful Employee Contracts",
+    "summary": "Workflows and notifications on employee contracts.",
+    "version": "15.0.1.0.0",
+    "category": "Human Resources",
+    "license": "AGPL-3",
+    "author": "TREVI Software, Michael Telahun Makonnen",
+    "images": ["static/src/img/main_screenshot.png"],
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "hr",
+        "hr_contract",
+        "hr_contract_values",
+        "trevi_hr_usability",
+    ],
+    "data": [
+        "security/ir.model.access.csv",
+        "data/hr_contract_data.xml",
+        "views/hr_contract_view.xml",
+        "views/res_config_view.xml",
+    ],
+    "installable": True,
+}
diff --git a/hr_contract_status/data/hr_contract_data.xml b/hr_contract_status/data/hr_contract_data.xml
new file mode 100644
index 00000000..f1dcca48
--- /dev/null
+++ b/hr_contract_status/data/hr_contract_data.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+
+        <!-- Alert-related subtypes for messaging / Chatter -->
+
+        <record id="mt_alert_trial_ending" model="mail.message.subtype">
+            <field name="name">Trial Period Ending</field>
+            <field name="res_model">hr.contract</field>
+            <field name="default" eval="True" />
+            <field name="description">Trial Period is ending</field>
+        </record>
+
+        <record id="mt_alert_contract_ending" model="mail.message.subtype">
+            <field name="name">Contract Period Ending</field>
+            <field name="res_model">hr.contract</field>
+            <field name="default" eval="True" />
+            <field name="description">Contract Period is ending</field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/hr_contract_status/i18n/hr_contract_status.pot b/hr_contract_status/i18n/hr_contract_status.pot
new file mode 100644
index 00000000..ab7993ec
--- /dev/null
+++ b/hr_contract_status/i18n/hr_contract_status.pot
@@ -0,0 +1,232 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* hr_contract_status
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: hr_contract_status
+#: model:ir.model.fields,field_description:hr_contract_status.field_res_config_settings__concurrent_contracts
+msgid "Allow concurrent contracts"
+msgstr ""
+
+#. module: hr_contract_status
+#: model:ir.model.fields,help:hr_contract_status.field_res_config_settings__concurrent_contracts
+msgid "Allow multiple concurrent contracts for an employee"
+msgstr ""
+
+#. module: hr_contract_status
+#: model_terms:ir.ui.view,arch_db:hr_contract_status.view_hr_config_contract_state
+msgid "Allow multiple concurrent employee contracts."
+msgstr ""
+
+#. module: hr_contract_status
+#: model:ir.model,name:hr_contract_status.model_res_config_settings
+msgid "Config Settings"
+msgstr ""
+
+#. module: hr_contract_status
+#: model_terms:ir.ui.view,arch_db:hr_contract_status.view_contract_form
+msgid "Confirm"
+msgstr ""
+
+#. module: hr_contract_status
+#: model:mail.message.subtype,name:hr_contract_status.mt_alert_contract_ending
+msgid "Contract Period Ending"
+msgstr ""
+
+#. module: hr_contract_status
+#: model:mail.message.subtype,description:hr_contract_status.mt_alert_contract_ending
+msgid "Contract Period is ending"
+msgstr ""
+
+#. module: hr_contract_status
+#: model:ir.ui.menu,name:hr_contract_status.submenu_hr_contracts
+msgid "Contracts"
+msgstr ""
+
+#. module: hr_contract_status
+#: model:ir.actions.act_window,name:hr_contract_status.open_draft_contracts
+#: model:ir.ui.menu,name:hr_contract_status.menu_draft_contracts
+#: model_terms:ir.ui.view,arch_db:hr_contract_status.view_draft_contracts_tree
+msgid "Contracts to be Approved"
+msgstr ""
+
+#. module: hr_contract_status
+#: model:ir.model.fields,field_description:hr_contract_status.field_hr_contract__department_id
+#: model:ir.model.fields,field_description:hr_contract_status.field_hr_employee__department_id
+#: model:ir.model.fields,field_description:hr_contract_status.field_hr_job__department_id
+msgid "Department"
+msgstr ""
+
+#. module: hr_contract_status
+#: model:ir.model.fields,field_description:hr_contract_status.field_hr_contract__display_name
+#: model:ir.model.fields,field_description:hr_contract_status.field_hr_employee__display_name
+#: model:ir.model.fields,field_description:hr_contract_status.field_hr_job__display_name
+#: model:ir.model.fields,field_description:hr_contract_status.field_res_config_settings__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: hr_contract_status
+#: model:ir.model.fields,field_description:hr_contract_status.field_hr_contract__date_end_effective
+msgid "Effective End Date"
+msgstr ""
+
+#. module: hr_contract_status
+#: model:ir.model,name:hr_contract_status.model_hr_employee
+#: model:ir.model.fields,field_description:hr_contract_status.field_hr_contract__employee_id
+msgid "Employee"
+msgstr ""
+
+#. module: hr_contract_status
+#: model:ir.model,name:hr_contract_status.model_hr_contract
+msgid "Employee Contract"
+msgstr ""
+
+#. module: hr_contract_status
+#: model_terms:ir.ui.view,arch_db:hr_contract_status.view_hr_config_contract_state
+msgid "Employee Contracts"
+msgstr ""
+
+#. module: hr_contract_status
+#: model:ir.model.fields,help:hr_contract_status.field_hr_contract__wage
+msgid "Employee's monthly gross wage."
+msgstr ""
+
+#. module: hr_contract_status
+#: model_terms:ir.ui.view,arch_db:hr_contract_status.view_hr_config_contract_state
+msgid "Employees can have more than one contract active at a time."
+msgstr ""
+
+#. module: hr_contract_status
+#: model_terms:ir.ui.view,arch_db:hr_contract_status.view_contract_form
+msgid "End Contract"
+msgstr ""
+
+#. module: hr_contract_status
+#: model:ir.actions.act_window,name:hr_contract_status.open_expiring_contracts
+#: model:ir.ui.menu,name:hr_contract_status.menu_expiring_contracts
+msgid "Ending Trials & Contracts"
+msgstr ""
+
+#. module: hr_contract_status
+#: model_terms:ir.ui.view,arch_db:hr_contract_status.view_expiring_contracts_tree
+msgid "Expiring Contracts"
+msgstr ""
+
+#. module: hr_contract_status
+#: model:ir.model.fields,field_description:hr_contract_status.field_hr_contract__id
+#: model:ir.model.fields,field_description:hr_contract_status.field_hr_employee__id
+#: model:ir.model.fields,field_description:hr_contract_status.field_hr_job__id
+#: model:ir.model.fields,field_description:hr_contract_status.field_res_config_settings__id
+msgid "ID"
+msgstr ""
+
+#. module: hr_contract_status
+#: model:ir.model.fields,field_description:hr_contract_status.field_hr_employee__job_id
+msgid "Job"
+msgstr ""
+
+#. module: hr_contract_status
+#: model:ir.model,name:hr_contract_status.model_hr_job
+#: model:ir.model.fields,field_description:hr_contract_status.field_hr_contract__job_id
+msgid "Job Position"
+msgstr ""
+
+#. module: hr_contract_status
+#: model:ir.model.fields,field_description:hr_contract_status.field_hr_contract__end_job_id
+msgid "Job Title"
+msgstr ""
+
+#. module: hr_contract_status
+#: model:ir.model.fields,field_description:hr_contract_status.field_hr_contract____last_update
+#: model:ir.model.fields,field_description:hr_contract_status.field_hr_employee____last_update
+#: model:ir.model.fields,field_description:hr_contract_status.field_hr_job____last_update
+#: model:ir.model.fields,field_description:hr_contract_status.field_res_config_settings____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: hr_contract_status
+#: model:ir.model.fields,field_description:hr_contract_status.field_hr_contract__date_end_original
+msgid "Original End Date"
+msgstr ""
+
+#. module: hr_contract_status
+#: model:ir.model.fields,field_description:hr_contract_status.field_hr_contract__structure_type_id
+msgid "Salary Structure Type"
+msgstr ""
+
+#. module: hr_contract_status
+#: model:ir.model.fields,field_description:hr_contract_status.field_hr_contract__date_start
+msgid "Start Date"
+msgstr ""
+
+#. module: hr_contract_status
+#: model:ir.model.fields,help:hr_contract_status.field_hr_contract__date_start
+msgid "Start date of the contract."
+msgstr ""
+
+#. module: hr_contract_status
+#: model:ir.model.fields,field_description:hr_contract_status.field_hr_contract__state_ending
+msgid "State Ending"
+msgstr ""
+
+#. module: hr_contract_status
+#: model:ir.model.fields,field_description:hr_contract_status.field_hr_contract__state
+msgid "Status"
+msgstr ""
+
+#. module: hr_contract_status
+#: model:ir.model.fields,help:hr_contract_status.field_hr_contract__state
+msgid "Status of the contract"
+msgstr ""
+
+#. module: hr_contract_status
+#: code:addons/hr_contract_status/models/hr_contract.py:0
+#, python-format
+msgid "The trial period of %s is about to end."
+msgstr ""
+
+#. module: hr_contract_status
+#: model_terms:ir.actions.act_window,help:hr_contract_status.open_expiring_contracts
+msgid ""
+"There are currently no contracts or trial periods that are about to expire."
+msgstr ""
+
+#. module: hr_contract_status
+#: model_terms:ir.actions.act_window,help:hr_contract_status.open_draft_contracts
+msgid "There are currently no contracts that need to be approved."
+msgstr ""
+
+#. module: hr_contract_status
+#: model:ir.model.fields.selection,name:hr_contract_status.selection__hr_contract__state__trial
+msgid "Trial"
+msgstr ""
+
+#. module: hr_contract_status
+#: model:ir.model.fields,field_description:hr_contract_status.field_hr_contract__trial_ending
+msgid "Trial Ending"
+msgstr ""
+
+#. module: hr_contract_status
+#: model:mail.message.subtype,name:hr_contract_status.mt_alert_trial_ending
+msgid "Trial Period Ending"
+msgstr ""
+
+#. module: hr_contract_status
+#: model:mail.message.subtype,description:hr_contract_status.mt_alert_trial_ending
+msgid "Trial Period is ending"
+msgstr ""
+
+#. module: hr_contract_status
+#: model:ir.model.fields,field_description:hr_contract_status.field_hr_contract__wage
+msgid "Wage"
+msgstr ""
diff --git a/hr_contract_status/models/__init__.py b/hr_contract_status/models/__init__.py
new file mode 100644
index 00000000..524f729f
--- /dev/null
+++ b/hr_contract_status/models/__init__.py
@@ -0,0 +1,8 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import hr_contract
+from . import hr_employee
+from . import hr_job
+from . import res_config
diff --git a/hr_contract_status/models/hr_contract.py b/hr_contract_status/models/hr_contract.py
new file mode 100644
index 00000000..92db04bb
--- /dev/null
+++ b/hr_contract_status/models/hr_contract.py
@@ -0,0 +1,245 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+
+from datetime import date
+
+from dateutil.relativedelta import relativedelta
+
+from odoo import _, api, fields, models
+
+
+class HrContract(models.Model):
+
+    _name = "hr.contract"
+    _inherit = "hr.contract"
+
+    trial_ending = fields.Boolean()
+    state_ending = fields.Boolean()
+    date_end_effective = fields.Date(string="Effective End Date", readonly=True)
+    date_end_original = fields.Date(string="Original End Date", readonly=True)
+    state = fields.Selection(
+        selection_add=[
+            ("draft",),
+            ("trial", "Trial"),
+            ("open",),
+            ("close",),
+            ("cancel",),
+        ],
+        ondelete={"trial": "set null"},
+        default="draft",
+        readonly=True,
+    )
+
+    department_id = fields.Many2one(
+        compute="_compute_department",
+        store=True,
+        readonly=True,
+    )
+
+    # At contract end this field will hold the job_id, and the
+    # job_id field will be set to null so that modules that
+    # reference job_id don't include deactivated employees.
+    # XXX ToDo: is it possible to change those references rather than using this hack?
+    end_job_id = fields.Many2one(
+        comodel_name="hr.job", string="Job Title", readonly=True
+    )
+
+    # The following are redefined again to make them editable only in certain states
+    employee_id = fields.Many2one(
+        readonly=True, states={"draft": [("readonly", False)]}
+    )
+    structure_type_id = fields.Many2one(
+        readonly=True, states={"draft": [("readonly", False)]}
+    )
+    job_id = fields.Many2one(
+        comodel_name="hr.job",
+        compute=False,
+        domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]",
+        required=False,
+        states={
+            "draft": [("required", True)],
+            "trial": [("required", True)],
+            "open": [("required", True)],
+        },
+        tracking=True,
+    )
+    date_start = fields.Date(
+        readonly=True,
+        states={"draft": [("readonly", False)]},
+    )
+    wage = fields.Monetary(
+        readonly=True,
+        states={
+            "draft": [("readonly", False)],
+            "trial": [("readonly", False)],
+            "trial_ending": [("readonly", False)],
+        },
+    )
+
+    @api.depends("job_id")
+    def _compute_department(self):
+        for contract in self:
+            contract.department_id = contract.job_id.department_id
+
+    # Override from inherited model. job_id and department_id in hr.employee should be
+    # calculated from the contract.
+    #
+    @api.depends("employee_id")
+    def _compute_employee_contract(self):
+        for contract in self.filtered("employee_id"):
+            contract.resource_calendar_id = contract.employee_id.resource_calendar_id
+            contract.company_id = contract.employee_id.company_id
+
+    @api.constrains("employee_id", "state", "kanban_state", "date_start", "date_end")
+    def _check_current_contract(self):
+
+        allow = (
+            self.env["ir.config_parameter"]
+            .sudo()
+            .get_param("hr_contract_status.concurrent_contracts", False)
+        )
+        if allow:
+            return
+        return super(HrContract, self)._check_current_contract()
+
+    def _track_subtype(self, init_values):
+        self.ensure_one()
+        if "state" in init_values:
+            if self.state == "trial_ending":
+                return self.env.ref("hr_contract_status.mt_alert_trial_ending")
+            elif self.state == "contract_ending":
+                return self.env.ref("hr_contract_status.mt_alert_contract_ending")
+        return super(HrContract, self)._track_subtype(init_values)
+
+    @api.model
+    def update_state(self):
+
+        # New contract with trial period
+        self.search(
+            [
+                ("state", "=", "draft"),
+                ("kanban_state", "=", "done"),
+                ("date_start", "<=", fields.Date.to_string(date.today())),
+                ("trial_date_end", ">=", fields.Date.to_string(date.today())),
+            ]
+        ).write({"state": "trial"})
+
+        # Trial period is ending
+        contracts = self.search(
+            [
+                ("state", "=", "trial"),
+                (
+                    "trial_date_end",
+                    "<=",
+                    fields.Date.to_string(date.today() + relativedelta(days=7)),
+                ),
+            ]
+        )
+        for contract in contracts:
+            contract.kanban_state = "blocked"
+            contract.trial_ending = True
+            contract.activity_schedule(
+                "mail.mail_activity_data_todo",
+                contract.trial_date_end,
+                _("The trial period of %s is about to end.", contract.employee_id.name),
+                user_id=contract.hr_responsible_id.id or self.env.uid,
+            )
+
+        # Trial period has ended
+        contracts = self.search(
+            [
+                ("state", "=", "trial"),
+                (
+                    "trial_date_end",
+                    "<=",
+                    fields.Date.to_string(date.today() - relativedelta(days=1)),
+                ),
+            ]
+        )
+        for contract in contracts:
+            contract.state = "open"
+            contract.kanban_state = "normal"
+            contract.trial_ending = False
+
+        # Contract is expiring
+        self.search(
+            [
+                ("state", "=", "open"),
+                ("kanban_state", "!=", "blocked"),
+                "|",
+                "&",
+                (
+                    "date_end",
+                    "<=",
+                    fields.Date.to_string(date.today() + relativedelta(days=7)),
+                ),
+                (
+                    "date_end",
+                    ">=",
+                    fields.Date.to_string(date.today() + relativedelta(days=1)),
+                ),
+                "&",
+                (
+                    "visa_expire",
+                    "<=",
+                    fields.Date.to_string(date.today() + relativedelta(days=60)),
+                ),
+                (
+                    "visa_expire",
+                    ">=",
+                    fields.Date.to_string(date.today() + relativedelta(days=1)),
+                ),
+            ]
+        ).write({"state_ending": True})
+
+        # Contract has expired
+        self.search(
+            [
+                ("state", "=", "open"),
+                "|",
+                (
+                    "date_end",
+                    "<=",
+                    fields.Date.to_string(date.today() + relativedelta(days=1)),
+                ),
+                (
+                    "visa_expire",
+                    "<=",
+                    fields.Date.to_string(date.today() + relativedelta(days=1)),
+                ),
+            ]
+        ).write({"state_ending": False})
+
+        return super(HrContract, self).update_state()
+
+    def condition_trial_period(self):
+        self.ensure_one()
+        dToday = fields.Date.today()
+        if not self.trial_date_end or (
+            self.trial_date_end and self.trial_date_end < dToday
+        ):
+            return False
+        return True
+
+    def signal_confirm(self):
+        for rec in self:
+            if rec.kanban_state == "done":
+                rec.kanban_state = "normal"
+            if rec.condition_trial_period():
+                rec.state = "trial"
+            else:
+                rec.state = "open"
+
+    def signal_close(self):
+        for c in self:
+            vals = {"state": "close"}
+            if not c.date_end or c.date_end >= date.today():
+                vals.update({"date_end": date.today()})
+            c.write(vals)
+
+    def write(self, vals):
+        if vals.get("state") == "trial":
+            self._assign_open_contract()
+        return super(HrContract, self).write(vals)
diff --git a/hr_contract_status/models/hr_employee.py b/hr_contract_status/models/hr_employee.py
new file mode 100644
index 00000000..63b1ad00
--- /dev/null
+++ b/hr_contract_status/models/hr_employee.py
@@ -0,0 +1,43 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+
+from odoo import api, fields, models
+
+
+class HrEmployee(models.Model):
+    _inherit = "hr.employee"
+
+    department_id = fields.Many2one(compute="_compute_contract", store=True)
+    job_id = fields.Many2one(compute="_compute_contract", store=True)
+
+    @api.depends("contract_id", "contract_id.job_id")
+    def _compute_contract(self):
+        for employee in self.filtered(lambda c: c.contract_id):
+            employee.job_id = employee.contract_id.job_id
+            employee.department_id = employee.contract_id.department_id
+
+    @api.depends("contract_id", "contract_id.state", "contract_id.kanban_state")
+    def _compute_contract_warning(self):
+        for employee in self:
+            employee.contract_warning = (
+                not employee.contract_id
+                or employee.contract_id.kanban_state == "blocked"
+                or employee.contract_id.state not in ["open", "trial"]
+            )
+
+    def _get_contracts(
+        self, date_from, date_to, states=["open"], kanban_state=False  # noqa: B006
+    ):  # pylint: disable=W0102
+
+        # Over-ride base class method to includes Closed/Ended contracts. Useful
+        # when multiple consecutive contracts occur in a payroll period.
+        #
+        default_states = ["open"]
+        if states == default_states:
+            states = ["trial", "open", "close"]
+
+        return super(HrEmployee, self)._get_contracts(
+            date_from, date_to, states=states, kanban_state=False
+        )
diff --git a/hr_contract_status/models/hr_job.py b/hr_contract_status/models/hr_job.py
new file mode 100644
index 00000000..75ca3a2f
--- /dev/null
+++ b/hr_contract_status/models/hr_job.py
@@ -0,0 +1,12 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+
+from odoo import fields, models
+
+
+class Job(models.Model):
+    _inherit = "hr.job"
+
+    department_id = fields.Many2one(required=True)
diff --git a/hr_contract_status/models/res_config.py b/hr_contract_status/models/res_config.py
new file mode 100644
index 00000000..92c0e79e
--- /dev/null
+++ b/hr_contract_status/models/res_config.py
@@ -0,0 +1,18 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+
+from odoo import fields, models
+
+
+class ResConfig(models.TransientModel):
+
+    _inherit = "res.config.settings"
+
+    concurrent_contracts = fields.Boolean(
+        string="Allow concurrent contracts",
+        config_parameter="hr_contract_status.concurrent_contracts",
+        default=False,
+        help="Allow multiple concurrent contracts for an employee",
+    )
diff --git a/hr_contract_status/readme/CREDITS.rst b/hr_contract_status/readme/CREDITS.rst
new file mode 100644
index 00000000..d264bc7e
--- /dev/null
+++ b/hr_contract_status/readme/CREDITS.rst
@@ -0,0 +1 @@
+* Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/hr_contract_status/readme/DESCRIPTION.rst b/hr_contract_status/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..4db4f63c
--- /dev/null
+++ b/hr_contract_status/readme/DESCRIPTION.rst
@@ -0,0 +1,4 @@
+This module implements employee contract workflow and notifications.
+* Mangae an employee contract life-cycle
+* Get notified when employees near the end of their trial period
+* Get notified when an employee's contract is about to expire
diff --git a/hr_contract_status/readme/HISTORY.rst b/hr_contract_status/readme/HISTORY.rst
new file mode 100644
index 00000000..6709f831
--- /dev/null
+++ b/hr_contract_status/readme/HISTORY.rst
@@ -0,0 +1,4 @@
+14.0.1.0.1 (2021-10-07)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* [FIX] Scheduled actions related to contract state no longer fail because of a programming error
diff --git a/hr_contract_status/security/ir.model.access.csv b/hr_contract_status/security/ir.model.access.csv
new file mode 100644
index 00000000..5fbae892
--- /dev/null
+++ b/hr_contract_status/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_contract_user,access_hr_contract,model_hr_contract,hr.group_hr_user,1,0,0,0
diff --git a/hr_contract_status/static/description/icon.png b/hr_contract_status/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/hr_contract_status/static/description/icon.png differ
diff --git a/hr_contract_status/static/description/index.html b/hr_contract_status/static/description/index.html
new file mode 100644
index 00000000..77d285b1
--- /dev/null
+++ b/hr_contract_status/static/description/index.html
@@ -0,0 +1,433 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Stateful Employee Contracts</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="stateful-employee-contracts">
+<h1 class="title">Stateful Employee Contracts</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:ab0d674ed4edb1c0395cafc17f6f418d6387e4e97fea2e2e40a5ac16d230eee0
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/hr_contract_status"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<p>This module implements employee contract workflow and notifications.
+* Mangae an employee contract life-cycle
+* Get notified when employees near the end of their trial period
+* Get notified when an employee’s contract is about to expire</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="toc-entry-1">Changelog</a><ul>
+<li><a class="reference internal" href="#section-1" id="toc-entry-2">14.0.1.0.1 (2021-10-07)</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-3">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-4">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-5">Authors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-6">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-7">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="changelog">
+<h1><a class="toc-backref" href="#toc-entry-1">Changelog</a></h1>
+<div class="section" id="section-1">
+<h2><a class="toc-backref" href="#toc-entry-2">14.0.1.0.1 (2021-10-07)</a></h2>
+<ul class="simple">
+<li>[FIX] Scheduled actions related to contract state no longer fail because of a programming error</li>
+</ul>
+</div>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20hr_contract_status%0Aversion:%2014.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="#toc-entry-4">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-5">Authors</a></h2>
+<ul class="simple">
+<li>TREVI Software</li>
+<li>Michael Telahun Makonnen</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-6">Other credits</a></h2>
+<ul class="simple">
+<li>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/hr_contract_status">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/hr_contract_status/static/src/img/main_screenshot.png b/hr_contract_status/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/hr_contract_status/static/src/img/main_screenshot.png differ
diff --git a/hr_contract_status/tests/__init__.py b/hr_contract_status/tests/__init__.py
new file mode 100644
index 00000000..042098a7
--- /dev/null
+++ b/hr_contract_status/tests/__init__.py
@@ -0,0 +1,8 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+
+from . import test_hr_contract
+from . import test_hr_employee
+from . import test_res_config_settings
diff --git a/hr_contract_status/tests/test_hr_contract.py b/hr_contract_status/tests/test_hr_contract.py
new file mode 100644
index 00000000..34c608e0
--- /dev/null
+++ b/hr_contract_status/tests/test_hr_contract.py
@@ -0,0 +1,225 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+
+from datetime import datetime
+
+from dateutil.relativedelta import relativedelta
+
+from odoo.tests import common
+
+
+class TestContract(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super(TestContract, cls).setUpClass()
+
+        cls.HrEmployee = cls.env["hr.employee"]
+        cls.HrContract = cls.env["hr.contract"]
+        cls.employee = cls.HrEmployee.create({"name": "John"})
+        cls.test_contract = dict(
+            name="Test", wage=1, employee_id=cls.employee.id, state="draft"
+        )
+
+    def create_contract(self, state, kanban_state, start, end=None, trial_end=None):
+        return self.env["hr.contract"].create(
+            {
+                "name": "Contract",
+                "employee_id": self.employee.id,
+                "state": state,
+                "kanban_state": kanban_state,
+                "wage": 1,
+                "date_start": start,
+                "trial_date_end": trial_end,
+                "date_end": end,
+            }
+        )
+
+    def apply_cron(self):
+        self.env.ref(
+            "hr_contract.ir_cron_data_contract_update_state"
+        ).method_direct_trigger()
+
+    def test_first_contract_open_notrial(self):
+        """The first contract when 'Running' goes to
+        'open' state, if trial end isn't set."""
+
+        start = datetime.now().date()
+        c = self.create_contract("draft", "normal", start)
+        c.signal_confirm()
+        self.assertEqual("open", c.state)
+        self.assertEqual("normal", c.kanban_state)
+
+    def test_first_contract_open_trial(self):
+        """The first contract when 'Running' goes to
+        trial period state, if trial end is set."""
+
+        start = datetime.now().date()
+        end = start + relativedelta(days=60)
+        c = self.create_contract("draft", "normal", start, trial_end=end)
+        c.signal_confirm()
+        self.assertEqual("trial", c.state)
+        self.assertEqual("normal", c.kanban_state)
+
+    def test_next_contract_open_running(self):
+        """Subsequent contracts go directly to 'Running' state"""
+
+        start = datetime.strptime("2015-11-01", "%Y-%m-%d").date()
+        end = datetime.strptime("2015-11-30", "%Y-%m-%d").date()
+        self.create_contract("close", "normal", start, end)
+
+        start = datetime.strptime("2015-12-01", "%Y-%m-%d").date()
+        c2 = self.create_contract("draft", "normal", start)
+        c2.signal_confirm()
+        self.assertEqual("open", c2.state)
+        self.assertEqual("normal", c2.kanban_state)
+
+    def test_start_trial(self):
+        """Cron update changes 'draft' contract into 'trial'"""
+
+        self.test_contract.update(
+            dict(
+                trial_date_end=datetime.now() + relativedelta(days=100),
+                kanban_state="done",
+            )
+        )
+        contract = self.HrContract.create(self.test_contract)
+        self.apply_cron()
+        self.assertEqual("trial", contract.state)
+        self.assertEqual("normal", contract.kanban_state)
+        self.assertEqual(False, contract.trial_ending)
+        self.assertEqual(False, self.employee.contract_warning)
+
+    def test_trial_ending(self):
+        self.test_contract.update(
+            dict(trial_date_end=datetime.now() + relativedelta(days=100))
+        )
+        contract = self.HrContract.create(self.test_contract)
+        contract.signal_confirm()
+        self.assertEqual("trial", contract.state)
+        self.assertEqual("normal", contract.kanban_state)
+        self.assertEqual(False, contract.trial_ending)
+        self.assertEqual(False, self.employee.contract_warning)
+
+        self.test_contract.update(
+            dict(trial_date_end=datetime.now() + relativedelta(days=5))
+        )
+        contract.write(self.test_contract)
+        self.apply_cron()
+        self.assertEqual(contract.state, "trial")
+        self.assertEqual(contract.trial_ending, True)
+        self.assertEqual(contract.kanban_state, "blocked")
+
+    def test_trial_ended(self):
+        self.test_contract.update(
+            {
+                "date_start": datetime.now() + relativedelta(days=-50),
+                "trial_date_end": datetime.now() + relativedelta(days=100),
+            }
+        )
+        contract = self.HrContract.create(self.test_contract)
+        contract.signal_confirm()
+        self.assertEqual("trial", contract.state)
+        self.assertEqual("normal", contract.kanban_state)
+        self.assertEqual(False, contract.trial_ending)
+        self.assertEqual(False, self.employee.contract_warning)
+
+        self.test_contract.update(
+            {
+                "trial_date_end": datetime.now() + relativedelta(days=-1),
+            }
+        )
+        contract.write(self.test_contract)
+        self.apply_cron()
+        self.assertEqual("open", contract.state)
+        self.assertEqual(False, contract.trial_ending)
+        self.assertEqual("normal", contract.kanban_state)
+
+    def test_contract_ending(self):
+        """When a contract nears completion the relevant boolean should be set"""
+
+        start = datetime.now().date()
+        end = start + relativedelta(days=100)
+        c = self.create_contract("draft", "normal", start, end)
+        c.signal_confirm()
+        self.assertEqual("open", c.state)
+        self.assertEqual("normal", c.kanban_state)
+        self.assertFalse(c.state_ending)
+
+        c.date_end = start + relativedelta(days=5)
+        self.apply_cron()
+        self.assertEqual("open", c.state)
+        self.assertEqual("blocked", c.kanban_state)
+        self.assertTrue(c.state_ending)
+
+    def test_contract_ended(self):
+        """When a contract has ended the state should be 'close'"""
+
+        # Start
+        start = datetime.now().date() + relativedelta(days=-100)
+        today = datetime.now().date()
+        end = today + relativedelta(days=100)
+        c = self.create_contract("draft", "normal", start, end)
+        c.signal_confirm()
+        self.assertEqual("open", c.state)
+        self.assertEqual("normal", c.kanban_state)
+        self.assertFalse(c.state_ending)
+
+        # Ending
+        c.date_end = today + relativedelta(days=5)
+        self.apply_cron()
+        self.assertEqual("open", c.state)
+        self.assertEqual("blocked", c.kanban_state)
+        self.assertTrue(c.state_ending)
+
+        # Ended
+        c.date_end = today + relativedelta(days=-1)
+        self.apply_cron()
+        self.assertEqual("close", c.state)
+        self.assertEqual("normal", c.kanban_state)
+        self.assertFalse(c.state_ending)
+
+    def test_signal_close(self):
+        """Calling signal close immediately ends the contract"""
+
+        # Start
+        start = datetime.now().date() + relativedelta(days=-100)
+        today = datetime.now().date()
+        end = today + relativedelta(days=100)
+        c = self.create_contract("draft", "normal", start, end)
+        c.signal_confirm()
+        self.assertEqual("open", c.state)
+        self.assertEqual("normal", c.kanban_state)
+        self.assertFalse(c.state_ending)
+
+        c.signal_close()
+
+        # Ended
+        self.assertEqual(today, c.date_end)
+        self.assertEqual("close", c.state)
+        self.assertEqual("normal", c.kanban_state)
+        self.assertFalse(c.state_ending)
+
+    def test_signal_close_ended_contract(self):
+        """Calling signal_close() doesn't alter contract end date that is in the past"""
+
+        # Start
+        start = datetime.now().date() + relativedelta(days=-100)
+        today = datetime.now().date()
+        end = today + relativedelta(days=100)
+        c = self.create_contract("draft", "normal", start, end)
+        c.signal_confirm()
+        self.assertEqual("open", c.state)
+        self.assertEqual("normal", c.kanban_state)
+        self.assertFalse(c.state_ending)
+
+        prev_end = today - relativedelta(days=1)
+        c.date_end = prev_end
+        c.signal_close()
+
+        # Ended
+        self.assertEqual(prev_end, c.date_end)
+        self.assertEqual("close", c.state)
+        self.assertEqual("normal", c.kanban_state)
+        self.assertFalse(c.state_ending)
diff --git a/hr_contract_status/tests/test_hr_employee.py b/hr_contract_status/tests/test_hr_employee.py
new file mode 100644
index 00000000..e58f9fa2
--- /dev/null
+++ b/hr_contract_status/tests/test_hr_employee.py
@@ -0,0 +1,109 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+
+from datetime import date, datetime
+
+from dateutil.relativedelta import relativedelta
+
+from odoo.tests import common
+
+
+class TestContract(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super(TestContract, cls).setUpClass()
+
+        cls.HrEmployee = cls.env["hr.employee"]
+        cls.HrContract = cls.env["hr.contract"]
+        cls.Job = cls.env["hr.job"]
+        cls.Dept = cls.env["hr.department"]
+        cls.employee = cls.HrEmployee.create({"name": "John"})
+        cls.test_contract = dict(
+            name="Test", wage=1, employee_id=cls.employee.id, state="draft"
+        )
+        cls.dept_rnd = cls.Dept.create({"name": "R&D"})
+        cls.job_ux_designer = cls.Job.create(
+            {
+                "name": "#UX Designer",
+                "department_id": cls.dept_rnd.id,
+            }
+        )
+
+    def create_contract(self, start, end=None, trial_end=None, state="draft"):
+        return self.env["hr.contract"].create(
+            {
+                "name": "Contract",
+                "employee_id": self.employee.id,
+                "wage": 1,
+                "date_start": start,
+                "trial_date_end": trial_end,
+                "date_end": end,
+                "job_id": self.job_ux_designer.id,
+                "state": state,
+            }
+        )
+
+    def apply_cron(self):
+        self.env.ref(
+            "hr_contract.ir_cron_data_contract_update_state"
+        ).method_direct_trigger()
+
+    def test_new_contract(self):
+        """Creation of employee contract sets department and job"""
+
+        self.assertFalse(self.employee.job_id)
+        self.assertFalse(self.employee.department_id)
+
+        start = datetime.now().date()
+        contract = self.create_contract(start)
+        contract.signal_confirm()
+
+        self.assertEqual(self.job_ux_designer, self.employee.job_id)
+        self.assertEqual(self.dept_rnd, self.employee.department_id)
+
+    def test_new_contract_sets_contract_id(self):
+        """Creation of employee contract sets link to contract"""
+
+        self.assertFalse(self.employee.contract_id)
+
+        start = date.today()
+        trial_end = date.today() + relativedelta(days=60)
+        contract = self.create_contract(start, trial_end=trial_end)
+        contract.signal_confirm()
+
+        self.assertEqual(contract, self.employee.contract_id)
+
+    def test_consecutive_contracts(self):
+        """List of contracts in period includes 'closed' contracts"""
+
+        start = date(2021, 1, 1)
+        end = date(2021, 1, 14)
+        jan_end = date(2021, 1, 31)
+        start2 = start + relativedelta(days=14)
+        cc1 = self.create_contract(start, end=end, state="close")
+        cc2 = self.create_contract(start2)
+        cc2.signal_confirm()
+        contracts = self.employee._get_contracts(start, jan_end)
+        self.assertEqual(cc1.state, "close", "Contract 1 has ended")
+
+        self.assertIn(cc1, contracts, "Contract 1 (closed) is in list of contracts")
+        self.assertIn(cc1, contracts, "Contract 2 (open) is in list of contracts")
+
+    def test_get_trial_contract(self):
+        """_get_contracts() returns 'trial' contracts"""
+
+        start = datetime.now().date()
+        contract = self.create_contract(start, trial_end=start + relativedelta(days=30))
+        contract.signal_confirm()
+
+        self.assertEqual(contract.state, "trial", "The contract is in 'trial' state")
+
+        clist = self.employee._get_contracts(
+            date_from=start, date_to=start + relativedelta(days=30)
+        )
+
+        self.assertIn(
+            contract, clist, "Trial contract is returned in list of contracts"
+        )
diff --git a/hr_contract_status/tests/test_res_config_settings.py b/hr_contract_status/tests/test_res_config_settings.py
new file mode 100644
index 00000000..aafb1d06
--- /dev/null
+++ b/hr_contract_status/tests/test_res_config_settings.py
@@ -0,0 +1,73 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+
+from datetime import datetime
+
+from odoo.exceptions import ValidationError
+from odoo.tests import common
+
+
+class TestContract(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super(TestContract, cls).setUpClass()
+
+        cls.IrConfig = cls.env["ir.config_parameter"]
+        cls.HrEmployee = cls.env["hr.employee"]
+        cls.HrContract = cls.env["hr.contract"]
+        cls.employee = cls.HrEmployee.create({"name": "John"})
+
+    def create_contract(self, state, kanban_state, start, end=None):
+        return self.env["hr.contract"].create(
+            {
+                "name": "Contract",
+                "employee_id": self.employee.id,
+                "state": state,
+                "kanban_state": kanban_state,
+                "wage": 1,
+                "date_start": start,
+                "date_end": end,
+            }
+        )
+
+    def test_no_concurrent_contracts(self):
+        """If concurrent contracts aren't enabled creating a
+        second contract fails"""
+
+        self.assertFalse(
+            self.IrConfig.get_param("hr_contract_status.concurrent_contracts", False)
+        )
+        start = datetime.strptime("2015-11-01", "%Y-%m-%d").date()
+        end = datetime.strptime("2015-11-30", "%Y-%m-%d").date()
+        self.create_contract("open", "normal", start, end)
+
+        # Incoming contract
+        with self.assertRaises(
+            ValidationError,
+            msg="It should not create two contract in state open or incoming",
+        ):
+            start = datetime.strptime("2015-11-15", "%Y-%m-%d").date()
+            end = datetime.strptime("2015-12-30", "%Y-%m-%d").date()
+            self.create_contract("draft", "done", start, end)
+
+    def test_concurrent_contracts(self):
+        """If concurrent contracts are enabled creating more than
+        one open contract suceeds"""
+
+        self.IrConfig.sudo().set_param("hr_contract_status.concurrent_contracts", True)
+        self.assertTrue(
+            self.IrConfig.get_param("hr_contract_status.concurrent_contracts", False)
+        )
+        start = datetime.strptime("2015-11-01", "%Y-%m-%d").date()
+        end = datetime.strptime("2015-11-30", "%Y-%m-%d").date()
+        self.create_contract("open", "normal", start, end)
+
+        # Incoming contract
+        try:
+            start = datetime.strptime("2015-11-15", "%Y-%m-%d").date()
+            end = datetime.strptime("2015-12-30", "%Y-%m-%d").date()
+            self.create_contract("draft", "done", start, end)
+        except ValidationError:
+            self.fail("Unexpected ValidationError exception")
diff --git a/hr_contract_status/views/hr_contract_view.xml b/hr_contract_status/views/hr_contract_view.xml
new file mode 100644
index 00000000..e1cfa09d
--- /dev/null
+++ b/hr_contract_status/views/hr_contract_view.xml
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+
+        <!-- Menus -->
+
+        <menuitem
+            name="Contracts"
+            id="submenu_hr_contracts"
+            parent="hr.menu_hr_root"
+            sequence="4"
+            groups="hr.group_hr_user"
+        />
+
+        <!-- Remove stock Contracts menuitem and put it in the submenu -->
+        <menuitem
+            action="hr_contract.action_hr_contract"
+            id="hr_contract.hr_menu_contract"
+            parent="submenu_hr_contracts"
+            name="Contracts"
+            sequence="10"
+            groups="hr.group_hr_user"
+        />
+
+        <record id="hr_contract_view_tree" model="ir.ui.view">
+            <field name="name">hr.contract.tree.state</field>
+            <field name="model">hr.contract</field>
+            <field name="inherit_id" ref="hr_contract.hr_contract_view_tree" />
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="//field[@name='employee_id']" position="after">
+                        <field name="department_id" />
+                    </xpath>
+                    <xpath expr="//field[@name='date_end']" position="after">
+                        <field name="state" />
+                    </xpath>
+                </data>
+            </field>
+        </record>
+
+        <record id="view_expiring_contracts_tree" model="ir.ui.view">
+            <field name="name">hr.contract.contract.expire.tree</field>
+            <field name="model">hr.contract</field>
+            <field name="arch" type="xml">
+                <tree string="Expiring Contracts">
+                    <field name="employee_id" />
+                    <field name="department_id" />
+                    <field name="job_id" />
+                    <field name="trial_date_end" />
+                    <field name="date_end" />
+                    <field name="state" />
+                </tree>
+            </field>
+        </record>
+        <record id="open_expiring_contracts" model="ir.actions.act_window">
+            <field name="name">Ending Trials &amp; Contracts</field>
+            <field name="res_model">hr.contract</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_expiring_contracts_tree" />
+            <field
+                name="domain"
+            >[('state','in',['trial', 'open']),'|', ('trial_ending', '=', True),('state_ending','=',True)]</field>
+            <field name="help" type="html">
+              <p>
+                There are currently no contracts or trial periods that are about to expire.
+              </p>
+            </field>
+        </record>
+        <menuitem
+            action="open_expiring_contracts"
+            id="menu_expiring_contracts"
+            parent="submenu_hr_contracts"
+            groups="hr.group_hr_user"
+            sequence="20"
+        />
+
+        <record id="view_draft_contracts_tree" model="ir.ui.view">
+            <field name="name">hr.contract.contract.draft.tree</field>
+            <field name="model">hr.contract</field>
+            <field name="arch" type="xml">
+                <tree string="Contracts to be Approved">
+                    <field name="employee_id" />
+                    <field name="department_id" />
+                    <field name="job_id" />
+                    <field name="date_start" />
+                    <field name="trial_date_end" />
+                    <field name="date_end" />
+                    <field name="state" />
+                </tree>
+            </field>
+        </record>
+        <record id="open_draft_contracts" model="ir.actions.act_window">
+            <field name="name">Contracts to be Approved</field>
+            <field name="res_model">hr.contract</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_draft_contracts_tree" />
+            <field name="domain">[('state','in',['draft'])]</field>
+            <field name="help" type="html">
+              <p>
+                There are currently no contracts that need to be approved.
+              </p>
+            </field>
+        </record>
+        <menuitem
+            action="open_draft_contracts"
+            id="menu_draft_contracts"
+            parent="submenu_hr_contracts"
+            groups="hr.group_hr_user"
+            sequence="30"
+        />
+
+       <!-- HR Contract: Form View -->
+       <record id="view_contract_form" model="ir.ui.view">
+           <field name="name">hr.contract.form.inherit.state</field>
+           <field name="model">hr.contract</field>
+           <field name="inherit_id" ref="hr_contract.hr_contract_view_form" />
+           <field name="arch" type="xml">
+               <data>
+                    <xpath expr="//field[@name='state']" position="before">
+                        <button
+                            name="signal_confirm"
+                            type="object"
+                            string="Confirm"
+                            groups="hr_contract.group_hr_contract_manager"
+                            states="draft"
+                            class="oe_highlight"
+                        />
+                        <button
+                            name="signal_close"
+                            type="object"
+                            string="End Contract"
+                            groups="hr_contract.group_hr_contract_manager"
+                            states="trial,open"
+                            class="oe_highlight"
+                        />
+                    </xpath>
+                   <!--
+                   <xpath expr="//field[@name='date_start']" position="replace">
+                       <field name="date_start" class="oe_inline" /> -
+                   </xpath>
+                -->
+                   <xpath expr="//field[@name='date_end']" position="after">
+                       <field name="trial_date_end" />
+                   </xpath>
+              </data>
+           </field>
+       </record>
+
+       <record id="contract_view_init_form" model="ir.ui.view">
+            <field name="name">hr.contract.view.form.contract_init</field>
+            <field name="model">hr.contract</field>
+            <field name="inherit_id" ref="hr_contract_values.hr_contract_view_form" />
+            <field name="priority">99</field>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='job_id']" position="replace">
+                    <field
+                        name="job_id"
+                        attrs="{'invisible': [('state','=','close')]}"
+                    />
+                    <field
+                        name="end_job_id"
+                        attrs="{'invisible': [('state','!=','close')]}"
+                    />
+                </xpath>
+            </field>
+        </record>
+
+        <record id="hr_hr_employee_view_form2" model="ir.ui.view">
+            <field name="name">hr.employee.view.form.contract_state</field>
+            <field name="model">hr.employee</field>
+            <field name="inherit_id" ref="hr_contract.hr_hr_employee_view_form2" />
+            <field name="arch" type="xml">
+                <data>
+                    <xpath
+                        expr="//button[@name='%(hr_contract.act_hr_employee_2_hr_contract)d']"
+                        position="attributes"
+                    >
+                        <attribute
+                            name="groups"
+                        >hr_contract.group_hr_contract_manager,hr.group_hr_user</attribute>
+                    </xpath>
+                </data>
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/hr_contract_status/views/res_config_view.xml b/hr_contract_status/views/res_config_view.xml
new file mode 100644
index 00000000..6530ddbd
--- /dev/null
+++ b/hr_contract_status/views/res_config_view.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+
+        <record id="view_hr_config_contract_state" model="ir.ui.view">
+            <field name="name">hr settings for contract state</field>
+            <field name="model">res.config.settings</field>
+            <field name="inherit_id" ref="hr.res_config_settings_view_form" />
+            <field name="arch" type="xml">
+                <xpath
+                expr="//div[@name='employee_rights_setting_container']"
+                position="after"
+            >
+                    <h2>Employee Contracts</h2>
+                    <div
+                    class="row mt16 o_settings_container"
+                    name="employee_contracts_setting_container"
+                >
+                        <div
+                        class="col-12 col-lg-6 o_setting_box"
+                        title="Allow multiple concurrent employee contracts."
+                    >
+                            <div class="o_setting_left_pane">
+                                <field name="concurrent_contracts" />
+                            </div>
+                            <div class="o_setting_right_pane">
+                                <label for="concurrent_contracts" />
+                                <div class="text-muted">
+                                    Employees can have more than one contract active at a time.
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </xpath>
+            </field>
+        </record>
+
+</odoo>
diff --git a/hr_contract_status_benefit/README.rst b/hr_contract_status_benefit/README.rst
new file mode 100644
index 00000000..396a2bc4
--- /dev/null
+++ b/hr_contract_status_benefit/README.rst
@@ -0,0 +1,62 @@
+=================================
+Employee contract status benefits
+=================================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:4c98f9a0797f595ec1840d7902a0b7ef64ddd81ea972023971bdacbca1499486
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/hr_contract_status_benefit
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+This module creates a linkage between the hr_contract_status and hr_benefit modules. It ensures that when
+an employee is hired all benefit policies with the same start date as the initial contract are also activated.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20hr_contract_status_benefit%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+* Michael Telahun Makonnen
+
+Other credits
+~~~~~~~~~~~~~
+
+* Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/hr_contract_status_benefit>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/hr_contract_status_benefit/__init__.py b/hr_contract_status_benefit/__init__.py
new file mode 100644
index 00000000..86f3c8b1
--- /dev/null
+++ b/hr_contract_status_benefit/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
diff --git a/hr_contract_status_benefit/__manifest__.py b/hr_contract_status_benefit/__manifest__.py
new file mode 100644
index 00000000..15d4ae72
--- /dev/null
+++ b/hr_contract_status_benefit/__manifest__.py
@@ -0,0 +1,21 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Employee contract status benefits",
+    "summary": "Link hr_contract_status with hr_benefit",
+    "version": "15.0.1.0.0",
+    "category": "Human Resources",
+    "images": ["static/src/img/main_screenshot.png"],
+    "license": "AGPL-3",
+    "author": "TREVI Software, Michael Telahun Makonnen",
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "hr",
+        "hr_benefit",
+        "hr_contract_status",
+    ],
+    "data": [],
+    "installable": True,
+}
diff --git a/hr_contract_status_benefit/i18n/hr_contract_status_benefit.pot b/hr_contract_status_benefit/i18n/hr_contract_status_benefit.pot
new file mode 100644
index 00000000..8c879b49
--- /dev/null
+++ b/hr_contract_status_benefit/i18n/hr_contract_status_benefit.pot
@@ -0,0 +1,34 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* hr_contract_status_benefit
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: hr_contract_status_benefit
+#: model:ir.model.fields,field_description:hr_contract_status_benefit.field_hr_contract__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: hr_contract_status_benefit
+#: model:ir.model,name:hr_contract_status_benefit.model_hr_contract
+msgid "Employee Contract"
+msgstr ""
+
+#. module: hr_contract_status_benefit
+#: model:ir.model.fields,field_description:hr_contract_status_benefit.field_hr_contract__id
+msgid "ID"
+msgstr ""
+
+#. module: hr_contract_status_benefit
+#: model:ir.model.fields,field_description:hr_contract_status_benefit.field_hr_contract____last_update
+msgid "Last Modified on"
+msgstr ""
diff --git a/hr_contract_status_benefit/models/__init__.py b/hr_contract_status_benefit/models/__init__.py
new file mode 100644
index 00000000..093ea98b
--- /dev/null
+++ b/hr_contract_status_benefit/models/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import hr_contract
diff --git a/hr_contract_status_benefit/models/hr_contract.py b/hr_contract_status_benefit/models/hr_contract.py
new file mode 100644
index 00000000..f1bf286f
--- /dev/null
+++ b/hr_contract_status_benefit/models/hr_contract.py
@@ -0,0 +1,43 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import date
+
+from odoo import api, fields, models
+
+
+class HrContract(models.Model):
+
+    _inherit = "hr.contract"
+
+    @api.model
+    def update_state(self):
+
+        # New contract
+        contracts = self.search(
+            [
+                ("state", "=", "draft"),
+                ("kanban_state", "=", "done"),
+                ("date_start", "<=", fields.Date.to_string(date.today())),
+            ]
+        )
+        for c in contracts:
+            self.env["hr.benefit.policy"].search(
+                [
+                    ("employee_id", "=", c.employee_id.id),
+                    ("start_date", "=", c.date_start),
+                    ("state", "=", "draft"),
+                ]
+            ).state_open()
+
+        return super().update_state()
+
+    def signal_confirm(self):
+
+        for contract in self:
+            contract.employee_id.benefit_policy_ids.filtered(
+                lambda p: p.start_date == contract.date_start and p.state == "draft"
+            ).state_open()
+
+        return super().signal_confirm()
diff --git a/hr_contract_status_benefit/readme/CREDITS.rst b/hr_contract_status_benefit/readme/CREDITS.rst
new file mode 100644
index 00000000..d264bc7e
--- /dev/null
+++ b/hr_contract_status_benefit/readme/CREDITS.rst
@@ -0,0 +1 @@
+* Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/hr_contract_status_benefit/readme/DESCRIPTION.rst b/hr_contract_status_benefit/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..9ae149df
--- /dev/null
+++ b/hr_contract_status_benefit/readme/DESCRIPTION.rst
@@ -0,0 +1,2 @@
+This module creates a linkage between the hr_contract_status and hr_benefit modules. It ensures that when
+an employee is hired all benefit policies with the same start date as the initial contract are also activated.
diff --git a/hr_contract_status_benefit/static/description/icon.png b/hr_contract_status_benefit/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/hr_contract_status_benefit/static/description/icon.png differ
diff --git a/hr_contract_status_benefit/static/description/index.html b/hr_contract_status_benefit/static/description/index.html
new file mode 100644
index 00000000..709b27e2
--- /dev/null
+++ b/hr_contract_status_benefit/static/description/index.html
@@ -0,0 +1,418 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Employee contract status benefits</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="employee-contract-status-benefits">
+<h1 class="title">Employee contract status benefits</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:4c98f9a0797f595ec1840d7902a0b7ef64ddd81ea972023971bdacbca1499486
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/hr_contract_status_benefit"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<p>This module creates a linkage between the hr_contract_status and hr_benefit modules. It ensures that when
+an employee is hired all benefit policies with the same start date as the initial contract are also activated.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-4">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20hr_contract_status_benefit%0Aversion:%2014.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="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>TREVI Software</li>
+<li>Michael Telahun Makonnen</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-4">Other credits</a></h2>
+<ul class="simple">
+<li>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/hr_contract_status_benefit">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/hr_contract_status_benefit/static/src/img/main_screenshot.png b/hr_contract_status_benefit/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/hr_contract_status_benefit/static/src/img/main_screenshot.png differ
diff --git a/hr_contract_status_benefit/tests/__init__.py b/hr_contract_status_benefit/tests/__init__.py
new file mode 100644
index 00000000..21c82c6f
--- /dev/null
+++ b/hr_contract_status_benefit/tests/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import test_hr_contract_status
diff --git a/hr_contract_status_benefit/tests/test_hr_contract_status.py b/hr_contract_status_benefit/tests/test_hr_contract_status.py
new file mode 100644
index 00000000..82603920
--- /dev/null
+++ b/hr_contract_status_benefit/tests/test_hr_contract_status.py
@@ -0,0 +1,164 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import date
+
+from dateutil.relativedelta import relativedelta
+
+from odoo.tests import common
+
+
+class TestEmployeeStatus(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.Benefit = cls.env["hr.benefit"]
+        cls.Earning = cls.env["hr.benefit.advantage"]
+        cls.Policy = cls.env["hr.benefit.policy"]
+        cls.Employee = cls.env["hr.employee"]
+        cls.Contract = cls.env["hr.contract"]
+        cls.Separation = cls.env["hr.employee.termination"]
+
+        cls.reason = cls.env["hr.employee.termination.reason"].create(
+            {"name": "Retired"}
+        )
+
+    def create_employee(self, name="John Smith"):
+        return self.Employee.create(
+            {
+                "name": name,
+            }
+        )
+
+    def apply_contract_cron(self):
+        self.env.ref(
+            "hr_contract.ir_cron_data_contract_update_state"
+        ).method_direct_trigger()
+
+    def create_contract(
+        self, employee, state, kanban_state, start, end=None, trial_end=None
+    ):
+        return self.env["hr.contract"].create(
+            {
+                "name": "Contract",
+                "employee_id": employee.id,
+                "state": state,
+                "kanban_state": kanban_state,
+                "wage": 1,
+                "date_start": start,
+                "trial_date_end": trial_end,
+                "date_end": end,
+            }
+        )
+
+    def create_benefit(self, vals):
+
+        return self.Benefit.create(vals)
+
+    def create_earning(
+        self,
+        benefit,
+        start=False,
+        ptype="allowance",
+        limit=0,
+        limit_period="monthly",
+        limit_mo_day="1",
+        allowance=0,
+        loan=0,
+        mindays=0,
+    ):
+        _dict = {
+            "benefit_id": benefit.id,
+            "effective_date": start is False and date.today() or start,
+            "type": ptype,
+            "allowance_amount": allowance,
+            "loan_amount": loan,
+            "min_employed_days": mindays,
+        }
+        if ptype == "reimburse":
+            _dict["reim_limit_amount"] = limit
+            _dict["reim_limit_period"] = limit_period
+            _dict["reim_period_month_day"] = limit_mo_day
+        benefit.has_advantage = True
+        return self.Earning.create(_dict)
+
+    def create_policy(
+        self,
+        employee,
+        benefit,
+        start=False,
+        end=False,
+        advantage=False,
+        premium=False,
+        premium_total=False,
+    ):
+        _dict = {
+            "employee_id": employee.id,
+            "benefit_id": benefit.id,
+            "start_date": start is False and date.today() or start,
+            "end_date": end,
+        }
+        if advantage is not False:
+            _dict["advantage_override"] = True
+            _dict["advantage_amount"] = advantage
+        if premium is not False:
+            _dict["premium_override"] = True
+            _dict["premium_override_amount"] = premium
+            _dict["premium_override_total"] = premium_total
+        return self.Policy.create(_dict)
+
+    def create_separation(self, employee, date=None):
+        if date is None:
+            date = date.today()
+        return self.Separation.create(
+            {
+                "name": date,
+                "reason_id": self.reason.id,
+                "employee_id": employee.id,
+            }
+        )
+
+    def test_hire_employee_signal(self):
+
+        start = date.today() - relativedelta(days=100)
+        end = date.today() + relativedelta(days=60)
+        ee = self.create_employee()
+        cc = self.create_contract(ee, "draft", "normal", start, trial_end=end)
+        cc.trial_date_end = date.today() - relativedelta(days=1)
+        self.assertEqual("new", ee.status)
+
+        # create benefit policy
+        bn = self.create_benefit({"name": "B", "code": "B"})
+        self.create_earning(bn, date.today() - relativedelta(days=100), allowance=1000)
+        pol = self.create_policy(ee, bn, date.today() - relativedelta(days=100))
+        self.assertEqual(pol.state, "draft", "The benefit policy is not active yet")
+
+        # Open contract
+        cc.signal_confirm()
+
+        self.assertEqual("open", cc.state)
+        self.assertEqual("active", ee.status)
+        self.assertEqual(pol.state, "open", "The benefit policy is now active")
+
+    def test_hire_employee_cron(self):
+
+        start = date.today() - relativedelta(days=100)
+        end = date.today() + relativedelta(days=60)
+        ee = self.create_employee()
+        cc = self.create_contract(ee, "draft", "done", start, trial_end=end)
+        cc.trial_date_end = date.today() - relativedelta(days=1)
+        self.assertEqual("new", ee.status)
+
+        # create benefit policy
+        bn = self.create_benefit({"name": "B", "code": "B"})
+        self.create_earning(bn, start, allowance=1000)
+        pol = self.create_policy(ee, bn, start)
+        self.assertEqual(pol.state, "draft", "The benefit policy is not active yet")
+
+        # Open contract
+        self.apply_contract_cron()
+
+        self.assertEqual("open", cc.state)
+        self.assertEqual("active", ee.status)
+        self.assertEqual(pol.state, "open", "The benefit policy is now active")
diff --git a/hr_contract_values/README.rst b/hr_contract_values/README.rst
new file mode 100644
index 00000000..db6d4eea
--- /dev/null
+++ b/hr_contract_values/README.rst
@@ -0,0 +1,64 @@
+============================
+Contracts - Initial Settings
+============================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:335d92623aed978491ec2ae93650197b4e43236fd2ac83b982b7332b7003034d
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/hr_contract_values
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+This module defines starting values for new contracts. These include:
+- Starting wage based on job
+- Salary structure
+- Trial period length
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20hr_contract_values%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+* Michael Telahun Makonnen
+
+Other credits
+~~~~~~~~~~~~~
+
+* TREVI Software <https://trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/hr_contract_values>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/hr_contract_values/__init__.py b/hr_contract_values/__init__.py
new file mode 100644
index 00000000..2b0f2dca
--- /dev/null
+++ b/hr_contract_values/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
diff --git a/hr_contract_values/__manifest__.py b/hr_contract_values/__manifest__.py
new file mode 100644
index 00000000..967bdc24
--- /dev/null
+++ b/hr_contract_values/__manifest__.py
@@ -0,0 +1,29 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Contracts - Initial Settings",
+    "version": "15.0.1.0.0",
+    "category": "Human Resources",
+    "license": "AGPL-3",
+    "author": "TREVI Software, Michael Telahun Makonnen",
+    "images": ["static/src/img/main_screenshot.png"],
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "base",
+        "hr",
+        "hr_contract",
+        "trevi_hr_job_categories",
+        "trevi_hr_usability",
+    ],
+    "data": [
+        "security/ir.model.access.csv",
+        "security/ir_rule.xml",
+        "views/hr_contract_view.xml",
+    ],
+    "demo": [
+        "data/hr_contract_values_demo.xml",
+    ],
+    "installable": True,
+}
diff --git a/hr_contract_values/data/hr_contract_values_demo.xml b/hr_contract_values/data/hr_contract_values_demo.xml
new file mode 100644
index 00000000..a95fce9c
--- /dev/null
+++ b/hr_contract_values/data/hr_contract_values_demo.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+
+        <record id="initwage_2000" model="hr.contract.init.wage">
+            <field name="starting_wage">2000</field>
+            <field name="job_id" ref="hr.job_trainee" />
+            <field name="is_default" eval="True" />
+        </record>
+
+        <record id="initwage_5000" model="hr.contract.init.wage">
+            <field name="starting_wage">5000</field>
+            <field name="job_id" ref="hr.job_developer" />
+        </record>
+
+        <record id="default_europe" model="hr.contract.init">
+            <field name="name">Default Contract values for Europe</field>
+            <field name="date" eval="datetime.now().strftime('%Y-1-1')" />
+            <field name="trial_period">90</field>
+            <field name="contract_type" ref="hr_contract.structure_type_employee" />
+            <field
+                name="wage_ids"
+                eval="[(6, 0, [ref('initwage_2000'), ref('initwage_5000')])]"
+            />
+        </record>
+
+    </data>
+</odoo>
diff --git a/hr_contract_values/i18n/hr_contract_values.pot b/hr_contract_values/i18n/hr_contract_values.pot
new file mode 100644
index 00000000..53d42662
--- /dev/null
+++ b/hr_contract_values/i18n/hr_contract_values.pot
@@ -0,0 +1,240 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* hr_contract_values
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: hr_contract_values
+#: code:addons/hr_contract_values/models/hr_contract_wage.py:0
+#: model:ir.model.constraint,message:hr_contract_values.constraint_hr_contract_init_wage_unique_job_cinit
+#, python-format
+msgid ""
+"A Job Position cannot be referenced more than once ina Contract Settings "
+"record."
+msgstr ""
+
+#. module: hr_contract_values
+#: model:ir.model.fields,field_description:hr_contract_values.field_hr_contract_init__active
+msgid "Active"
+msgstr ""
+
+#. module: hr_contract_values
+#: model:ir.model.fields,field_description:hr_contract_values.field_hr_contract_init__company_id
+msgid "Company"
+msgstr ""
+
+#. module: hr_contract_values
+#: model_terms:ir.ui.view,arch_db:hr_contract_values.view_contract_init_form
+#: model_terms:ir.ui.view,arch_db:hr_contract_values.view_contract_init_tree
+msgid "Contract Initial Values"
+msgstr ""
+
+#. module: hr_contract_values
+#: model:ir.model.fields,field_description:hr_contract_values.field_hr_contract_init_wage__contract_init_id
+msgid "Contract Settings"
+msgstr ""
+
+#. module: hr_contract_values
+#: model:ir.actions.act_window,name:hr_contract_values.open_contract_init
+#: model:ir.ui.menu,name:hr_contract_values.menu_hr_contract_init
+msgid "Contract Starting Values"
+msgstr ""
+
+#. module: hr_contract_values
+#: model:ir.model.fields,field_description:hr_contract_values.field_hr_contract_init__contract_type
+msgid "Contract Type"
+msgstr ""
+
+#. module: hr_contract_values
+#: model:ir.model.fields,field_description:hr_contract_values.field_hr_contract_init__create_uid
+#: model:ir.model.fields,field_description:hr_contract_values.field_hr_contract_init_wage__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: hr_contract_values
+#: model:ir.model.fields,field_description:hr_contract_values.field_hr_contract_init__create_date
+#: model:ir.model.fields,field_description:hr_contract_values.field_hr_contract_init_wage__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: hr_contract_values
+#: model:ir.model.fields,field_description:hr_contract_values.field_hr_contract_init_wage__currency_id
+msgid "Currency"
+msgstr ""
+
+#. module: hr_contract_values
+#: model:ir.model.fields,field_description:hr_contract_values.field_hr_contract__display_name
+#: model:ir.model.fields,field_description:hr_contract_values.field_hr_contract_init__display_name
+#: model:ir.model.fields,field_description:hr_contract_values.field_hr_contract_init_wage__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: hr_contract_values
+#: model:ir.model.fields,field_description:hr_contract_values.field_hr_contract_init__date
+msgid "Effective Date"
+msgstr ""
+
+#. module: hr_contract_values
+#: model:ir.model,name:hr_contract_values.model_hr_contract
+msgid "Employee Contract"
+msgstr ""
+
+#. module: hr_contract_values
+#: model:ir.model.fields,help:hr_contract_values.field_hr_contract__wage
+msgid "Employee's monthly gross wage."
+msgstr ""
+
+#. module: hr_contract_values
+#: model:ir.model.fields,help:hr_contract_values.field_hr_contract__trial_date_end
+msgid "End date of the trial period (if there is one)."
+msgstr ""
+
+#. module: hr_contract_values
+#: model:ir.model.fields,field_description:hr_contract_values.field_hr_contract__trial_date_end
+msgid "End of Trial Period"
+msgstr ""
+
+#. module: hr_contract_values
+#: code:addons/hr_contract_values/models/hr_contract_wage.py:0
+#, python-format
+msgid "ErrorYou may not a delete a record that is not in a \"Draft\" state"
+msgstr ""
+
+#. module: hr_contract_values
+#: model:ir.model.fields,field_description:hr_contract_values.field_hr_contract__id
+#: model:ir.model.fields,field_description:hr_contract_values.field_hr_contract_init__id
+#: model:ir.model.fields,field_description:hr_contract_values.field_hr_contract_init_wage__id
+msgid "ID"
+msgstr ""
+
+#. module: hr_contract_values
+#: model:ir.model,name:hr_contract_values.model_hr_contract_init
+msgid "Initial Contract Settings"
+msgstr ""
+
+#. module: hr_contract_values
+#: model_terms:ir.ui.view,arch_db:hr_contract_values.view_contract_init_form
+#: model_terms:ir.ui.view,arch_db:hr_contract_values.view_init_wage_tree
+msgid "Initial Wages"
+msgstr ""
+
+#. module: hr_contract_values
+#: model_terms:ir.ui.view,arch_db:hr_contract_values.view_init_wage_form
+msgid "Intial Wages"
+msgstr ""
+
+#. module: hr_contract_values
+#: model:ir.model.fields,field_description:hr_contract_values.field_hr_contract_init_wage__job_id
+msgid "Job"
+msgstr ""
+
+#. module: hr_contract_values
+#: model:ir.model.fields,field_description:hr_contract_values.field_hr_contract____last_update
+#: model:ir.model.fields,field_description:hr_contract_values.field_hr_contract_init____last_update
+#: model:ir.model.fields,field_description:hr_contract_values.field_hr_contract_init_wage____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: hr_contract_values
+#: model:ir.model.fields,field_description:hr_contract_values.field_hr_contract_init__write_uid
+#: model:ir.model.fields,field_description:hr_contract_values.field_hr_contract_init_wage__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: hr_contract_values
+#: model:ir.model.fields,field_description:hr_contract_values.field_hr_contract_init__write_date
+#: model:ir.model.fields,field_description:hr_contract_values.field_hr_contract_init_wage__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: hr_contract_values
+#: model:ir.model.fields,help:hr_contract_values.field_hr_contract_init__trial_period
+msgid "Length of Trial Period, in days"
+msgstr ""
+
+#. module: hr_contract_values
+#: model_terms:ir.ui.view,arch_db:hr_contract_values.view_contract_init_form
+msgid "Lock"
+msgstr ""
+
+#. module: hr_contract_values
+#: model:ir.model.fields,field_description:hr_contract_values.field_hr_contract_init__locked
+msgid "Locked"
+msgstr ""
+
+#. module: hr_contract_values
+#: model:ir.model.fields,field_description:hr_contract_values.field_hr_contract_init__name
+msgid "Name"
+msgstr ""
+
+#. module: hr_contract_values
+#: model:ir.model.fields,field_description:hr_contract_values.field_hr_contract__structure_type_id
+msgid "Salary Structure Type"
+msgstr ""
+
+#. module: hr_contract_values
+#: model:ir.model.fields,field_description:hr_contract_values.field_hr_contract_init_wage__starting_wage
+msgid "Starting Wage"
+msgstr ""
+
+#. module: hr_contract_values
+#: model:ir.model,name:hr_contract_values.model_hr_contract_init_wage
+#: model:ir.model.fields,field_description:hr_contract_values.field_hr_contract_init__wage_ids
+msgid "Starting Wages"
+msgstr ""
+
+#. module: hr_contract_values
+#: model:ir.model.fields,field_description:hr_contract_values.field_hr_contract_init_wage__category_ids
+msgid "Tags"
+msgstr ""
+
+#. module: hr_contract_values
+#: model:ir.model.fields,field_description:hr_contract_values.field_hr_contract__trial_date_start
+msgid "Trial Date Start"
+msgstr ""
+
+#. module: hr_contract_values
+#: model:ir.model.fields,field_description:hr_contract_values.field_hr_contract_init__trial_period
+msgid "Trial Period"
+msgstr ""
+
+#. module: hr_contract_values
+#: model_terms:ir.ui.view,arch_db:hr_contract_values.view_contract_init_form
+msgid "Unlock"
+msgstr ""
+
+#. module: hr_contract_values
+#: model:ir.model.fields,field_description:hr_contract_values.field_hr_contract_init_wage__is_default
+msgid "Use as Default"
+msgstr ""
+
+#. module: hr_contract_values
+#: model:ir.model.fields,help:hr_contract_values.field_hr_contract_init_wage__is_default
+msgid "Use as default wage"
+msgstr ""
+
+#. module: hr_contract_values
+#: model:ir.model.fields,field_description:hr_contract_values.field_hr_contract__wage
+msgid "Wage"
+msgstr ""
+
+#. module: hr_contract_values
+#: code:addons/hr_contract_values/models/hr_contract.py:0
+#, python-format
+msgid "You may not delete a record that is locked. You must unlock it first."
+msgstr ""
+
+#. module: hr_contract_values
+#: code:addons/hr_contract_values/models/hr_contract.py:0
+#, python-format
+msgid "You may not update a record that is locked. You must unlock it first."
+msgstr ""
diff --git a/hr_contract_values/models/__init__.py b/hr_contract_values/models/__init__.py
new file mode 100644
index 00000000..7d5185b6
--- /dev/null
+++ b/hr_contract_values/models/__init__.py
@@ -0,0 +1,6 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import hr_contract_wage
+from . import hr_contract
diff --git a/hr_contract_values/models/hr_contract.py b/hr_contract_values/models/hr_contract.py
new file mode 100644
index 00000000..532a3b9f
--- /dev/null
+++ b/hr_contract_values/models/hr_contract.py
@@ -0,0 +1,225 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import datetime, timedelta
+
+from odoo import api, fields, models
+from odoo.exceptions import UserError
+from odoo.tools import DEFAULT_SERVER_DATE_FORMAT as OE_DFORMAT
+from odoo.tools.translate import _
+
+
+class ContractInit(models.Model):
+
+    _name = "hr.contract.init"
+    _description = "Initial Contract Settings"
+    _check_company_auto = True
+    # Return records with latest date first
+    _order = "date desc"
+
+    name = fields.Char(
+        string="Name",
+        size=64,
+        required=True,
+    )
+    date = fields.Date(
+        string="Effective Date",
+        required=True,
+    )
+    wage_ids = fields.One2many(
+        comodel_name="hr.contract.init.wage",
+        inverse_name="contract_init_id",
+        string="Starting Wages",
+    )
+    trial_period = fields.Integer(
+        string="Trial Period",
+        default=0,
+        help="Length of Trial Period, in days",
+    )
+    active = fields.Boolean(default=True)
+    locked = fields.Boolean()
+    company_id = fields.Many2one(
+        string="Company",
+        comodel_name="res.company",
+        default=lambda self: self.env.company,
+        groups="base.group_multi_company",
+    )
+    contract_type = fields.Many2one("hr.payroll.structure.type")
+
+    def lock(self):
+        for record in self:
+            record.locked = True
+
+    def unlock(self):
+        for record in self:
+            record.locked = False
+
+    def unlink(self):
+
+        for record in self:
+            if record.locked:
+                raise UserError(
+                    _(
+                        "You may not delete a record that is locked. You must unlock it first."
+                    )
+                )
+        return super(ContractInit, self).unlink()
+
+    def write(self, vals):
+        for record in self:
+            if record.locked:
+                if "locked" in vals.keys():
+                    if vals["locked"] is False:
+                        continue
+                raise UserError(
+                    _(
+                        "You may not update a record that is locked. You must unlock it first."
+                    )
+                )
+        return super(ContractInit, self).write(vals)
+
+
+class HrContract(models.Model):
+
+    _inherit = "hr.contract"
+
+    @api.model
+    def _get_wage(self, job_id=None):
+
+        res = 0
+        default = 0
+        job = False
+        init = self.get_latest_initial_values()
+        if job_id:
+            job = self.env["hr.job"].browse(job_id)
+        else:
+            job = False
+        if init is not None:
+            for line in init.wage_ids:
+                if job_id is not None and line.job_id.id == job_id:
+                    res = line.starting_wage
+                elif job:
+                    cat_id = False
+                    category_ids = [c.id for c in line.category_ids]
+                    for ci in job.category_ids.ids:
+                        if ci in category_ids:
+                            cat_id = ci
+                            break
+                    if cat_id:
+                        res = line.starting_wage
+                if line.is_default and default == 0:
+                    default = line.starting_wage
+                if res != 0:
+                    break
+        if res == 0:
+            res = default
+        return res
+
+    @api.model
+    def _get_trial_date_start(self):
+
+        res = False
+        init = self.get_latest_initial_values()
+        if init is not None and init.trial_period and init.trial_period > 0:
+            res = datetime.now().strftime(OE_DFORMAT)
+        return res
+
+    @api.model
+    def _get_trial_date_end(self):
+
+        return self._get_trial_date_end_from_start(datetime.now().date())
+
+    @api.model
+    def _get_trial_date_end_from_start(self, dToday):
+
+        res = False
+        init = self.get_latest_initial_values()
+        if dToday and init is not None and init.trial_period and init.trial_period > 0:
+            dEnd = dToday + timedelta(days=(init.trial_period))
+            res = dEnd.strftime(OE_DFORMAT)
+        return res
+
+    @api.model
+    def _get_structure_type(self):
+
+        res = False
+        init = self.get_latest_initial_values()
+        if init is not None and init.contract_type:
+            res = init.contract_type
+        return res
+
+    wage = fields.Monetary(default=_get_wage)
+    trial_date_start = fields.Date(default=_get_trial_date_start)
+    trial_date_end = fields.Date(default=_get_trial_date_end)
+    structure_type_id = fields.Many2one(default=_get_structure_type)
+
+    @api.model
+    def create(self, vals):
+
+        # set default wage based on the job
+        if "wage" not in vals.keys() and "job_id" in vals.keys():
+            _wage = self._get_wage(job_id=vals["job_id"])
+            if _wage != 0:
+                vals.update({"wage": _wage})
+
+        return super(HrContract, self).create(vals)
+
+    @api.onchange("job_id")
+    def onchange_job(self):
+
+        for c in self:
+            if c.job_id:
+                c.wage = self._get_wage(job_id=c.job_id.id)
+
+    @api.onchange("trial_date_start")
+    def onchange_trial(self):
+
+        res = {"value": {"trial_date_end": False}}
+
+        init = self.get_latest_initial_values()
+        if init is not None and init.trial_period and init.trial_period > 0:
+            dStart = datetime.strptime(self.trial_date_start, OE_DFORMAT)
+            dEnd = dStart + timedelta(days=(init.trial_period - 1))
+            res["value"]["trial_date_end"] = dEnd.strftime(OE_DFORMAT)
+
+        return res
+
+    @api.model
+    def get_latest_initial_values(self, today_str=None):
+        """Return a record with an effective date before today_str but
+        greater than all others"""
+
+        init_obj = self.env["hr.contract.init"]
+        if today_str is None:
+            today_str = datetime.now().strftime(OE_DFORMAT)
+        dToday = datetime.strptime(today_str, OE_DFORMAT).date()
+        domain = [("date", "<=", today_str)]
+        res = None
+
+        # Get company. If the caller wants to enforce a specific company use
+        # that one, otherwise use the company associated with the parent
+        # user record, if any.
+        #
+        if self.env.context.get("force_company", False):
+            domain = domain + [("company_id", "=", self.env.context["force_company"])]
+        else:
+            if self.env.user.company_id:
+                domain = domain + [("company_id", "=", self.env.user.company_id.id)]
+
+        # If we can't find records for the employee's company, search for
+        # ones without a specific company attached.
+        #
+        ids = init_obj.search(domain)
+        if len(ids) == 0:
+            domain = [("date", "<=", today_str), ("company_id", "=", False)]
+            ids = init_obj.search(domain)
+
+        for init in ids:
+            if init.date <= dToday:
+                if res is None:
+                    res = init
+                elif init.date > res.date:
+                    res = init
+
+        return res
diff --git a/hr_contract_values/models/hr_contract_wage.py b/hr_contract_values/models/hr_contract_wage.py
new file mode 100644
index 00000000..f0d5d6b1
--- /dev/null
+++ b/hr_contract_values/models/hr_contract_wage.py
@@ -0,0 +1,59 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+
+from odoo import fields, models
+from odoo.exceptions import UserError
+from odoo.tools.translate import _
+
+
+class InitWage(models.Model):
+
+    _name = "hr.contract.init.wage"
+    _description = "Starting Wages"
+    _sql_constraints = [
+        (
+            "unique_job_cinit",
+            "UNIQUE(job_id,contract_init_id)",
+            _(
+                "A Job Position cannot be referenced more than once in"
+                "a Contract Settings record."
+            ),
+        )
+    ]
+
+    job_id = fields.Many2one(string="Job", comodel_name="hr.job")
+    starting_wage = fields.Monetary(required=True)
+    currency_id = fields.Many2one("res.currency", "Currency")
+    is_default = fields.Boolean(string="Use as Default", help="Use as default wage")
+    contract_init_id = fields.Many2one(
+        comodel_name="hr.contract.init", string="Contract Settings"
+    )
+    category_ids = fields.Many2many(
+        string="Tags",
+        comodel_name="hr.employee.category",
+        relation="contract_init_category_rel",
+        column1="contract_init_id",
+        column2="category_id",
+    )
+
+    def unlink(self):
+
+        data = self.read(["contract_init_id"])
+        for d in data:
+            if not d.get("contract_init_id", False):
+                continue
+            d2 = (
+                self.env["hr.contract.init"]
+                .browse(d["contract_init_id"][0])
+                .read(["state"])
+            )
+            if d2["state"] in ["approve", "decline"]:
+                raise UserError(
+                    _(
+                        "Error"
+                        'You may not a delete a record that is not in a "Draft" state'
+                    )
+                )
+        return super(InitWage, self).unlink()
diff --git a/hr_contract_values/readme/CREDITS.rst b/hr_contract_values/readme/CREDITS.rst
new file mode 100644
index 00000000..c3b77386
--- /dev/null
+++ b/hr_contract_values/readme/CREDITS.rst
@@ -0,0 +1 @@
+* TREVI Software <https://trevi.et>
diff --git a/hr_contract_values/readme/DESCRIPTION.rst b/hr_contract_values/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..7970f5fb
--- /dev/null
+++ b/hr_contract_values/readme/DESCRIPTION.rst
@@ -0,0 +1,4 @@
+This module defines starting values for new contracts. These include:
+- Starting wage based on job
+- Salary structure
+- Trial period length
diff --git a/hr_contract_values/security/ir.model.access.csv b/hr_contract_values/security/ir.model.access.csv
new file mode 100644
index 00000000..b8d66351
--- /dev/null
+++ b/hr_contract_values/security/ir.model.access.csv
@@ -0,0 +1,5 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_contract_init_hro,access_hr_contract_initial,model_hr_contract_init,hr.group_hr_user,1,0,0,0
+access_hr_contract_init_hrm,access_hr_contract_initial,model_hr_contract_init,hr_contract.group_hr_contract_manager,1,1,1,1
+access_hr_contract_init_wage_hro,access_hr_contract_initial_wage,model_hr_contract_init_wage,hr.group_hr_user,1,0,0,0
+access_hr_contract_init_wage_hrm,access_hr_contract_initial_wage,model_hr_contract_init_wage,hr_contract.group_hr_contract_manager,1,1,1,1
diff --git a/hr_contract_values/security/ir_rule.xml b/hr_contract_values/security/ir_rule.xml
new file mode 100644
index 00000000..8ec1616f
--- /dev/null
+++ b/hr_contract_values/security/ir_rule.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" ?>
+<odoo>
+    <data>
+
+        <record model="ir.rule" id="contract_init_shared_company_rule">
+            <field
+                name="name"
+            >Shared Contract Initial Values Record: multi-company</field>
+            <field name="model_id" ref="model_hr_contract_init" />
+            <field name="global" eval="True" />
+            <field name="domain_force">
+                ['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/hr_contract_values/static/description/icon.png b/hr_contract_values/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/hr_contract_values/static/description/icon.png differ
diff --git a/hr_contract_values/static/description/index.html b/hr_contract_values/static/description/index.html
new file mode 100644
index 00000000..95e75eaa
--- /dev/null
+++ b/hr_contract_values/static/description/index.html
@@ -0,0 +1,420 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Contracts - Initial Settings</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="contracts-initial-settings">
+<h1 class="title">Contracts - Initial Settings</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:335d92623aed978491ec2ae93650197b4e43236fd2ac83b982b7332b7003034d
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/hr_contract_values"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<p>This module defines starting values for new contracts. These include:
+- Starting wage based on job
+- Salary structure
+- Trial period length</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-4">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20hr_contract_values%0Aversion:%2014.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="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>TREVI Software</li>
+<li>Michael Telahun Makonnen</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-4">Other credits</a></h2>
+<ul class="simple">
+<li>TREVI Software &lt;<a class="reference external" href="https://trevi.et">https://trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/hr_contract_values">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/hr_contract_values/static/src/img/main_screenshot.png b/hr_contract_values/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/hr_contract_values/static/src/img/main_screenshot.png differ
diff --git a/hr_contract_values/tests/__init__.py b/hr_contract_values/tests/__init__.py
new file mode 100644
index 00000000..89a1d3f9
--- /dev/null
+++ b/hr_contract_values/tests/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+
+from . import test_hr_contract_init
diff --git a/hr_contract_values/tests/test_hr_contract_init.py b/hr_contract_values/tests/test_hr_contract_init.py
new file mode 100644
index 00000000..7b698bae
--- /dev/null
+++ b/hr_contract_values/tests/test_hr_contract_init.py
@@ -0,0 +1,210 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+
+from odoo import fields
+from odoo.exceptions import UserError
+from odoo.tests import common
+
+
+class TestContractInit(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super(TestContractInit, cls).setUpClass()
+
+        cls.HrEmployee = cls.env["hr.employee"]
+        cls.HrContract = cls.env["hr.contract"]
+        cls.HrJob = cls.env["hr.job"]
+        cls.HrCategory = cls.env["hr.employee.category"]
+        cls.HrContractInit = cls.env["hr.contract.init"]
+
+        # -- Categories
+        cls.category_it = cls.HrCategory.create({"name": "#IT", "employee_ids": False})
+        cls.category_marketing = cls.HrCategory.create(
+            {"name": "#Marketing", "employee_ids": False}
+        )
+
+        # -- Jobs
+        cls.job_mkt_director = cls.HrJob.create(
+            {
+                "name": "#Marketing Director",
+                "category_ids": [(4, cls.category_marketing.id)],
+            }
+        )
+        cls.job_ux_designer = cls.HrJob.create(
+            {
+                "name": "#UX Designer",
+                "category_ids": [(4, cls.category_it.id)],
+            }
+        )
+
+        cls.eeJohn = cls.HrEmployee.create({"name": "John"})
+
+    def test_load_latest_values(self):
+        """Initial values are loaded from the latest values"""
+
+        countInits = self.HrContractInit.search_count([])
+
+        # Create two init values
+        self.HrContractInit.create(
+            {
+                "name": "Way in the past",
+                "date": "2000-01-01",
+                "trial_period": 45,
+            }
+        )
+        rightInit = self.HrContractInit.create(
+            {
+                "name": "Today",
+                "date": fields.Date.today(),
+                "trial_period": 60,
+            }
+        )
+
+        contract = self.HrContract.create(
+            {
+                "name": "C1",
+                "employee_id": self.eeJohn.id,
+                "wage": 1.0,
+            }
+        )
+        delta = (contract.trial_date_end - contract.trial_date_start).days
+        cInits = self.HrContractInit.search([])
+        self.assertEqual(countInits + 2, len(cInits))
+        self.assertEqual(delta, rightInit.trial_period)
+
+    def test_delete_locked(self):
+        """Unlinking locked record raises an error"""
+
+        cInit = self.HrContractInit.create(
+            {
+                "name": "Way in the past",
+                "date": "2000-01-01",
+                "trial_period": 45,
+            }
+        )
+        cInit.lock()
+        with self.assertRaises(UserError):
+            cInit.unlink()
+
+    def test_write_locked(self):
+        """Updating a locked record raises a UserError"""
+
+        cInit = self.HrContractInit.create(
+            {
+                "name": "Way in the past",
+                "date": "2000-01-01",
+                "trial_period": 45,
+            }
+        )
+        cInit.lock()
+        with self.assertRaises(UserError):
+            cInit.trial_period = 100
+
+    def test_lock_then_unlock(self):
+        """Lock a record then unlock it and write to it"""
+
+        cInit = self.HrContractInit.create(
+            {
+                "name": "Way in the past",
+                "date": "2000-01-01",
+                "trial_period": 45,
+            }
+        )
+        cInit.lock()
+        with self.assertRaises(UserError):
+            cInit.trial_period = 100
+        cInit.unlock()
+        try:
+            cInit.trial_period = 80
+        except UserError:
+            self.fail("An unexpected UserError exception was raised!")
+
+    def test_get_wage_default(self):
+        """Creating a contract with a default initial value succeeds"""
+
+        self.HrContractInit.create(
+            {
+                "name": "Today",
+                "date": fields.Date.today(),
+                "trial_period": 60,
+                "wage_ids": [(0, 0, {"starting_wage": 1000, "is_default": True})],
+            }
+        )
+        contract = self.HrContract.create(
+            {
+                "name": "C1",
+                "employee_id": self.eeJohn.id,
+            }
+        )
+        self.assertEqual(1000, contract.wage)
+
+    def test_get_wage_by_job_id(self):
+        """Creating a contract with a job that has an applicable initial value succeeds"""
+
+        self.HrContractInit.create(
+            {
+                "name": "Today",
+                "date": fields.Date.today(),
+                "trial_period": 60,
+                "wage_ids": [
+                    (
+                        0,
+                        0,
+                        {
+                            "job_id": self.job_mkt_director.id,
+                            "starting_wage": 1000,
+                            "is_default": True,
+                        },
+                    ),
+                    (0, 0, {"job_id": self.job_ux_designer.id, "starting_wage": 2000}),
+                ],
+            }
+        )
+        contract = self.HrContract.create(
+            {
+                "name": "C1",
+                "employee_id": self.eeJohn.id,
+                "job_id": self.job_ux_designer.id,
+            }
+        )
+        self.assertEqual(2000, contract.wage)
+
+    def test_get_wage_by_category(self):
+        """Creating a contract with a job category that has an
+        applicable initial value succeeds"""
+
+        self.HrContractInit.create(
+            {
+                "name": "Today",
+                "date": fields.Date.today(),
+                "trial_period": 60,
+                "wage_ids": [
+                    (
+                        0,
+                        0,
+                        {
+                            "job_id": self.job_mkt_director.id,
+                            "starting_wage": 1000,
+                            "is_default": True,
+                        },
+                    ),
+                    (
+                        0,
+                        0,
+                        {
+                            "starting_wage": 2000,
+                            "category_ids": [(4, self.category_it.id)],
+                        },
+                    ),
+                ],
+            }
+        )
+        contract = self.HrContract.create(
+            {
+                "name": "C1",
+                "employee_id": self.eeJohn.id,
+                "job_id": self.job_ux_designer.id,
+            }
+        )
+        self.assertEqual(2000, contract.wage)
diff --git a/hr_contract_values/views/hr_contract_view.xml b/hr_contract_values/views/hr_contract_view.xml
new file mode 100644
index 00000000..01ebb1ef
--- /dev/null
+++ b/hr_contract_values/views/hr_contract_view.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+
+        <record id="view_contract_init_tree" model="ir.ui.view">
+            <field name="name">hr.contract.init.tree</field>
+            <field name="model">hr.contract.init</field>
+            <field name="arch" type="xml">
+                <tree string="Contract Initial Values">
+                    <field name="name" />
+                    <field name="date" />
+                    <field name="trial_period" />
+                    <field name="contract_type" />
+                    <field name="locked" />
+                    <field name="company_id" groups="base.group_multi_company" />
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_contract_init_form" model="ir.ui.view">
+            <field name="name">hr.contract.init.form</field>
+            <field name="model">hr.contract.init</field>
+            <field name="arch" type="xml">
+                <form string="Contract Initial Values">
+                    <header>
+                        <button
+                            name="lock"
+                            class="fa fa-lock"
+                            type="object"
+                            string="Lock"
+                        />
+                        <button
+                            name="unlock"
+                            class="fa fa-unlock"
+                            type="object"
+                            string="Unlock"
+                        />
+                    </header>
+                    <label for="name" class="oe_edit_only" />
+                    <h1>
+                        <field name="name" />
+                    </h1>
+                    <group>
+                        <group name="grp1">
+                            <field name="date" />
+                            <field name="trial_period" />
+                            <field
+                                name="company_id"
+                                groups="base.group_multi_company"
+                            />
+                        </group>
+                        <group name="grp2">
+                            <field name="contract_type" />
+                        </group>
+                    </group>
+                    <group string="Initial Wages">
+                        <field name="wage_ids" nolabel="1">
+                            <tree string="Initial Wages" editable="bottom">
+                                <field name="category_ids" widget="many2many_tags" />
+                                <field name="job_id" />
+                                <field name="starting_wage" />
+                                <field name="is_default" />
+                            </tree>
+                        </field>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="open_contract_init" model="ir.actions.act_window">
+            <field name="name">Contract Starting Values</field>
+            <field name="res_model">hr.contract.init</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem
+            action="open_contract_init"
+            id="menu_hr_contract_init"
+            parent="hr.menu_human_resources_configuration"
+            sequence="4"
+        />
+
+        <!-- Initial Wages -->
+
+        <record id="view_init_wage_tree" model="ir.ui.view">
+            <field name="name">hr.contract.init.wage.tree</field>
+            <field name="model">hr.contract.init.wage</field>
+            <field name="arch" type="xml">
+                <tree string="Initial Wages">
+                    <field name="category_ids" widget="many2many_tags" />
+                    <field name="job_id" />
+                    <field name="starting_wage" />
+                    <field name="is_default" />
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_init_wage_form" model="ir.ui.view">
+            <field name="name">hr.contract.init.wage.form</field>
+            <field name="model">hr.contract.init.wage</field>
+            <field name="arch" type="xml">
+                <form string="Intial Wages">
+                    <group>
+                        <group>
+                            <field name="job_id" />
+                            <field name="starting_wage" />
+                            <field name="is_default" />
+                        </group>
+                        <group>
+                            <field name="category_ids" widget="many2many_tags" />
+                        </group>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <!-- Contract -->
+
+        <record id="hr_contract_view_form" model="ir.ui.view">
+            <field name="name">hr.contract.view.form.contract_init</field>
+            <field name="model">hr.contract</field>
+            <field name="inherit_id" ref="trevi_hr_usability.view_contract_form" />
+            <field name="priority">100</field>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='job_id']" position="replace">
+                    <field
+                        name="job_id"
+                        required="1"
+                        domain="[('department_id', '=', employee_dept_id)]"
+                    />
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/hr_contract_values_payroll/README.rst b/hr_contract_values_payroll/README.rst
new file mode 100644
index 00000000..d4e8b5d2
--- /dev/null
+++ b/hr_contract_values_payroll/README.rst
@@ -0,0 +1,69 @@
+===========================================
+Contract Payroll Structure Initial Settings
+===========================================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:565961ea2d052b1ea27720792d9884715e1586df2e9afbd4804f84b06a067381
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/hr_contract_values_payroll
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+This module provides a linkage between the hr_contract_values and payroll modules.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Changelog
+=========
+
+14.0.1.1.0 (2021-10-07)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* [ADD] The salary structure field was added to Contract Initial Values tree view
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20hr_contract_values_payroll%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+* Michael Telahun Makonnen
+
+Other credits
+~~~~~~~~~~~~~
+
+* TREVI Software <https://trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/hr_contract_values_payroll>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/hr_contract_values_payroll/__init__.py b/hr_contract_values_payroll/__init__.py
new file mode 100644
index 00000000..2b0f2dca
--- /dev/null
+++ b/hr_contract_values_payroll/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
diff --git a/hr_contract_values_payroll/__manifest__.py b/hr_contract_values_payroll/__manifest__.py
new file mode 100644
index 00000000..66f42849
--- /dev/null
+++ b/hr_contract_values_payroll/__manifest__.py
@@ -0,0 +1,26 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Contract Payroll Structure Initial Settings",
+    "version": "15.0.1.0.0",
+    "category": "Payroll",
+    "license": "AGPL-3",
+    "author": "TREVI Software, Michael Telahun Makonnen",
+    "images": ["static/src/img/main_screenshot.png"],
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "hr_contract",
+        "hr_contract_values",
+        "payroll",
+    ],
+    "data": [
+        "security/ir.model.access.csv",
+        "views/hr_contract_init_view.xml",
+    ],
+    "demo": [
+        "data/hr_contract_values_demo.xml",
+    ],
+    "installable": True,
+}
diff --git a/hr_contract_values_payroll/data/hr_contract_values_demo.xml b/hr_contract_values_payroll/data/hr_contract_values_demo.xml
new file mode 100644
index 00000000..6967eb03
--- /dev/null
+++ b/hr_contract_values_payroll/data/hr_contract_values_demo.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+
+        <record id="hr_contract_values.default_europe" model="hr.contract.init">
+            <field name="struct_id" ref="payroll.structure_base" />
+        </record>
+
+        <!-- Amend demo contracts -->
+
+        <record id="hr_contract.hr_contract_admin" model="hr.contract">
+            <field name="struct_id" ref="payroll.structure_base" />
+        </record>
+        <record id="hr_contract.hr_contract_al" model="hr.contract">
+            <field name="struct_id" ref="payroll.structure_base" />
+        </record>
+        <record id="hr_contract.hr_contract_mit" model="hr.contract">
+            <field name="struct_id" ref="payroll.structure_base" />
+        </record>
+        <record id="hr_contract.hr_contract_stw" model="hr.contract">
+            <field name="struct_id" ref="payroll.structure_base" />
+        </record>
+        <record id="hr_contract.hr_contract_qdp" model="hr.contract">
+            <field name="struct_id" ref="payroll.structure_base" />
+        </record>
+        <record id="hr_contract.hr_contract_han" model="hr.contract">
+            <field name="struct_id" ref="payroll.structure_base" />
+        </record>
+        <record id="hr_contract.hr_contract_niv" model="hr.contract">
+            <field name="struct_id" ref="payroll.structure_base" />
+        </record>
+        <record id="hr_contract.hr_contract_jth" model="hr.contract">
+            <field name="struct_id" ref="payroll.structure_base" />
+        </record>
+        <record id="hr_contract.hr_contract_chs" model="hr.contract">
+            <field name="struct_id" ref="payroll.structure_base" />
+        </record>
+        <record id="hr_contract.hr_contract_jve" model="hr.contract">
+            <field name="struct_id" ref="payroll.structure_base" />
+        </record>
+        <record id="hr_contract.hr_contract_fme" model="hr.contract">
+            <field name="struct_id" ref="payroll.structure_base" />
+        </record>
+        <record id="hr_contract.hr_contract_fpi" model="hr.contract">
+            <field name="struct_id" ref="payroll.structure_base" />
+        </record>
+        <record id="hr_contract.hr_contract_vad" model="hr.contract">
+            <field name="struct_id" ref="payroll.structure_base" />
+        </record>
+
+    </data>
+</odoo>
diff --git a/hr_contract_values_payroll/i18n/hr_contract_values_payroll.pot b/hr_contract_values_payroll/i18n/hr_contract_values_payroll.pot
new file mode 100644
index 00000000..3ebb12f7
--- /dev/null
+++ b/hr_contract_values_payroll/i18n/hr_contract_values_payroll.pot
@@ -0,0 +1,52 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* hr_contract_values_payroll
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: hr_contract_values_payroll
+#: model:ir.model.fields,field_description:hr_contract_values_payroll.field_hr_contract__display_name
+#: model:ir.model.fields,field_description:hr_contract_values_payroll.field_hr_contract_init__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: hr_contract_values_payroll
+#: model:ir.model,name:hr_contract_values_payroll.model_hr_contract
+msgid "Employee Contract"
+msgstr ""
+
+#. module: hr_contract_values_payroll
+#: model:ir.model.fields,field_description:hr_contract_values_payroll.field_hr_contract__id
+#: model:ir.model.fields,field_description:hr_contract_values_payroll.field_hr_contract_init__id
+msgid "ID"
+msgstr ""
+
+#. module: hr_contract_values_payroll
+#: model:ir.model,name:hr_contract_values_payroll.model_hr_contract_init
+msgid "Initial Contract Settings"
+msgstr ""
+
+#. module: hr_contract_values_payroll
+#: model:ir.model.fields,field_description:hr_contract_values_payroll.field_hr_contract____last_update
+#: model:ir.model.fields,field_description:hr_contract_values_payroll.field_hr_contract_init____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: hr_contract_values_payroll
+#: model:ir.model.fields,field_description:hr_contract_values_payroll.field_hr_contract_init__struct_id
+msgid "Payroll Structure"
+msgstr ""
+
+#. module: hr_contract_values_payroll
+#: model:ir.model.fields,field_description:hr_contract_values_payroll.field_hr_contract__struct_id
+msgid "Salary Structure"
+msgstr ""
diff --git a/hr_contract_values_payroll/models/__init__.py b/hr_contract_values_payroll/models/__init__.py
new file mode 100644
index 00000000..e271a20c
--- /dev/null
+++ b/hr_contract_values_payroll/models/__init__.py
@@ -0,0 +1,6 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import hr_contract
+from . import hr_contract_init
diff --git a/hr_contract_values_payroll/models/hr_contract.py b/hr_contract_values_payroll/models/hr_contract.py
new file mode 100644
index 00000000..aa1fd73f
--- /dev/null
+++ b/hr_contract_values_payroll/models/hr_contract.py
@@ -0,0 +1,21 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+
+from odoo import api, fields, models
+
+
+class HrContract(models.Model):
+    _inherit = "hr.contract"
+
+    @api.model
+    def _get_struct(self):
+
+        res = False
+        init = self.get_latest_initial_values()
+        if init is not None and init.struct_id:
+            res = init.struct_id.id
+        return res
+
+    struct_id = fields.Many2one(default=_get_struct)
diff --git a/hr_contract_values_payroll/models/hr_contract_init.py b/hr_contract_values_payroll/models/hr_contract_init.py
new file mode 100644
index 00000000..88c42b4c
--- /dev/null
+++ b/hr_contract_values_payroll/models/hr_contract_init.py
@@ -0,0 +1,15 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+
+from odoo import fields, models
+
+
+class HrContractInit(models.Model):
+    _inherit = "hr.contract.init"
+
+    struct_id = fields.Many2one(
+        comodel_name="hr.payroll.structure",
+        string="Payroll Structure",
+    )
diff --git a/hr_contract_values_payroll/readme/CREDITS.rst b/hr_contract_values_payroll/readme/CREDITS.rst
new file mode 100644
index 00000000..c3b77386
--- /dev/null
+++ b/hr_contract_values_payroll/readme/CREDITS.rst
@@ -0,0 +1 @@
+* TREVI Software <https://trevi.et>
diff --git a/hr_contract_values_payroll/readme/DESCRIPTION.rst b/hr_contract_values_payroll/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..b61d438e
--- /dev/null
+++ b/hr_contract_values_payroll/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+This module provides a linkage between the hr_contract_values and payroll modules.
diff --git a/hr_contract_values_payroll/readme/HISTORY.rst b/hr_contract_values_payroll/readme/HISTORY.rst
new file mode 100644
index 00000000..a23c3fa8
--- /dev/null
+++ b/hr_contract_values_payroll/readme/HISTORY.rst
@@ -0,0 +1,4 @@
+14.0.1.1.0 (2021-10-07)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* [ADD] The salary structure field was added to Contract Initial Values tree view
diff --git a/hr_contract_values_payroll/security/ir.model.access.csv b/hr_contract_values_payroll/security/ir.model.access.csv
new file mode 100644
index 00000000..d82cd07a
--- /dev/null
+++ b/hr_contract_values_payroll/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_contract_init_payroll,access_hr_contract_initial,hr_contract_values.model_hr_contract_init,payroll.group_payroll_manager,1,0,0,0
+access_hr_contract_init_wage_payroll,access_hr_contract_initial_wage,hr_contract_values.model_hr_contract_init_wage,payroll.group_payroll_manager,1,0,0,0
diff --git a/hr_contract_values_payroll/static/description/icon.png b/hr_contract_values_payroll/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/hr_contract_values_payroll/static/description/icon.png differ
diff --git a/hr_contract_values_payroll/static/description/index.html b/hr_contract_values_payroll/static/description/index.html
new file mode 100644
index 00000000..2dfe684c
--- /dev/null
+++ b/hr_contract_values_payroll/static/description/index.html
@@ -0,0 +1,430 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Contract Payroll Structure Initial Settings</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="contract-payroll-structure-initial-settings">
+<h1 class="title">Contract Payroll Structure Initial Settings</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:565961ea2d052b1ea27720792d9884715e1586df2e9afbd4804f84b06a067381
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/hr_contract_values_payroll"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<p>This module provides a linkage between the hr_contract_values and payroll 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="toc-entry-1">Changelog</a><ul>
+<li><a class="reference internal" href="#section-1" id="toc-entry-2">14.0.1.1.0 (2021-10-07)</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-3">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-4">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-5">Authors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-6">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-7">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="changelog">
+<h1><a class="toc-backref" href="#toc-entry-1">Changelog</a></h1>
+<div class="section" id="section-1">
+<h2><a class="toc-backref" href="#toc-entry-2">14.0.1.1.0 (2021-10-07)</a></h2>
+<ul class="simple">
+<li>[ADD] The salary structure field was added to Contract Initial Values tree view</li>
+</ul>
+</div>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20hr_contract_values_payroll%0Aversion:%2014.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="#toc-entry-4">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-5">Authors</a></h2>
+<ul class="simple">
+<li>TREVI Software</li>
+<li>Michael Telahun Makonnen</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-6">Other credits</a></h2>
+<ul class="simple">
+<li>TREVI Software &lt;<a class="reference external" href="https://trevi.et">https://trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/hr_contract_values_payroll">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/hr_contract_values_payroll/static/src/img/main_screenshot.png b/hr_contract_values_payroll/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/hr_contract_values_payroll/static/src/img/main_screenshot.png differ
diff --git a/hr_contract_values_payroll/tests/__init__.py b/hr_contract_values_payroll/tests/__init__.py
new file mode 100644
index 00000000..89a1d3f9
--- /dev/null
+++ b/hr_contract_values_payroll/tests/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+
+from . import test_hr_contract_init
diff --git a/hr_contract_values_payroll/tests/test_hr_contract_init.py b/hr_contract_values_payroll/tests/test_hr_contract_init.py
new file mode 100644
index 00000000..dc044fce
--- /dev/null
+++ b/hr_contract_values_payroll/tests/test_hr_contract_init.py
@@ -0,0 +1,55 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+
+from odoo import fields
+from odoo.tests import common
+
+
+class TestContractInit(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super(TestContractInit, cls).setUpClass()
+
+        cls.HrEmployee = cls.env["hr.employee"]
+        cls.HrContract = cls.env["hr.contract"]
+        cls.HrPayrollStruct = cls.env["hr.payroll.structure"]
+        cls.HrContractInit = cls.env["hr.contract.init"]
+
+        cls.eeJohn = cls.HrEmployee.create({"name": "John"})
+
+    def test_load_latest_values(self):
+        """Initial values are loaded from the latest values"""
+
+        psA = self.HrPayrollStruct.create({"name": "S A", "code": "A"})
+        psB = self.HrPayrollStruct.create({"name": "S B", "code": "B"})
+        countInits = self.HrContractInit.search_count([])
+
+        # Create two init values
+        self.HrContractInit.create(
+            {
+                "name": "Way in the past",
+                "date": "2000-01-01",
+                "trial_period": 45,
+                "struct_id": psA.id,
+            }
+        )
+        self.HrContractInit.create(
+            {
+                "name": "Today",
+                "date": fields.Date.today(),
+                "trial_period": 60,
+                "struct_id": psB.id,
+            }
+        )
+
+        contract = self.HrContract.create(
+            {
+                "name": "C1",
+                "employee_id": self.eeJohn.id,
+                "wage": 1.0,
+            }
+        )
+        cInits = self.HrContractInit.search([])
+        self.assertEqual(countInits + 2, len(cInits))
+        self.assertEqual(psB.id, contract.struct_id.id)
diff --git a/hr_contract_values_payroll/views/hr_contract_init_view.xml b/hr_contract_values_payroll/views/hr_contract_init_view.xml
new file mode 100644
index 00000000..40f143d7
--- /dev/null
+++ b/hr_contract_values_payroll/views/hr_contract_init_view.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+
+        <record id="view_contract_init_form" model="ir.ui.view">
+            <field name="name">hr.contract.init.view.form.payroll</field>
+            <field name="model">hr.contract.init</field>
+            <field name="inherit_id" ref="hr_contract_values.view_contract_init_form" />
+            <field name="priority">100</field>
+            <field name="arch" type="xml">
+                <xpath expr="//group[@name='grp2']" position="inside">
+                    <field name="struct_id" />
+                </xpath>
+            </field>
+        </record>
+
+        <record id="view_contract_init_tree" model="ir.ui.view">
+            <field name="name">hr.contract.init.view.tree.payroll</field>
+            <field name="model">hr.contract.init</field>
+            <field name="inherit_id" ref="hr_contract_values.view_contract_init_tree" />
+            <field name="priority">100</field>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='trial_period']" position="after">
+                    <field name="struct_id" />
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/hr_contract_values_resource_schedule/README.rst b/hr_contract_values_resource_schedule/README.rst
new file mode 100644
index 00000000..83d95489
--- /dev/null
+++ b/hr_contract_values_resource_schedule/README.rst
@@ -0,0 +1,61 @@
+=========================================
+Employee working hours in contract values
+=========================================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:8025532ff2c53499b5e80ed53924c523fbc9718b674550910b1bf756d69bfa58
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/hr_contract_values_resource_schedule
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+This module provides a linkage between hr_contract_values and resource_schedule. You can designate a working calendar to be the default calendar for newly created contracts.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20hr_contract_values_resource_schedule%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+* Michael Telahun Makonnen
+
+Other credits
+~~~~~~~~~~~~~
+
+* Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/hr_contract_values_resource_schedule>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/hr_contract_values_resource_schedule/__init__.py b/hr_contract_values_resource_schedule/__init__.py
new file mode 100644
index 00000000..f4515d9a
--- /dev/null
+++ b/hr_contract_values_resource_schedule/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013,2014 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
diff --git a/hr_contract_values_resource_schedule/__manifest__.py b/hr_contract_values_resource_schedule/__manifest__.py
new file mode 100644
index 00000000..e905e463
--- /dev/null
+++ b/hr_contract_values_resource_schedule/__manifest__.py
@@ -0,0 +1,25 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Employee working hours in contract values",
+    "summary": "Set working hours in default contract values.",
+    "version": "15.0.1.0.0",
+    "category": "Human Resources",
+    "license": "AGPL-3",
+    "author": "TREVI Software, Michael Telahun Makonnen",
+    "images": ["static/src/img/main_screenshot.png"],
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "hr_contract",
+        "hr_contract_values",
+        "resource_schedule",
+    ],
+    "data": [
+        "views/hr_contract_init_views.xml",
+    ],
+    "demo": [
+        "data/hr_contract_values_demo.xml",
+    ],
+    "installable": True,
+}
diff --git a/hr_contract_values_resource_schedule/data/hr_contract_values_demo.xml b/hr_contract_values_resource_schedule/data/hr_contract_values_demo.xml
new file mode 100644
index 00000000..afec3a24
--- /dev/null
+++ b/hr_contract_values_resource_schedule/data/hr_contract_values_demo.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+
+        <record id="hr_contract_values.default_europe" model="hr.contract.init">
+            <field
+                name="resource_calendar_id"
+                ref="resource_schedule.resource_calendar_44h"
+            />
+        </record>
+
+    </data>
+</odoo>
diff --git a/hr_contract_values_resource_schedule/i18n/hr_contract_values_resource_schedule.pot b/hr_contract_values_resource_schedule/i18n/hr_contract_values_resource_schedule.pot
new file mode 100644
index 00000000..c4da1a22
--- /dev/null
+++ b/hr_contract_values_resource_schedule/i18n/hr_contract_values_resource_schedule.pot
@@ -0,0 +1,57 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* hr_contract_values_resource_schedule
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: hr_contract_values_resource_schedule
+#: model:ir.model.fields,field_description:hr_contract_values_resource_schedule.field_hr_contract__display_name
+#: model:ir.model.fields,field_description:hr_contract_values_resource_schedule.field_hr_contract_init__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: hr_contract_values_resource_schedule
+#: model:ir.model,name:hr_contract_values_resource_schedule.model_hr_contract
+msgid "Employee Contract"
+msgstr ""
+
+#. module: hr_contract_values_resource_schedule
+#: model:ir.model.fields,help:hr_contract_values_resource_schedule.field_hr_contract__resource_calendar_id
+msgid "Employee's working schedule."
+msgstr ""
+
+#. module: hr_contract_values_resource_schedule
+#: model:ir.model.fields,field_description:hr_contract_values_resource_schedule.field_hr_contract__id
+#: model:ir.model.fields,field_description:hr_contract_values_resource_schedule.field_hr_contract_init__id
+msgid "ID"
+msgstr ""
+
+#. module: hr_contract_values_resource_schedule
+#: model:ir.model,name:hr_contract_values_resource_schedule.model_hr_contract_init
+msgid "Initial Contract Settings"
+msgstr ""
+
+#. module: hr_contract_values_resource_schedule
+#: model:ir.model.fields,field_description:hr_contract_values_resource_schedule.field_hr_contract____last_update
+#: model:ir.model.fields,field_description:hr_contract_values_resource_schedule.field_hr_contract_init____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: hr_contract_values_resource_schedule
+#: model:ir.model.fields,field_description:hr_contract_values_resource_schedule.field_hr_contract_init__resource_calendar_id
+msgid "Working Hours"
+msgstr ""
+
+#. module: hr_contract_values_resource_schedule
+#: model:ir.model.fields,field_description:hr_contract_values_resource_schedule.field_hr_contract__resource_calendar_id
+msgid "Working Schedule"
+msgstr ""
diff --git a/hr_contract_values_resource_schedule/models/__init__.py b/hr_contract_values_resource_schedule/models/__init__.py
new file mode 100644
index 00000000..3e4dab6b
--- /dev/null
+++ b/hr_contract_values_resource_schedule/models/__init__.py
@@ -0,0 +1,6 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013,2014 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import hr_contract
+from . import hr_contract_init
diff --git a/hr_contract_values_resource_schedule/models/hr_contract.py b/hr_contract_values_resource_schedule/models/hr_contract.py
new file mode 100644
index 00000000..351f7d82
--- /dev/null
+++ b/hr_contract_values_resource_schedule/models/hr_contract.py
@@ -0,0 +1,32 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013,2014 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import api, fields, models
+
+
+class HrContract(models.Model):
+
+    _inherit = "hr.contract"
+
+    @api.model
+    def _get_resource_calendar(self):
+
+        res = self.env.company.resource_calendar_id.id
+        init = self.get_latest_initial_values()
+        if init is not None and init.resource_calendar_id:
+            res = init.resource_calendar_id.id
+        return res
+
+    resource_calendar_id = fields.Many2one(default=_get_resource_calendar)
+
+    @api.model_create_multi
+    def create(self, lst):
+
+        res = super().create(lst)
+        for r in res:
+            if r and r.resource_calendar_id:
+                resources = r.mapped("employee_id").mapped("resource_id")
+                resources.write({"calendar_id": r.resource_calendar_id.id})
+
+        return res
diff --git a/hr_contract_values_resource_schedule/models/hr_contract_init.py b/hr_contract_values_resource_schedule/models/hr_contract_init.py
new file mode 100644
index 00000000..72930bdd
--- /dev/null
+++ b/hr_contract_values_resource_schedule/models/hr_contract_init.py
@@ -0,0 +1,16 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013,2014 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import fields, models
+
+
+class ContractInit(models.Model):
+
+    _inherit = "hr.contract.init"
+
+    resource_calendar_id = fields.Many2one(
+        "resource.calendar",
+        "Working Hours",
+        states={"draft": [("readonly", False)]},
+    )
diff --git a/hr_contract_values_resource_schedule/readme/CREDITS.rst b/hr_contract_values_resource_schedule/readme/CREDITS.rst
new file mode 100644
index 00000000..d264bc7e
--- /dev/null
+++ b/hr_contract_values_resource_schedule/readme/CREDITS.rst
@@ -0,0 +1 @@
+* Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/hr_contract_values_resource_schedule/readme/DESCRIPTION.rst b/hr_contract_values_resource_schedule/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..3e11270b
--- /dev/null
+++ b/hr_contract_values_resource_schedule/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+This module provides a linkage between hr_contract_values and resource_schedule. You can designate a working calendar to be the default calendar for newly created contracts.
diff --git a/hr_contract_values_resource_schedule/static/description/icon.png b/hr_contract_values_resource_schedule/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/hr_contract_values_resource_schedule/static/description/icon.png differ
diff --git a/hr_contract_values_resource_schedule/static/description/index.html b/hr_contract_values_resource_schedule/static/description/index.html
new file mode 100644
index 00000000..4a030483
--- /dev/null
+++ b/hr_contract_values_resource_schedule/static/description/index.html
@@ -0,0 +1,417 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Employee working hours in contract values</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="employee-working-hours-in-contract-values">
+<h1 class="title">Employee working hours in contract values</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:8025532ff2c53499b5e80ed53924c523fbc9718b674550910b1bf756d69bfa58
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/hr_contract_values_resource_schedule"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<p>This module provides a linkage between hr_contract_values and resource_schedule. You can designate a working calendar to be the default calendar for newly created contracts.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-4">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20hr_contract_values_resource_schedule%0Aversion:%2014.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="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>TREVI Software</li>
+<li>Michael Telahun Makonnen</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-4">Other credits</a></h2>
+<ul class="simple">
+<li>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/hr_contract_values_resource_schedule">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/hr_contract_values_resource_schedule/static/src/img/main_screenshot.png b/hr_contract_values_resource_schedule/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/hr_contract_values_resource_schedule/static/src/img/main_screenshot.png differ
diff --git a/hr_contract_values_resource_schedule/tests/__init__.py b/hr_contract_values_resource_schedule/tests/__init__.py
new file mode 100644
index 00000000..c7684baf
--- /dev/null
+++ b/hr_contract_values_resource_schedule/tests/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+
+from . import test_hr_contract_init
diff --git a/hr_contract_values_resource_schedule/tests/test_hr_contract_init.py b/hr_contract_values_resource_schedule/tests/test_hr_contract_init.py
new file mode 100644
index 00000000..f6b92ad2
--- /dev/null
+++ b/hr_contract_values_resource_schedule/tests/test_hr_contract_init.py
@@ -0,0 +1,49 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+
+from odoo import fields
+from odoo.tests import common
+
+
+class TestContractInit(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super(TestContractInit, cls).setUpClass()
+
+        cls.HrEmployee = cls.env["hr.employee"]
+        cls.HrContract = cls.env["hr.contract"]
+        cls.ResourceCalendar = cls.env["resource.calendar"]
+        cls.HrContractInit = cls.env["hr.contract.init"]
+
+        cls.eeJohn = cls.HrEmployee.create({"name": "John"})
+        cls.std35_calendar = cls.env.ref("resource.resource_calendar_std_35h")
+
+    def test_load_from_policy(self):
+
+        self.HrContractInit.create(
+            {
+                "name": "Contract Default values",
+                "date": fields.Date.today(),
+                "trial_period": 60,
+                "resource_calendar_id": self.std35_calendar.id,
+            }
+        )
+
+        contract = self.HrContract.create(
+            {
+                "name": "C1",
+                "employee_id": self.eeJohn.id,
+                "wage": 1.0,
+            }
+        )
+        self.assertEqual(
+            contract.resource_calendar_id,
+            self.std35_calendar,
+            "The work calendar in the contract is the one from the default values",
+        )
+        self.assertEqual(
+            contract.employee_id.resource_id.calendar_id,
+            self.std35_calendar,
+            "The work calendar in the resource is the one from the default values",
+        )
diff --git a/hr_contract_values_resource_schedule/views/hr_contract_init_views.xml b/hr_contract_values_resource_schedule/views/hr_contract_init_views.xml
new file mode 100644
index 00000000..f61af17d
--- /dev/null
+++ b/hr_contract_values_resource_schedule/views/hr_contract_init_views.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+        <!-- Initial Contract Settings -->
+
+        <record id="view_contract_init_tree" model="ir.ui.view">
+            <field name="name">hr.contract.init.tree.schedule</field>
+            <field name="model">hr.contract.init</field>
+            <field name="inherit_id" ref="hr_contract_values.view_contract_init_tree" />
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='trial_period']" position="after">
+                    <field name="resource_calendar_id" />
+                </xpath>
+            </field>
+        </record>
+
+        <record id="view_contract_init_form" model="ir.ui.view">
+            <field name="name">hr.contract.init.form.schedule</field>
+            <field name="model">hr.contract.init</field>
+            <field name="inherit_id" ref="hr_contract_values.view_contract_init_form" />
+            <field name="arch" type="xml">
+                <xpath expr="//group[@name='grp2']" position="inside">
+                    <field name="resource_calendar_id" />
+                </xpath>
+            </field>
+        </record>
+
+</odoo>
diff --git a/hr_data_import/README.rst b/hr_data_import/README.rst
new file mode 100644
index 00000000..f1d2d3a4
--- /dev/null
+++ b/hr_data_import/README.rst
@@ -0,0 +1,63 @@
+==============
+HR Data Import
+==============
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:45dd4050edc1fc2934105921cb4cdd1a1c2d61b325a3eea7bf9180d325c7f3be
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/hr_data_import
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+This module allows you to import HR data into the system from Excel sheets. Currently the following data is imported and created:
+* Employee Records
+* Employee Contracts
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20hr_data_import%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+* Michael Telahun Makonnen
+
+Other credits
+~~~~~~~~~~~~~
+
+Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/hr_data_import>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/hr_data_import/__init__.py b/hr_data_import/__init__.py
new file mode 100644
index 00000000..4e124ccb
--- /dev/null
+++ b/hr_data_import/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
diff --git a/hr_data_import/__manifest__.py b/hr_data_import/__manifest__.py
new file mode 100644
index 00000000..121265b1
--- /dev/null
+++ b/hr_data_import/__manifest__.py
@@ -0,0 +1,40 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "HR Data Import",
+    "summary": "Import HR data from another system using Excel",
+    "version": "15.0.1.0.0",
+    "category": "Human Resources",
+    "images": ["static/src/img/main_screenshot.png"],
+    "license": "AGPL-3",
+    "author": "TREVI Software, Michael Telahun Makonnen",
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "hr",
+        "hr_accrual_bank",
+        "hr_benefit",
+        "hr_contract_reference",
+        "hr_contract_status",
+        "hr_contract_type",
+        "hr_employee_seniority_months",
+        "hr_employee_status",
+        "hr_holidays_public",
+        "payroll_default_salary_rules",
+        "payroll_periods",
+        "payroll_policy_absence",
+        "payroll_policy_accrual",
+        "payroll_policy_group",
+        "payroll_policy_presence",
+        "payroll_policy_ot",
+        "payroll_policy_rounding",
+    ],
+    "data": [
+        "security/ir.model.access.csv",
+        "views/menus.xml",
+        "views/hr_data_import_employee_views.xml",
+        "views/hr_employee_view.xml",
+    ],
+    "installable": True,
+}
diff --git a/hr_data_import/models/__init__.py b/hr_data_import/models/__init__.py
new file mode 100644
index 00000000..578d718d
--- /dev/null
+++ b/hr_data_import/models/__init__.py
@@ -0,0 +1,6 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import hr_contract
+from . import hr_data_import_employee
+from . import hr_employee
diff --git a/hr_data_import/models/hr_contract.py b/hr_data_import/models/hr_contract.py
new file mode 100644
index 00000000..5d439543
--- /dev/null
+++ b/hr_data_import/models/hr_contract.py
@@ -0,0 +1,19 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+
+from odoo import models
+
+
+class HrContract(models.Model):
+    _inherit = "hr.contract"
+
+    def condition_trial_period(self):
+        res = super().condition_trial_period()
+        if (
+            self.trial_date_end
+            and self.employee_id.hire_date
+            and self.employee_id.hire_date < self.date_start
+        ):
+            res = False
+        return res
diff --git a/hr_data_import/models/hr_data_import_employee.py b/hr_data_import/models/hr_data_import_employee.py
new file mode 100644
index 00000000..36920ded
--- /dev/null
+++ b/hr_data_import/models/hr_data_import_employee.py
@@ -0,0 +1,155 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import _, fields, models
+from odoo.exceptions import UserError
+
+
+class ImportEmployee(models.Model):
+    _name = "hr.data.import.employee"
+    _description = "HR Import: Employee"
+
+    name = fields.Char(required=True)
+    birthday = fields.Date(groups="hr.group_hr_user", string="Date of Birth")
+    gender = fields.Selection(
+        [("male", "Male"), ("female", "Female"), ("other", "Other")],
+        groups="hr.group_hr_user",
+    )
+    marital = fields.Selection(
+        [
+            ("single", "Single"),
+            ("married", "Married"),
+            ("cohabitant", "Legal Cohabitant"),
+            ("widower", "Widower"),
+            ("divorced", "Divorced"),
+        ],
+        string="Marital Status",
+        groups="hr.group_hr_user",
+        default="single",
+    )
+    identification_id = fields.Char(
+        string="Identification No", groups="hr.group_hr_user"
+    )
+    taxid = fields.Char(string="Tax ID")
+    street = fields.Char(string="Address", groups="hr.group_hr_user")
+    private_phone = fields.Char(string="Private Phone", groups="hr.group_hr_user")
+    private_email = fields.Char(string="Private Email", groups="hr.group_hr_user")
+    emergency_contact = fields.Char("Emergency Contact", groups="hr.group_hr_user")
+    emergency_phone = fields.Char("Emergency Phone", groups="hr.group_hr_user")
+    hire_date = fields.Date(string="Date Hired", help="Initial date of employment.")
+    job_id = fields.Many2one("hr.job", string="Job Position")
+    date_start = fields.Date(
+        "Start Date", required=True, help="Start date of the contract."
+    )
+    date_end = fields.Date(
+        "End Date", help="End date of the contract (if it's a fixed-term contract)."
+    )
+    trial_date_end = fields.Date(
+        "End of Trial Period", help="End date of the trial period (if there is one)."
+    )
+    resource_calendar_id = fields.Many2one("resource.calendar", "Working Schedule")
+    wage = fields.Monetary("Wage", required=True, help="Employee's monthly gross wage.")
+    contract_type_id = fields.Many2one("hr.contract.type", "Contract Type")
+    struct_id = fields.Many2one(
+        "hr.payroll.structure", string="Salary Structure", required=True
+    )
+    pps_id = fields.Many2one(
+        "hr.payroll.period.schedule", "Payroll Period Schedule", required=True
+    )
+    policy_group_id = fields.Many2one(
+        string="Policy Group",
+        comodel_name="hr.policy.group",
+    )
+    related_employee_id = fields.Many2one("hr.employee")
+    state = fields.Selection([("new", "New"), ("imported", "Imported")], default="new")
+    company_id = fields.Many2one("res.company", default=lambda s: s.env.company)
+    currency_id = fields.Many2one(
+        string="Currency", related="company_id.currency_id", readonly=True
+    )
+
+    def action_import_employees(self):
+        if self.filtered(lambda so: so.state != "new"):
+            raise UserError(_("Only new records can be imported."))
+        self.import_records()
+        self.write({"state": "imported"})
+
+    def import_records(self):
+
+        Partner = self.env["res.partner"]
+
+        # Create the basic hr.employee record
+        values_list = []
+        for rec in self:
+            # Create contact
+            _contact = Partner.create(
+                {
+                    "name": rec.name,
+                    "type": "private",
+                    "street": rec.street and rec.street or False,
+                    "mobile": rec.private_phone and rec.private_phone or False,
+                    "email": rec.private_email and rec.private_email or False,
+                    "vat": rec.taxid and rec.taxid or False,
+                }
+            )
+            val = {
+                "name": rec.name,
+                "import_data_id": rec.id,
+                "address_home_id": _contact.id,
+            }
+            if rec.birthday:
+                val.update({"birthday": rec.birthday})
+            if rec.gender:
+                val.update({"gender": rec.gender})
+            if rec.marital:
+                val.update({"marital": rec.marital})
+            if rec.identification_id:
+                val.update({"identification_id": rec.identification_id})
+            if rec.private_email:
+                val.update({"private_email": rec.private_email})
+            if rec.emergency_contact:
+                val.update({"emergency_contact": rec.emergency_contact})
+            if rec.emergency_phone:
+                val.update({"emergency_phone": rec.emergency_phone})
+            if rec.hire_date:
+                val.update({"hire_date": rec.hire_date})
+            values_list.append(val)
+        res = self.env["hr.employee"].create(values_list)
+
+        # Link the created employee to the import data record
+        for rec in self:
+            rec.related_employee_id = res.filtered(
+                lambda e: e.import_data_id.id == rec.id
+            )
+
+        # Additional changes to system
+        contracts = self.create_contracts(res)
+        contracts.signal_confirm()
+
+        return res
+
+    def create_contracts(self, employee_ids):
+        contracts_list = []
+        for ee in employee_ids:
+            data_id = self.filtered(lambda s: s.related_employee_id.id == ee.id)
+            contract_vals = {
+                "employee_id": ee.id,
+                "wage": data_id.wage,
+                "date_start": data_id.date_start,
+                "job_id": data_id.job_id.id,
+                "struct_id": data_id.struct_id.id,
+                "pps_id": data_id.pps_id.id,
+                "policy_group_id": data_id.policy_group_id.id,
+                "kanban_state": "done",
+            }
+            if data_id.date_end:
+                contract_vals.update({"date_end": data_id.date_end})
+            if data_id.trial_date_end:
+                contract_vals.update({"trial_date_end": data_id.trial_date_end})
+            if data_id.resource_calendar_id:
+                contract_vals.update(
+                    {"resource_calendar_id": data_id.resource_calendar_id.id}
+                )
+            if data_id.contract_type_id:
+                contract_vals.update({"contract_type_id": data_id.contract_type_id.id})
+            contracts_list.append(contract_vals)
+        return self.env["hr.contract"].create(contracts_list)
diff --git a/hr_data_import/models/hr_employee.py b/hr_data_import/models/hr_employee.py
new file mode 100644
index 00000000..7a0f5969
--- /dev/null
+++ b/hr_data_import/models/hr_employee.py
@@ -0,0 +1,31 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from dateutil.relativedelta import relativedelta
+
+from odoo import fields, models
+
+
+class HrEmployee(models.Model):
+    _inherit = "hr.employee"
+
+    hire_date = fields.Date(
+        help="Initial date of employment if different than date on first contract."
+    )
+    import_data_id = fields.Many2one("hr.data.import.employee", "Imported Record")
+
+    def get_months_service_to_date(self, dToday=None):
+        months = super().get_months_service_to_date(dToday)
+        if self.hire_date and self.hire_date < self.first_contract_date:
+            if dToday is None:
+                dToday = fields.Date.today()
+            delta = relativedelta(self.first_contract_date, self.hire_date)
+            months += round(
+                float(
+                    delta.years * 12
+                    + delta.months
+                    + delta.days / float(self._get_days_in_month(dToday))
+                ),
+                2,
+            )
+        return months
diff --git a/hr_data_import/readme/CREDITS.rst b/hr_data_import/readme/CREDITS.rst
new file mode 100644
index 00000000..47150bbd
--- /dev/null
+++ b/hr_data_import/readme/CREDITS.rst
@@ -0,0 +1 @@
+Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/hr_data_import/readme/DESCRIPTION.rst b/hr_data_import/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..c4b4523e
--- /dev/null
+++ b/hr_data_import/readme/DESCRIPTION.rst
@@ -0,0 +1,3 @@
+This module allows you to import HR data into the system from Excel sheets. Currently the following data is imported and created:
+* Employee Records
+* Employee Contracts
diff --git a/hr_data_import/security/ir.model.access.csv b/hr_data_import/security/ir.model.access.csv
new file mode 100644
index 00000000..e9e31c37
--- /dev/null
+++ b/hr_data_import/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_data_employee_data_user,access_hr_employee_data,model_hr_data_import_employee,hr.group_hr_user,1,0,0,0
+access_hr_data_employee_data_mgr,access_hr_employee_data,model_hr_data_import_employee,hr.group_hr_manager,1,1,1,1
diff --git a/hr_data_import/static/description/icon.png b/hr_data_import/static/description/icon.png
new file mode 100644
index 00000000..efaa9399
Binary files /dev/null and b/hr_data_import/static/description/icon.png differ
diff --git a/hr_data_import/static/description/index.html b/hr_data_import/static/description/index.html
new file mode 100644
index 00000000..302594b4
--- /dev/null
+++ b/hr_data_import/static/description/index.html
@@ -0,0 +1,417 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>HR Data Import</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="hr-data-import">
+<h1 class="title">HR Data Import</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:45dd4050edc1fc2934105921cb4cdd1a1c2d61b325a3eea7bf9180d325c7f3be
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/hr_data_import"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<p>This module allows you to import HR data into the system from Excel sheets. Currently the following data is imported and created:
+* Employee Records
+* Employee Contracts</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-4">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20hr_data_import%0Aversion:%2014.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="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>TREVI Software</li>
+<li>Michael Telahun Makonnen</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-4">Other credits</a></h2>
+<p>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</p>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/hr_data_import">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/hr_data_import/static/src/img/main_screenshot.png b/hr_data_import/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/hr_data_import/static/src/img/main_screenshot.png differ
diff --git a/hr_data_import/tests/__init__.py b/hr_data_import/tests/__init__.py
new file mode 100644
index 00000000..440ab922
--- /dev/null
+++ b/hr_data_import/tests/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import test_hr_employee
+from . import test_import
diff --git a/hr_data_import/tests/test_hr_employee.py b/hr_data_import/tests/test_hr_employee.py
new file mode 100644
index 00000000..fbcbd94f
--- /dev/null
+++ b/hr_data_import/tests/test_hr_employee.py
@@ -0,0 +1,37 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+
+from dateutil.relativedelta import relativedelta
+
+from odoo import fields
+from odoo.tests import common
+from odoo.tools.float_utils import float_compare
+
+
+class TestHrEmployeeSeniority(common.TransactionCase):
+    def setUp(self):
+        super(TestHrEmployeeSeniority, self).setUp()
+
+        self.HrEmployee = self.env["hr.employee"]
+        self.HrContract = self.env["hr.contract"]
+
+    def test_hire_date(self):
+
+        dHire = fields.Date.today() - relativedelta(months=12)
+        dStart = fields.Date.today() - relativedelta(months=3)
+        ee = self.HrEmployee.create({"name": "EE 1"})
+        ee.hire_date = dHire
+        self.HrContract.create(
+            {
+                "name": "C",
+                "employee_id": ee.id,
+                "wage": 1.0,
+                "date_start": dStart,
+            }
+        )
+        self.assertEqual(
+            float_compare(12.0, ee.length_of_service, precision_digits=2),
+            0,
+            "Seniority is based on hire date, not contract",
+        )
diff --git a/hr_data_import/tests/test_import.py b/hr_data_import/tests/test_import.py
new file mode 100644
index 00000000..705f6704
--- /dev/null
+++ b/hr_data_import/tests/test_import.py
@@ -0,0 +1,223 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import date, timedelta
+
+from odoo.exceptions import UserError
+from odoo.tests import common
+
+
+class TestImport(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.DataImport = cls.env["hr.data.import.employee"]
+        cls.Department = cls.env["hr.department"]
+        cls.Employee = cls.env["hr.employee"]
+        cls.Job = cls.env["hr.job"]
+        cls.PayrollStructure = cls.env["hr.payroll.structure"]
+        cls.PolicyGroup = cls.env["hr.policy.group"]
+        cls.Schedule = cls.env["hr.payroll.period.schedule"]
+        cls.SalaryRule = cls.env["hr.salary.rule"]
+        cls.SalaryRuleCateg = cls.env["hr.salary.rule.category"]
+
+        # Payroll related
+        #
+        cls.categ_basic = cls.SalaryRuleCateg.create(
+            {
+                "name": "Basic",
+                "code": "BASIC",
+            }
+        )
+        cls.rule_basic = cls.SalaryRule.create(
+            {
+                "name": "Basic Salary",
+                "code": "BASIC",
+                "sequence": 1,
+                "category_id": cls.categ_basic.id,
+                "condition_select": "none",
+                "amount_select": "code",
+                "amount_python_compute": "result = contract.wage",
+            }
+        )
+        cls.pay_structure = cls.PayrollStructure.create(
+            {
+                "name": "Basic Salary Structure",
+                "code": "BSS",
+                "company_id": cls.env.ref("base.main_company").id,
+                "rule_ids": [
+                    (4, cls.rule_basic.id),
+                ],
+            }
+        )
+
+        cls.std_calendar = cls.env["resource.calendar"].create({"name": "Std"})
+        cls.contract_type = cls.env["hr.contract.type"].create({"name": "Permanent"})
+        cls.dept_sales = cls.Department.create({"name": "Sales"})
+        cls.job_sales_rep = cls.Job.create(
+            {"name": "Sales Rep", "department_id": cls.dept_sales.id}
+        )
+        cls.pps = cls.Schedule.create(
+            {
+                "name": "PPS",
+                "tz": "Africa/Addis_Ababa",
+                "type": "manual",
+                "initial_period_date": date.today(),
+            }
+        )
+        cls.policy_group = cls.PolicyGroup.create(
+            {
+                "name": "Default Policy Group",
+            }
+        )
+        cls.data = cls.DataImport.create(
+            [
+                {
+                    "name": "Sally Ford",
+                    "gender": "female",
+                    "street": "123 A Avenue",
+                    "private_phone": "(555) 555-5555",
+                    "emergency_contact": "John Doe",
+                    "emergency_phone": "(555) 555-666",
+                    "hire_date": date(2000, 1, 1),
+                    "date_start": date.today(),
+                    "wage": 5000.00,
+                    "job_id": cls.job_sales_rep.id,
+                    "struct_id": cls.pay_structure.id,
+                    "pps_id": cls.pps.id,
+                    "policy_group_id": cls.policy_group.id,
+                },
+                {
+                    "name": "John Doe",
+                    "gender": "male",
+                    "birthday": date(2000, 1, 1),
+                    "marital": "single",
+                    "street": "456 B Avenue",
+                    "private_phone": "(555) 555-666",
+                    "date_start": date.today(),
+                    "wage": 4000.00,
+                    "job_id": cls.job_sales_rep.id,
+                    "struct_id": cls.pay_structure.id,
+                    "pps_id": cls.pps.id,
+                    "policy_group_id": cls.policy_group.id,
+                },
+            ]
+        )
+
+        cls.sample01 = {
+            "name": "Alice",
+            "gender": "female",
+            "street": "123 A Avenue",
+            "private_phone": "(555) 555-5555",
+            "emergency_contact": "John Doe",
+            "emergency_phone": "(555) 555-666",
+            "hire_date": date(2000, 1, 1),
+            "date_start": date.today(),
+            "wage": 5000.00,
+            "job_id": cls.job_sales_rep.id,
+            "struct_id": cls.pay_structure.id,
+            "pps_id": cls.pps.id,
+            "policy_group_id": cls.policy_group.id,
+        }
+
+    def test_workflow(self):
+        self.data.action_import_employees()
+
+        for rec in self.data:
+            self.assertTrue(
+                rec.related_employee_id,
+                f"The created employee is linked to the data record: {rec.name}",
+            )
+            self.assertTrue(
+                rec.related_employee_id.address_home_id,
+                f"The employee has a home address record: {rec.name}",
+            )
+            self.assertEqual(
+                rec.related_employee_id.address_home_id.type,
+                "private",
+                f"The employee home address contact type is private: {rec.name}",
+            )
+            self.assertTrue(
+                rec.related_employee_id.contract_ids.ids,
+                f"Contract created for record: {rec.name}",
+            )
+            if rec.identification_id:
+                self.assertEqual(
+                    rec.related_employee_id.identification_id,
+                    rec.identification_id,
+                    "Employee government ID matches imported record",
+                )
+            if rec.private_email:
+                self.assertEqual(
+                    rec.related_employee_id.private_email,
+                    rec.private_email,
+                    "Employee private email matches imported record",
+                )
+            if rec.emergency_contact:
+                self.assertEqual(
+                    rec.related_employee_id.emergency_contact,
+                    rec.emergency_contact,
+                    "Employee emergency contact matches imported record",
+                )
+            if rec.emergency_phone:
+                self.assertEqual(
+                    rec.related_employee_id.emergency_phone,
+                    rec.emergency_phone,
+                    "Employee emergency contact phone matches imported record",
+                )
+            if rec.hire_date:
+                self.assertEqual(
+                    rec.related_employee_id.contract_ids[0].state,
+                    "open",
+                    f"Employee's contract is in 'open' state: {rec.name}",
+                )
+            else:
+                self.assertEqual(
+                    rec.related_employee_id.contract_ids[0].state,
+                    "trial",
+                    f"Employee's contract is in 'trial' state: {rec.name}",
+                )
+            self.assertEqual(
+                rec.state,
+                "imported",
+                f"The record state is 'imported' after employee creation: {rec.name}",
+            )
+
+        # Attempt to import again raises exception
+        with self.assertRaises(UserError):
+            self.data.action_import_employees()
+
+    def test_set_value_contract_type(self):
+        self.data[0].contract_type_id = self.contract_type
+        self.data.import_records()
+        ee = self.Employee.search([("name", "=", self.data[0].name)])
+        self.assertTrue(ee, f"Found employee: {self.data[0].name}")
+        self.assertEqual(
+            ee.contract_ids[0].contract_type_id,
+            self.contract_type,
+            f"Contract type correctly set on employee contract: {ee.name}",
+        )
+
+    def test_set_value_contract_trial_end_date(self):
+        self.sample01.update({"trial_date_end": date.today() + timedelta(days=15)})
+        data = self.DataImport.create(self.sample01)
+        data.import_records()
+        ee = self.Employee.search([("name", "=", data[0].name)])
+        self.assertTrue(ee, f"Found employee: {data[0].name}")
+        self.assertEqual(
+            ee.contract_ids[0].trial_date_end,
+            date.today() + timedelta(days=15),
+            f"Trial end date correctly set on employee contract: {ee.name}",
+        )
+
+    def test_set_value_calendar(self):
+        self.data[0].resource_calendar_id = self.std_calendar
+        self.data.import_records()
+        ee = self.Employee.search([("name", "=", self.data[0].name)])
+        self.assertTrue(ee, f"Found employee: {self.data[0].name}")
+        self.assertEqual(
+            ee.contract_ids[0].resource_calendar_id,
+            self.std_calendar,
+            f"Calendar correctly set on employee contract: {ee.name}",
+        )
diff --git a/hr_data_import/views/hr_data_import_employee_views.xml b/hr_data_import/views/hr_data_import_employee_views.xml
new file mode 100644
index 00000000..3bd67a31
--- /dev/null
+++ b/hr_data_import/views/hr_data_import_employee_views.xml
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+
+        <record id="view_data_search" model="ir.ui.view">
+            <field name="name">hr.data.import.employee.search</field>
+            <field name="model">hr.data.import.employee</field>
+            <field name="arch" type="xml">
+                <search string="Employee Data Search">
+                    <field name="name" />
+                    <field name="gender" />
+                    <field name="struct_id" />
+                    <field name="policy_group_id" />
+                    <field name="pps_id" />
+                    <field name="resource_calendar_id" />
+                    <filter
+                        string="State: New"
+                        name="state_new"
+                        domain="[('state', '=', 'new')]"
+                    />
+                    <filter
+                        string="State: Imported"
+                        name="state_imported"
+                        domain="[('state', '=', 'imported')]"
+                    />
+                    <separator />
+                    <group expand="0" string="Group By">
+                        <filter
+                            string="Job"
+                            name="groupby_job"
+                            context="{'group_by':'job_id'}"
+                        />
+                        <filter
+                            string="Contract Type"
+                            name="groupby_contract_type"
+                            context="{'group_by':'contract_type_id'}"
+                        />
+                        <filter
+                            string="Payroll Structure"
+                            name="groupby_struct"
+                            context="{'group_by':'struct_id'}"
+                        />
+                        <filter
+                            string="Payroll Policy Group"
+                            name="groupby_policygroup"
+                            context="{'group_by':'policy_group_id'}"
+                        />
+                        <filter
+                            string="Payroll Period Schedule"
+                            name="groupby_period_schedule"
+                            context="{'group_by':'pps_id'}"
+                        />
+                        <filter
+                            string="Resource Calendar"
+                            name="groupby_calendar"
+                            context="{'group_by':'resource_calendar_id'}"
+                        />
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record id="view_data_tree" model="ir.ui.view">
+            <field name="name">hr.data.import.employee.tree</field>
+            <field name="model">hr.data.import.employee</field>
+            <field name="arch" type="xml">
+                <tree string="Employee Data">
+                    <field name="name" />
+                    <field name="birthday" />
+                    <field name="gender" />
+                    <field name="marital" />
+                    <field name="identification_id" />
+                    <field name="private_phone" />
+                    <field name="hire_date" />
+                    <field name="job_id" />
+                    <field name="date_start" />
+                    <field name="wage" />
+                    <field name="contract_type_id" />
+                    <field name="struct_id" />
+                    <field name="resource_calendar_id" />
+                    <field name="pps_id" />
+                    <field name="policy_group_id" />
+                    <field name="state" />
+                    <field name="company_id" groups="base.group_multi_company" />
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_data_form" model="ir.ui.view">
+            <field name="name">hr.data.import.employee.form</field>
+            <field name="model">hr.data.import.employee</field>
+            <field name="arch" type="xml">
+                <form string="Employee Data Form">
+                    <sheet>
+                        <header>
+                            <field name="state" widget="statusbar" clickable="1" />
+                        </header>
+                        <label for="name" class="oe_edit_only" />
+                        <h1>
+                            <field name="name" />
+                        </h1>
+                        <group>
+                            <group>
+                                <field name="birthday" />
+                                <field name="gender" />
+                                <field name="marital" />
+                                <field name="identification_id" />
+                                <field name="private_phone" />
+                                <field name="hire_date" />
+                                <field name="resource_calendar_id" />
+                            </group>
+                            <group>
+                                <field name="wage" />
+                                <field name="job_id" />
+                                <field name="date_start" />
+                                <field name="contract_type_id" />
+                                <field name="struct_id" />
+                                <field name="pps_id" />
+                                <field name="policy_group_id" />
+                                <field
+                                    name="company_id"
+                                    groups="base.group_multi_company"
+                                />
+                            </group>
+                        </group>
+                        <group>
+                            <group>
+                                <field name="related_employee_id" />
+                            </group>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="open_employee_import" model="ir.actions.act_window">
+            <field name="name">Employees</field>
+            <field name="res_model">hr.data.import.employee</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'search_default_state_new': '1'}</field>
+        </record>
+        <menuitem
+            id="menu_employee_import"
+            action="open_employee_import"
+            parent="menu_import_root"
+            groups="hr.group_hr_user"
+            sequence="5"
+        />
+
+        <record id="action_import_records" model="ir.actions.server">
+            <field name="name">Create HR Records</field>
+            <field name="model_id" ref="hr_data_import.model_hr_data_import_employee" />
+            <field
+                name="binding_model_id"
+                ref="hr_data_import.model_hr_data_import_employee"
+            />
+            <field name="binding_view_types">list,form</field>
+            <field name="state">code</field>
+            <field name="code">action = records.action_import_employees()</field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/hr_data_import/views/hr_employee_view.xml b/hr_data_import/views/hr_employee_view.xml
new file mode 100644
index 00000000..155f47ba
--- /dev/null
+++ b/hr_data_import/views/hr_employee_view.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+
+        <record id="hr_employee_view_form" model="ir.ui.view">
+            <field name="name">hr.employee.view.inherit.hr_data_import</field>
+            <field name="model">hr.employee</field>
+            <field name="inherit_id" ref="hr.view_employee_form" />
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="//page[@name='hr_settings']" position="inside">
+                        <group name="hr_data_import" string="Imported Data">
+                            <group>
+                                <field name="hire_date" />
+                            </group>
+                            <group>
+                                <field name="import_data_id" />
+                            </group>
+                        </group>
+                    </xpath>
+                </data>
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/hr_data_import/views/menus.xml b/hr_data_import/views/menus.xml
new file mode 100644
index 00000000..0d9eda9c
--- /dev/null
+++ b/hr_data_import/views/menus.xml
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+
+        <!-- Root Menu -->
+        <menuitem
+            id="menu_import_root"
+            name="Data Import"
+            groups="base.group_user"
+            sequence="80"
+            web_icon="hr_data_import,static/description/icon.png"
+        />
+
+        <!-- Main Menu: HR Company Data -->
+        <menuitem
+            id="menu_hr_top"
+            name="HR Company Data"
+            parent="menu_import_root"
+            groups="base.group_user"
+            sequence="10"
+        />
+
+        <menuitem
+            id="menu_hr_department_tree"
+            action="hr.hr_department_tree_action"
+            parent="menu_hr_top"
+            sequence="5"
+            groups="hr.group_hr_user"
+        />
+
+        <menuitem
+            id="menu_view_hr_job"
+            action="hr.action_hr_job"
+            parent="menu_hr_top"
+            sequence="10"
+            groups="hr.group_hr_user"
+        />
+
+        <!-- Main Menu: HR Master Data -->
+        <menuitem
+            id="menu_hrmaster_top"
+            name="HR Master Data"
+            parent="menu_import_root"
+            groups="base.group_user"
+            sequence="15"
+        />
+
+        <!-- Public Holidays -->
+        <menuitem
+            id="menu_public_holiday"
+            action="hr_holidays_public.open_holidays_public_view"
+            parent="menu_hrmaster_top"
+            sequence="5"
+            groups="hr.group_hr_user"
+        />
+
+        <menuitem
+            id="menu_leave_type"
+            action="hr_holidays.open_view_holiday_status"
+            parent="menu_hrmaster_top"
+            sequence="10"
+            groups="hr.group_hr_user"
+        />
+
+        <menuitem
+            id="menu_accrual"
+            action="hr_accrual_bank.open_accrual"
+            parent="menu_hrmaster_top"
+            sequence="15"
+            groups="hr.group_hr_user"
+        />
+
+        <menuitem
+            id="menu_benefit"
+            action="hr_benefit.open_benefits_view"
+            parent="menu_hrmaster_top"
+            sequence="20"
+            groups="hr.group_hr_user"
+        />
+
+        <!-- Main Menu: Payroll Master Data -->
+        <menuitem
+            id="menu_payroll_top"
+            name="Payroll Master Data"
+            parent="menu_import_root"
+            groups="payroll.group_payroll_user"
+            sequence="20"
+        />
+
+        <!-- Payroll Contribution Registers -->
+        <menuitem
+            id="menu_contribution_registers"
+            action="payroll.hr_contribution_register_action"
+            parent="menu_payroll_top"
+            sequence="10"
+            groups="payroll.group_payroll_user"
+        />
+
+        <!-- Payroll: Salary Rule Categories -->
+        <menuitem
+            id="menu_salary_rule_categ"
+            action="payroll.hr_salary_rule_category_action"
+            parent="menu_payroll_top"
+            sequence="15"
+            groups="payroll.group_payroll_user"
+        />
+
+        <!-- Payroll: Salary Rules -->
+        <menuitem
+            id="menu_salary_rules"
+            action="payroll.action_salary_rule_form"
+            parent="menu_payroll_top"
+            sequence="20"
+            groups="payroll.group_payroll_user"
+        />
+
+        <!-- Payroll: Salary Structure -->
+        <menuitem
+            id="menu_payroll_structure"
+            action="payroll.hr_payroll_structure_action"
+            parent="menu_payroll_top"
+            sequence="25"
+            groups="payroll.group_payroll_user"
+        />
+
+        <!-- Payroll Period: Schedule -->
+        <menuitem
+            id="menu_payroll_period_schedule"
+            action="payroll_periods.open_payroll_period_schedule_view"
+            parent="menu_payroll_top"
+            sequence="30"
+            groups="payroll.group_payroll_user"
+        />
+
+        <!-- Payroll Policy: Accrual Policy -->
+        <menuitem
+            id="menu_policy_accrual"
+            action="payroll_policy_accrual.open_accr_policy"
+            parent="menu_payroll_top"
+            sequence="35"
+            groups="payroll.group_payroll_user"
+        />
+
+        <!-- Payroll Policy: Accrual Policy Line -->
+        <menuitem
+            id="menu_policy_accrual_line"
+            action="payroll_policy_accrual.open_accr_policy_line"
+            parent="menu_payroll_top"
+            sequence="37"
+            groups="payroll.group_payroll_user"
+        />
+
+        <!-- Payroll Policy: Absence -->
+        <menuitem
+            id="menu_policy_absence"
+            action="payroll_policy_absence.open_absence_policy"
+            parent="menu_payroll_top"
+            sequence="40"
+            groups="payroll.group_payroll_user"
+        />
+
+        <!-- Payroll Policy: Presence -->
+        <menuitem
+            id="menu_policy_presence"
+            action="payroll_policy_presence.open_presence_policy"
+            parent="menu_payroll_top"
+            sequence="45"
+            groups="payroll.group_payroll_user"
+        />
+
+        <!-- Payroll Policy: OT -->
+        <menuitem
+            id="menu_policy_ot"
+            action="payroll_policy_ot.open_ot_policy"
+            parent="menu_payroll_top"
+            sequence="50"
+            groups="payroll.group_payroll_user"
+        />
+
+        <!-- Payroll Policy: Rounding -->
+        <menuitem
+            id="menu_policy_rounding"
+            action="payroll_policy_rounding.open_rounding_policy"
+            parent="menu_payroll_top"
+            sequence="55"
+            groups="payroll.group_payroll_user"
+        />
+
+        <!-- Payroll Policy: Groups -->
+        <menuitem
+            id="menu_policy_groups"
+            action="payroll_policy_group.open_policy_group"
+            parent="menu_payroll_top"
+            sequence="60"
+            groups="payroll.group_payroll_user"
+        />
+
+    </data>
+</odoo>
diff --git a/hr_employee_seniority_months/README.rst b/hr_employee_seniority_months/README.rst
new file mode 100644
index 00000000..d0c6fb97
--- /dev/null
+++ b/hr_employee_seniority_months/README.rst
@@ -0,0 +1,73 @@
+==================
+Employee Seniority
+==================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:cf0c6042872d8a6ebadeed7c530b02167774d1defa4d0b0748e4b27b29b71492
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/hr_employee_seniority_months
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+This module keeps track of employee seniority by calculating the number of months of employment.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Changelog
+=========
+
+14.0.1.0.1 (2022-04-12)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* [FIX] A mistake in the code that prevented employee tree views from working was fixed
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20hr_employee_seniority_months%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+
+Contributors
+~~~~~~~~~~~~
+
+* Michael Telahun Makonnen <mtm@trevi.et>
+
+Other credits
+~~~~~~~~~~~~~
+
+* TREVI Software <https://trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/hr_employee_seniority_months>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/hr_employee_seniority_months/__init__.py b/hr_employee_seniority_months/__init__.py
new file mode 100644
index 00000000..2b0f2dca
--- /dev/null
+++ b/hr_employee_seniority_months/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
diff --git a/hr_employee_seniority_months/__manifest__.py b/hr_employee_seniority_months/__manifest__.py
new file mode 100644
index 00000000..28214d0a
--- /dev/null
+++ b/hr_employee_seniority_months/__manifest__.py
@@ -0,0 +1,21 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Employee Seniority",
+    "version": "15.0.1.0.0",
+    "license": "AGPL-3",
+    "author": "TREVI Software",
+    "category": "Human Resources",
+    "summary": "Calculate an employee's months of employment",
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "hr_contract",
+    ],
+    "data": [
+        "views/hr_employee_view.xml",
+    ],
+    "demo": [],
+    "installable": True,
+}
diff --git a/hr_employee_seniority_months/i18n/hr_employee_seniority_months.pot b/hr_employee_seniority_months/i18n/hr_employee_seniority_months.pot
new file mode 100644
index 00000000..064dd361
--- /dev/null
+++ b/hr_employee_seniority_months/i18n/hr_employee_seniority_months.pot
@@ -0,0 +1,44 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* hr_employee_seniority_months
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: hr_employee_seniority_months
+#: model_terms:ir.ui.view,arch_db:hr_employee_seniority_months.hr_employee_view_form_inherit
+msgid "<span>months</span>"
+msgstr ""
+
+#. module: hr_employee_seniority_months
+#: model:ir.model.fields,field_description:hr_employee_seniority_months.field_hr_employee__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: hr_employee_seniority_months
+#: model:ir.model,name:hr_employee_seniority_months.model_hr_employee
+msgid "Employee"
+msgstr ""
+
+#. module: hr_employee_seniority_months
+#: model:ir.model.fields,field_description:hr_employee_seniority_months.field_hr_employee__id
+msgid "ID"
+msgstr ""
+
+#. module: hr_employee_seniority_months
+#: model:ir.model.fields,field_description:hr_employee_seniority_months.field_hr_employee____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: hr_employee_seniority_months
+#: model:ir.model.fields,field_description:hr_employee_seniority_months.field_hr_employee__length_of_service
+msgid "Seniority"
+msgstr ""
diff --git a/hr_employee_seniority_months/models/__init__.py b/hr_employee_seniority_months/models/__init__.py
new file mode 100644
index 00000000..d7a4ec6c
--- /dev/null
+++ b/hr_employee_seniority_months/models/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import hr_employee
diff --git a/hr_employee_seniority_months/models/hr_employee.py b/hr_employee_seniority_months/models/hr_employee.py
new file mode 100644
index 00000000..5ecde824
--- /dev/null
+++ b/hr_employee_seniority_months/models/hr_employee.py
@@ -0,0 +1,91 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+
+from datetime import date, datetime, timedelta
+
+from dateutil.relativedelta import relativedelta
+
+from odoo import fields, models
+
+
+class HrEmployee(models.Model):
+
+    _inherit = "hr.employee"
+
+    def _get_contracts_list(self):
+        """Return list of contracts in chronological order"""
+
+        self.ensure_one()
+        contracts = self.env["hr.contract"]
+        if len(self.contract_ids) > 0:
+            contracts = self.contract_ids.sorted(key=lambda c: c.date_start)
+
+        return contracts
+
+    def _get_days_in_month(self, d):
+
+        last_date = (
+            d
+            - timedelta(days=(d.day - 1))
+            + relativedelta(months=+1)
+            + relativedelta(days=-1)
+        )
+        return last_date.day
+
+    def get_months_service_to_date(self, dToday=None):
+        """Returns the number of months of employment."""
+
+        self.ensure_one()
+        if dToday is None:
+            dToday = date.today()
+        elif isinstance(dToday, datetime):
+            dToday = dToday.date()
+
+        delta = relativedelta(dToday, dToday)
+        contracts = self._get_contracts_list()
+        if len(contracts) == 0:
+            return 0.0
+
+        for c in contracts:
+            dStart = c.date_start
+            if dStart >= dToday:
+                continue
+
+            # If the contract doesn't have an end date, use today's date
+            # If the contract has finished consider the entire duration of
+            # the contract, otherwise consider only the months in the
+            # contract until today.
+            #
+            if c.date_end:
+                dEnd = c.date_end
+            else:
+                dEnd = dToday
+            if dEnd > dToday:
+                dEnd = dToday
+
+            delta += relativedelta(dEnd, dStart)
+
+        # Set the number of months the employee has worked
+        date_part = float(delta.days) / float(self._get_days_in_month(dToday))
+        return round(float((delta.years * 12) + delta.months) + date_part, 2)
+
+    def _compute_employed_months(self):
+
+        for ee in self:
+            ee.length_of_service = ee.get_months_service_to_date()
+
+    length_of_service = fields.Float(
+        compute="_compute_employed_months", groups=False, string="Seniority"
+    )
+
+    def get_employment_date(self):
+
+        self.ensure_one()
+
+        contracts = self._get_contracts_list()
+        if len(contracts) > 0:
+            return contracts[0].date_start
+
+        return None
diff --git a/hr_employee_seniority_months/readme/CONTRIBUTORS.rst b/hr_employee_seniority_months/readme/CONTRIBUTORS.rst
new file mode 100644
index 00000000..d264bc7e
--- /dev/null
+++ b/hr_employee_seniority_months/readme/CONTRIBUTORS.rst
@@ -0,0 +1 @@
+* Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/hr_employee_seniority_months/readme/CREDITS.rst b/hr_employee_seniority_months/readme/CREDITS.rst
new file mode 100644
index 00000000..c3b77386
--- /dev/null
+++ b/hr_employee_seniority_months/readme/CREDITS.rst
@@ -0,0 +1 @@
+* TREVI Software <https://trevi.et>
diff --git a/hr_employee_seniority_months/readme/DESCRIPTION.rst b/hr_employee_seniority_months/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..0dc19df0
--- /dev/null
+++ b/hr_employee_seniority_months/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+This module keeps track of employee seniority by calculating the number of months of employment.
diff --git a/hr_employee_seniority_months/readme/HISTORY.rst b/hr_employee_seniority_months/readme/HISTORY.rst
new file mode 100644
index 00000000..9b0ada6f
--- /dev/null
+++ b/hr_employee_seniority_months/readme/HISTORY.rst
@@ -0,0 +1,4 @@
+14.0.1.0.1 (2022-04-12)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* [FIX] A mistake in the code that prevented employee tree views from working was fixed
diff --git a/hr_employee_seniority_months/static/description/icon.png b/hr_employee_seniority_months/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/hr_employee_seniority_months/static/description/icon.png differ
diff --git a/hr_employee_seniority_months/static/description/index.html b/hr_employee_seniority_months/static/description/index.html
new file mode 100644
index 00000000..1db309c2
--- /dev/null
+++ b/hr_employee_seniority_months/static/description/index.html
@@ -0,0 +1,436 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Employee Seniority</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="employee-seniority">
+<h1 class="title">Employee Seniority</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:cf0c6042872d8a6ebadeed7c530b02167774d1defa4d0b0748e4b27b29b71492
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/hr_employee_seniority_months"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<p>This module keeps track of employee seniority by calculating the number of months of employment.</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="toc-entry-1">Changelog</a><ul>
+<li><a class="reference internal" href="#section-1" id="toc-entry-2">14.0.1.0.1 (2022-04-12)</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-3">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-4">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-5">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-6">Contributors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-7">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-8">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="changelog">
+<h1><a class="toc-backref" href="#toc-entry-1">Changelog</a></h1>
+<div class="section" id="section-1">
+<h2><a class="toc-backref" href="#toc-entry-2">14.0.1.0.1 (2022-04-12)</a></h2>
+<ul class="simple">
+<li>[FIX] A mistake in the code that prevented employee tree views from working was fixed</li>
+</ul>
+</div>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20hr_employee_seniority_months%0Aversion:%2014.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="#toc-entry-4">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-5">Authors</a></h2>
+<ul class="simple">
+<li>TREVI Software</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
+<ul class="simple">
+<li>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-7">Other credits</a></h2>
+<ul class="simple">
+<li>TREVI Software &lt;<a class="reference external" href="https://trevi.et">https://trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-8">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/hr_employee_seniority_months">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/hr_employee_seniority_months/tests/__init__.py b/hr_employee_seniority_months/tests/__init__.py
new file mode 100644
index 00000000..5bc8485a
--- /dev/null
+++ b/hr_employee_seniority_months/tests/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import test_hr_employee
diff --git a/hr_employee_seniority_months/tests/test_hr_employee.py b/hr_employee_seniority_months/tests/test_hr_employee.py
new file mode 100644
index 00000000..9458f9fe
--- /dev/null
+++ b/hr_employee_seniority_months/tests/test_hr_employee.py
@@ -0,0 +1,196 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import datetime, timedelta
+
+from dateutil.relativedelta import relativedelta
+
+from odoo import fields
+from odoo.tests import common
+from odoo.tools.float_utils import float_compare, float_is_zero
+
+
+class TestHrEmployeeSeniority(common.TransactionCase):
+    def setUp(self):
+        super(TestHrEmployeeSeniority, self).setUp()
+
+        self.HrEmployee = self.env["hr.employee"]
+        self.HrContract = self.env["hr.contract"]
+
+    def _get_days_in_month(self, d):
+
+        last_date = (
+            d
+            - timedelta(days=(d.day - 1))
+            + relativedelta(months=+1)
+            + relativedelta(days=-1)
+        )
+        return last_date.day
+
+    def test_no_contract(self):
+        """Seniority of employee with no contracts is zero"""
+
+        ee = self.HrEmployee.create({"name": "EE 1"})
+        self.assertTrue(float_is_zero(ee.length_of_service, precision_digits=2))
+
+    def test_consecutive_contracts_are_additive(self):
+        """Seniority of employee with multiple consecutive contracts is additive"""
+
+        dStart1 = fields.Date.today() - relativedelta(months=24)
+        dEnd1 = dStart1 + relativedelta(months=12)
+        dStart2 = dEnd1 + relativedelta(days=1)
+        dEnd2 = dStart2 + relativedelta(months=6)
+        ee = self.HrEmployee.create({"name": "EE 1"})
+        self.HrContract.create(
+            {
+                "name": "C1",
+                "employee_id": ee.id,
+                "wage": 1.0,
+                "date_start": dStart1,
+                "date_end": dEnd1,
+            }
+        )
+        self.HrContract.create(
+            {
+                "name": "C2",
+                "employee_id": ee.id,
+                "wage": 1.0,
+                "date_start": dStart2,
+                "date_end": dEnd2,
+            }
+        )
+        self.assertEqual(
+            float_compare(18.0, ee.length_of_service, precision_digits=2), 0
+        )
+
+    def test_current_contract_seniority(self):
+        """Current contract seniority cutoff is Today"""
+
+        dStart = fields.Date.today() - relativedelta(months=3)
+        dEnd = fields.Date.today() + relativedelta(months=12)
+        ee = self.HrEmployee.create({"name": "EE 1"})
+        self.HrContract.create(
+            {
+                "name": "C",
+                "employee_id": ee.id,
+                "wage": 1.0,
+                "date_start": dStart,
+                "date_end": dEnd,
+            }
+        )
+        self.assertEqual(
+            float_compare(3.0, ee.length_of_service, precision_digits=2), 0
+        )
+
+    def test_gap_between_contracts(self):
+        """Gaps between contracts are not counted in seniority"""
+
+        dStart1 = fields.Date.today() - relativedelta(months=24)
+        dEnd1 = dStart1 + relativedelta(months=9)
+        dStart2 = fields.Date.today() - relativedelta(months=7)
+        dEnd2 = dStart2 + relativedelta(months=2)
+        ee = self.HrEmployee.create({"name": "EE"})
+        self.HrContract.create(
+            {
+                "name": "C1",
+                "employee_id": ee.id,
+                "wage": 1.0,
+                "date_start": dStart1,
+                "date_end": dEnd1,
+            }
+        )
+        self.HrContract.create(
+            {
+                "name": "C2",
+                "employee_id": ee.id,
+                "wage": 1.0,
+                "date_start": dStart2,
+                "date_end": dEnd2,
+            }
+        )
+
+        self.assertEqual(
+            float_compare(
+                8.0, relativedelta(dStart2, dEnd1).months, precision_digits=2
+            ),
+            0,
+        )
+        self.assertEqual(
+            float_compare(11.0, ee.length_of_service, precision_digits=2), 0
+        )
+
+    def test_contract_in_future_is_zero(self):
+        """Contract with dates in the future returns a zero result"""
+
+        ee = self.HrEmployee.create({"name": "EE"})
+        self.HrContract.create(
+            {
+                "name": "C",
+                "employee_id": ee.id,
+                "wage": 1.0,
+                "date_start": fields.Date.today() + relativedelta(months=3),
+            }
+        )
+        self.assertEqual(
+            float_compare(0.0, ee.length_of_service, precision_digits=2), 0
+        )
+
+    def test_contract_end_in_future(self):
+        """Contract with end date in the future returns only until today"""
+
+        ee = self.HrEmployee.create({"name": "EE"})
+        contract_start = fields.Date.today() - relativedelta(months=3, days=14)
+        self.HrContract.create(
+            {
+                "name": "C",
+                "employee_id": ee.id,
+                "wage": 1.0,
+                "date_start": contract_start,
+                "date_end": fields.Date.today() + relativedelta(months=3),
+            }
+        )
+        delta = abs(
+            relativedelta(
+                contract_start,
+                fields.Date.today(),
+            )
+        )
+        next_even_month = contract_start + relativedelta(months=4)
+        prev_even_month = contract_start + relativedelta(months=3)
+        timedelta_month_days = datetime.combine(
+            next_even_month, datetime.min.time()
+        ) - datetime.combine(prev_even_month, datetime.min.time())
+        total_month_days = timedelta_month_days / timedelta(days=1)
+        relative_today_days = relativedelta(prev_even_month, fields.Date.today())
+        months = round(
+            (
+                float(delta.years * 12 + delta.months)
+                + abs(relative_today_days.days / total_month_days)
+            ),
+            2,
+        )
+        self.assertEqual(
+            float_compare(months, ee.length_of_service, precision_digits=1), 0
+        )
+
+    def test_no_contract_no_employment_date(self):
+        """An employee without a contract has no employment date"""
+
+        ee = self.HrEmployee.create({"name": "EE"})
+        self.assertIsNone(ee.get_employment_date())
+
+    def test_get_employment_date(self):
+        """An employee with a contract has an employment date"""
+
+        START = "2021-01-01"
+        ee = self.HrEmployee.create({"name": "EE"})
+        self.HrContract.create(
+            {
+                "name": "C",
+                "employee_id": ee.id,
+                "wage": 1.0,
+                "date_start": START,
+            }
+        )
+        start = fields.Date.to_date(START)
+        self.assertEqual(ee.get_employment_date(), start)
diff --git a/hr_employee_seniority_months/views/hr_employee_view.xml b/hr_employee_seniority_months/views/hr_employee_view.xml
new file mode 100644
index 00000000..c03ef4ae
--- /dev/null
+++ b/hr_employee_seniority_months/views/hr_employee_view.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+
+
+        <!-- Employee Records -->
+
+        <record id="hr_employee_view_tree" model="ir.ui.view">
+            <field name="name">hr.employee.tree.seniority</field>
+            <field name="model">hr.employee</field>
+            <field name="inherit_id" ref="hr.view_employee_tree" />
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="//field[@name='work_phone']" position="before">
+                        <field name="length_of_service" />
+                    </xpath>
+                </data>
+            </field>
+        </record>
+
+        <record id="hr_employee_view_form_inherit" model="ir.ui.view">
+            <field name="name">hr.employee.form.seniority</field>
+            <field name="model">hr.employee</field>
+            <field name="inherit_id" ref="hr.view_employee_form" />
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='coach_id']" position="after">
+                    <label for="length_of_service" />
+                    <div class="o_row" name="div_seniority">
+                        <field name="length_of_service" />
+                        <span>months</span>
+                    </div>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/hr_employee_status/README.rst b/hr_employee_status/README.rst
new file mode 100644
index 00000000..b05639c9
--- /dev/null
+++ b/hr_employee_status/README.rst
@@ -0,0 +1,75 @@
+=================
+Employment Status
+=================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:405791fd67002fbd9f1cd5ee921255705ed95ca05974f1740467bdb62b730932
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/hr_employee_status
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+Track the HR status of employees
+--------------------------------
+This module manages the employee life-cycle from on-boarding to separation.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Changelog
+=========
+
+14.0.1.0.2 (2022-01-12)
+~~~~~~~~~~~~~~~~~~~~~~~
+* [ADD] Allow users to view their own (and subordinates) separation records
+
+14.0.1.0.1 (2021-10-07)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* [FIX] Scheduled actions related to employment status no longer fail because of a programming error
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20hr_employee_status%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+* Michael Telahun Makonnen
+
+Other credits
+~~~~~~~~~~~~~
+
+* Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/hr_employee_status>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/hr_employee_status/__init__.py b/hr_employee_status/__init__.py
new file mode 100644
index 00000000..839ec688
--- /dev/null
+++ b/hr_employee_status/__init__.py
@@ -0,0 +1,6 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
+from . import wizard
diff --git a/hr_employee_status/__manifest__.py b/hr_employee_status/__manifest__.py
new file mode 100644
index 00000000..f9095cdf
--- /dev/null
+++ b/hr_employee_status/__manifest__.py
@@ -0,0 +1,26 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Employment Status",
+    "summary": "Track the HR status of employees",
+    "version": "15.0.1.0.0",
+    "category": "Human Resources",
+    "images": ["static/src/img/main_screenshot.png"],
+    "license": "AGPL-3",
+    "author": "TREVI Software, Michael Telahun Makonnen",
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "hr",
+        "hr_contract_status",
+    ],
+    "data": [
+        "security/ir.model.access.csv",
+        "security/security.xml",
+        "wizard/end_contract_view.xml",
+        "data/hr_employee_data.xml",
+        "views/hr_view.xml",
+    ],
+    "installable": True,
+}
diff --git a/hr_employee_status/data/hr_employee_data.xml b/hr_employee_status/data/hr_employee_data.xml
new file mode 100644
index 00000000..79e95c1d
--- /dev/null
+++ b/hr_employee_status/data/hr_employee_data.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data noupdate="1">
+
+        <!-- Alert-related subtypes for messaging / Chatter -->
+
+        <record id="mt_alert_state_confirm" model="mail.message.subtype">
+            <field name="name">Employment Separation - Started</field>
+            <field name="res_model">hr.employee</field>
+            <field name="description">Employment Termination initiated</field>
+        </record>
+
+        <record id="mt_alert_state_done" model="mail.message.subtype">
+            <field name="name">Employment Separation - Completed</field>
+            <field name="res_model">hr.employee</field>
+            <field name="description">Completed</field>
+        </record>
+
+        <record id="mt_alert_state_cancel" model="mail.message.subtype">
+            <field name="name">Employment Separation - Cancelled</field>
+            <field name="res_model">hr.employee</field>
+            <field name="description">Cancelled</field>
+        </record>
+
+        <!-- Employment Separation Reason -->
+        <record id="term_contract_end" model="hr.employee.termination.reason">
+            <field name="name">Contract Ended</field>
+        </record>
+        <record id="term_fired" model="hr.employee.termination.reason">
+            <field name="name">Fired</field>
+        </record>
+        <record id="term_retired" model="hr.employee.termination.reason">
+            <field name="name">Retired</field>
+        </record>
+        <record id="term_trialeval" model="hr.employee.termination.reason">
+            <field name="name">Trial Period Evaluation</field>
+        </record>
+
+        <!-- Finalize separations -->
+        <record id="ir_cron_data_separation_update_state" model="ir.cron">
+            <field name="name">HR Separation: update state</field>
+            <field name="model_id" ref="model_hr_employee_termination" />
+            <field name="type">ir.actions.server</field>
+            <field name="state">code</field>
+            <field name="code">model.update_state()</field>
+            <field name="interval_number">1</field>
+            <field name="interval_type">days</field>
+            <field name="numbercall">-1</field>
+        </record>
+
+        <!-- Prevent archiving -->
+        <record id="hr_employee_start_separation" model="ir.actions.server">
+            <field name="name">HR Employee: Start Separation</field>
+            <field name="model_id" ref="hr.model_hr_employee" />
+            <field name="state">code</field>
+            <field name="code">
+                action = env.ref("hr_employee_statuss.action_set_inactive")
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/hr_employee_status/i18n/hr_employee_status.pot b/hr_employee_status/i18n/hr_employee_status.pot
new file mode 100644
index 00000000..9da04cd7
--- /dev/null
+++ b/hr_employee_status/i18n/hr_employee_status.pot
@@ -0,0 +1,487 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* hr_employee_status
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: hr_employee_status
+#: model_terms:ir.ui.view,arch_db:hr_employee_status.view_inactive_wizard
+msgid ""
+"<b>\n"
+"                        This employee will no longer have any running contracts. In such a case it is\n"
+"                        customary for the employee record to be archived as an 'inactive' record.\n"
+"                        However, the record and all the employee's associated data such as contracts,\n"
+"                        leaves, attendances, etc will still be available. This is not a\n"
+"                        permanent removal of the employee record. Should you wish to you can\n"
+"                        easily re-activate it again at any time in the future.\n"
+"                        </b>"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee_termination__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields.selection,name:hr_employee_status.selection__hr_employee__status__active
+msgid "Active"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee_termination__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: hr_employee_status
+#: model_terms:ir.ui.view,arch_db:hr_employee_status.hr_employee_termination_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields.selection,name:hr_employee_status.selection__hr_employee_termination__state__cancel
+#: model:mail.message.subtype,description:hr_employee_status.mt_alert_state_cancel
+msgid "Cancelled"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee_termination__company_id
+msgid "Company"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:mail.message.subtype,description:hr_employee_status.mt_alert_state_done
+msgid "Completed"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_contract_end__contract_id
+msgid "Contract"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee_termination__contract_date_end
+msgid "Contract End Date"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_contract_end__create_uid
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee_termination__create_uid
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee_termination_reason__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_contract_end__create_date
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee_termination__create_date
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee_termination_reason__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model,name:hr_employee_status.model_hr_employee_termination
+msgid "Data Related to Separation of Employee"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_contract_end__date
+msgid "Date"
+msgstr ""
+
+#. module: hr_employee_status
+#: model_terms:ir.ui.view,arch_db:hr_employee_status.hr_employee_termination_form_view
+msgid "Deactivate"
+msgstr ""
+
+#. module: hr_employee_status
+#: model_terms:ir.ui.view,arch_db:hr_employee_status.view_employee_form
+msgid "Deactivation"
+msgstr ""
+
+#. module: hr_employee_status
+#: model_terms:ir.ui.view,arch_db:hr_employee_status.view_employee_form
+msgid "Deactivation Records"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee_termination__department_id
+#: model_terms:ir.ui.view,arch_db:hr_employee_status.view_termination_filter
+msgid "Department"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_contract__display_name
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_contract_end__display_name
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee__display_name
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee_termination__display_name
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee_termination_reason__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields.selection,name:hr_employee_status.selection__hr_employee_termination__state__done
+msgid "Done"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields.selection,name:hr_employee_status.selection__hr_employee_termination__state__draft
+msgid "Draft"
+msgstr ""
+
+#. module: hr_employee_status
+#: model_terms:ir.ui.view,arch_db:hr_employee_status.view_termination_filter
+msgid "Draft, Confirmed"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee_termination__name
+msgid "Effective Date"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model,name:hr_employee_status.model_hr_employee
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_contract_end__employee_id
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee_termination__employee_id
+msgid "Employee"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model,name:hr_employee_status.model_hr_contract
+msgid "Employee Contract"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.actions.act_window,name:hr_employee_status.action_set_inactive
+#: model:ir.model,name:hr_employee_status.model_hr_contract_end
+#: model_terms:ir.ui.view,arch_db:hr_employee_status.view_inactive_wizard
+msgid "Employee De-Activation Wizard"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.actions.act_window,name:hr_employee_status.open_hr_employee_termination
+#: model:ir.ui.menu,name:hr_employee_status.menu_hr_employee_termination
+msgid "Employee Separation"
+msgstr ""
+
+#. module: hr_employee_status
+#: model_terms:ir.ui.view,arch_db:hr_employee_status.view_termination_filter
+msgid "Employee Separations"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee_termination__employee_state
+msgid "Employee State"
+msgstr ""
+
+#. module: hr_employee_status
+#: model_terms:ir.ui.view,arch_db:hr_employee_status.view_termination_filter
+msgid "Employees"
+msgstr ""
+
+#. module: hr_employee_status
+#: model_terms:ir.ui.view,arch_db:hr_employee_status.hr_employee_termination_form_view
+msgid "Employment Separation"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:mail.message.subtype,name:hr_employee_status.mt_alert_state_cancel
+msgid "Employment Separation - Cancelled"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:mail.message.subtype,name:hr_employee_status.mt_alert_state_done
+msgid "Employment Separation - Completed"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:mail.message.subtype,name:hr_employee_status.mt_alert_state_confirm
+msgid "Employment Separation - Started"
+msgstr ""
+
+#. module: hr_employee_status
+#: model_terms:ir.ui.view,arch_db:hr_employee_status.view_termination_reason_form
+msgid "Employment Separation Reason"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.actions.act_window,name:hr_employee_status.open_termination_reason
+#: model:ir.ui.menu,name:hr_employee_status.menu_hr_employee_termination_reason
+#: model_terms:ir.ui.view,arch_db:hr_employee_status.view_termination_reason_tree
+msgid "Employment Separation Reasons"
+msgstr ""
+
+#. module: hr_employee_status
+#: model_terms:ir.ui.view,arch_db:hr_employee_status.hr_employee_termination_tree_view
+msgid "Employment Separations"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:mail.message.subtype,description:hr_employee_status.mt_alert_state_confirm
+msgid "Employment Termination initiated"
+msgstr ""
+
+#. module: hr_employee_status
+#: model_terms:ir.ui.view,arch_db:hr_employee_status.view_contract_form
+msgid "End Contract"
+msgstr ""
+
+#. module: hr_employee_status
+#: model_terms:ir.ui.view,arch_db:hr_employee_status.view_inactive_wizard
+msgid "End Employment"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee_termination__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee_termination__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee_termination__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: hr_employee_status
+#: model_terms:ir.ui.view,arch_db:hr_employee_status.view_termination_filter
+msgid "Group By..."
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.actions.server,name:hr_employee_status.hr_employee_start_separation
+msgid "HR Employee: Start Separation"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.actions.server,name:hr_employee_status.ir_cron_data_separation_update_state_ir_actions_server
+#: model:ir.cron,cron_name:hr_employee_status.ir_cron_data_separation_update_state
+#: model:ir.cron,name:hr_employee_status.ir_cron_data_separation_update_state
+msgid "HR Separation: update state"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_contract__id
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_contract_end__id
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee__id
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee_termination__id
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee_termination_reason__id
+msgid "ID"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,help:hr_employee_status.field_hr_employee_termination__message_needaction
+#: model:ir.model.fields,help:hr_employee_status.field_hr_employee_termination__message_unread
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,help:hr_employee_status.field_hr_employee_termination__message_has_error
+#: model:ir.model.fields,help:hr_employee_status.field_hr_employee_termination__message_has_sms_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields.selection,name:hr_employee_status.selection__hr_employee__status__inactive
+msgid "Inactive"
+msgstr ""
+
+#. module: hr_employee_status
+#: model_terms:ir.ui.view,arch_db:hr_employee_status.view_employee_form
+msgid "Inactive Records"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee_termination__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_contract____last_update
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_contract_end____last_update
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee____last_update
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee_termination____last_update
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee_termination_reason____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_contract_end__write_uid
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee_termination__write_uid
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee_termination_reason__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_contract_end__write_date
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee_termination__write_date
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee_termination_reason__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee_termination__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee_termination__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee_termination__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee_termination_reason__name
+msgid "Name"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields.selection,name:hr_employee_status.selection__hr_employee__status__new
+msgid "New-Hire"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_contract_end__notes
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee_termination__notes
+#: model_terms:ir.ui.view,arch_db:hr_employee_status.hr_employee_termination_form_view
+#: model_terms:ir.ui.view,arch_db:hr_employee_status.view_inactive_wizard
+msgid "Notes"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee_termination__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee_termination__message_has_error_counter
+msgid "Number of errors"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,help:hr_employee_status.field_hr_employee_termination__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,help:hr_employee_status.field_hr_employee_termination__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,help:hr_employee_status.field_hr_employee_termination__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields.selection,name:hr_employee_status.selection__hr_employee__status__separation
+msgid "Pending Separation"
+msgstr ""
+
+#. module: hr_employee_status
+#: model_terms:ir.ui.view,arch_db:hr_employee_status.view_contract_form
+#: model_terms:ir.ui.view,arch_db:hr_employee_status.view_employee_form
+msgid "Re-Activate"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields.selection,name:hr_employee_status.selection__hr_employee__status__reactivated
+msgid "Re-Activated"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_contract_end__reason_id
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee_termination__reason_id
+msgid "Reason"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model,name:hr_employee_status.model_hr_employee_termination_reason
+msgid "Reason for Employee Separation"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee_termination__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee__inactive_ids
+msgid "Separation Records"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee_termination__state
+msgid "State"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee__status
+msgid "Status"
+msgstr ""
+
+#. module: hr_employee_status
+#: code:addons/hr_employee_status/models/hr.py:0
+#, python-format
+msgid ""
+"The employee status may not be se to                         active before "
+"the trial period is over."
+msgstr ""
+
+#. module: hr_employee_status
+#: model_terms:ir.ui.view,arch_db:hr_employee_status.view_termination_filter
+msgid "To be processed"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields.selection,name:hr_employee_status.selection__hr_employee__status__trial
+msgid "Trial Period"
+msgstr ""
+
+#. module: hr_employee_status
+#: code:addons/hr_employee_status/models/hr_employee_termination.py:0
+#, python-format
+msgid ""
+"Unable to deactivate employee!Effective date is still in the future. Change "
+"the date                       and try again"
+msgstr ""
+
+#. module: hr_employee_status
+#: code:addons/hr_employee_status/models/hr_employee_termination.py:0
+#, python-format
+msgid "Unable to delete record!Employment separation already completed."
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee_termination__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee_termination__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,field_description:hr_employee_status.field_hr_employee_termination__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: hr_employee_status
+#: model:ir.model.fields,help:hr_employee_status.field_hr_employee_termination__website_message_ids
+msgid "Website communication history"
+msgstr ""
diff --git a/hr_employee_status/models/__init__.py b/hr_employee_status/models/__init__.py
new file mode 100644
index 00000000..4a9dd1c4
--- /dev/null
+++ b/hr_employee_status/models/__init__.py
@@ -0,0 +1,7 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import hr
+from . import hr_contract
+from . import hr_employee_termination
diff --git a/hr_employee_status/models/hr.py b/hr_employee_status/models/hr.py
new file mode 100644
index 00000000..5e45a5ea
--- /dev/null
+++ b/hr_employee_status/models/hr.py
@@ -0,0 +1,93 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+
+import logging
+from datetime import date
+
+from odoo import fields, models
+from odoo.exceptions import UserError
+from odoo.tools.translate import _
+
+_logger = logging.getLogger(__name__)
+
+
+class HrEmployee(models.Model):
+
+    _inherit = "hr.employee"
+
+    # 'state' was being used by hr_attendance (although not anymore)
+    status = fields.Selection(
+        selection=[
+            ("new", "New-Hire"),
+            ("trial", "Trial Period"),
+            ("active", "Active"),
+            ("separation", "Pending Separation"),
+            ("inactive", "Inactive"),
+            ("reactivated", "Re-Activated"),
+        ],
+        default="new",
+        readonly=True,
+    )
+    inactive_ids = fields.One2many(
+        comodel_name="hr.employee.termination",
+        inverse_name="employee_id",
+        string="Separation Records",
+    )
+
+    def write(self, vals):
+        for ee in self:
+            if (
+                "status" in vals
+                and vals.get("status") == "active"
+                and ee.status == "trial"
+            ):
+                if (
+                    ee.contract_id.trial_date_end
+                    and ee.contract_id.trial_date_end > date.today()
+                ):
+                    raise UserError(
+                        _(
+                            "The employee status may not be se to \
+                        active before the trial period is over."
+                        )
+                    )
+        return super(HrEmployee, self).write(vals)
+
+    def set_state_active(self, status="active"):
+
+        for ee in self:
+            if ee.status and ee.status == "separation":
+                ee.write(
+                    {
+                        "active": True,
+                        "status": status,
+                    }
+                )
+
+    def set_state_separation(self):
+
+        for ee in self:
+            ee.write(
+                {
+                    "status": "separation",
+                }
+            )
+
+    def set_state_inactive(self):
+
+        for ee in self:
+            ee.write(
+                {
+                    "active": False,
+                    "status": "inactive",
+                }
+            )
+
+    def signal_reactivate(self):
+
+        for employee in self:
+            employee.set_state_active()
+
+        return True
diff --git a/hr_employee_status/models/hr_contract.py b/hr_employee_status/models/hr_contract.py
new file mode 100644
index 00000000..cfa727a3
--- /dev/null
+++ b/hr_employee_status/models/hr_contract.py
@@ -0,0 +1,178 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+
+from datetime import date, datetime
+
+from dateutil.relativedelta import relativedelta
+
+from odoo import api, fields, models
+
+
+class HrContract(models.Model):
+
+    _inherit = "hr.contract"
+
+    def re_activate(self):
+
+        for contract in self:
+
+            term_obj = self.env["hr.employee.termination"]
+            term_ids = term_obj.search(
+                [
+                    ("employee_id", "=", contract.employee_id.id),
+                    ("state", "in", ["draft", "confirm"]),
+                ]
+            )
+
+            if len(term_ids) == 0:
+
+                # Trigger a status change of the employee and his contract(s)
+                contract.employee_id.signal_workflow("signal_active")
+                if contract.state == "pending_done":
+                    contract.signal_workflow("signal_open")
+            else:
+
+                for term in term_ids:
+
+                    # Trigger a status change of the employee and his contract(s)
+                    if term.state == "confirm":
+                        term.signal_workflow("signal_cancel")
+                    else:
+                        term.unlink()
+
+        return True
+
+    def end_contract(self):
+
+        if len(self.ids) == 0:
+            return False
+
+        ctx = dict(self.env.context)
+        ctx.update({"end_contract_id": self.ids[0]})
+        return {
+            "view_type": "form",
+            "view_mode": "form",
+            "res_model": "hr.contract.end",
+            "type": "ir.actions.act_window",
+            "target": "new",
+            "context": ctx,
+        }
+
+    @api.model
+    def update_state(self):
+
+        # New contract with trial period
+        employees = self.search(
+            [
+                ("state", "=", "draft"),
+                ("kanban_state", "=", "done"),
+                ("date_start", "<=", fields.Date.to_string(date.today())),
+                ("trial_date_end", ">=", fields.Date.to_string(date.today())),
+            ]
+        ).mapped("employee_id")
+        employees.write({"status": "trial"})
+
+        # New contract without trial period
+        employees = self.search(
+            [
+                ("state", "=", "draft"),
+                ("kanban_state", "=", "done"),
+                ("date_start", "<=", fields.Date.to_string(date.today())),
+                "|",
+                ("trial_date_end", "=", False),
+                ("trial_date_end", "<", fields.Date.to_string(date.today())),
+            ]
+        ).mapped("employee_id")
+        employees.write({"status": "active"})
+
+        # Trial period has ended
+        employees = self.search(
+            [
+                ("state", "=", "trial"),
+                (
+                    "trial_date_end",
+                    "<=",
+                    fields.Date.to_string(date.today() - relativedelta(days=1)),
+                ),
+            ]
+        ).mapped("employee_id")
+        employees.write({"status": "active"})
+
+        # Contracts have ended
+        contracts = self.search(
+            [
+                ("state", "=", "open"),
+                "|",
+                (
+                    "date_end",
+                    "<=",
+                    fields.Date.to_string(date.today() + relativedelta(days=1)),
+                ),
+                (
+                    "visa_expire",
+                    "<=",
+                    fields.Date.to_string(date.today() + relativedelta(days=1)),
+                ),
+            ]
+        )
+        for c in contracts:
+            vals = {
+                "name": c.date_end and c.date_end,
+                "employee_id": c.employee_id.id,
+                "reason_id": self.env.ref("hr_employee_status.term_contract_end").id,
+            }
+            c.setup_pending_done(vals)
+
+        return super(HrContract, self).update_state()
+
+    def signal_confirm(self):
+        res = super(HrContract, self).signal_confirm()
+        for c in self:
+            if c.condition_trial_period():
+                c.employee_id.status = "trial"
+            else:
+                c.employee_id.status = "active"
+        return res
+
+    def setup_pending_done(self, term_vals):
+        """Start employee deactivation process."""
+
+        term_obj = self.env["hr.employee.termination"]
+        dToday = datetime.now().date()
+
+        for contract in self:
+            # If employee is already inactive simply end the contract
+            if not contract.employee_id.active:
+                return
+
+            # Ensure there are not other open contracts
+            #
+            open_contract = False
+            for c2 in contract.employee_id.contract_ids:
+                if c2.id == contract.id or c2.state == "draft":
+                    continue
+
+                if (not c2.date_end or c2.date_end > dToday) and c2.state != "done":
+                    open_contract = True
+
+            # Don't create an employment termination if the employee has an open contract or
+            # if this contract is already in the 'done' state. If there is an open contract
+            # simply terminate this one without any further action.
+            if open_contract or contract.state == "close":
+                return
+
+            # Also skip creating an employment termination if there is already one in
+            # progress for this employee.
+            #
+            term_ids = term_obj.search(
+                [
+                    ("employee_id", "=", contract.employee_id.id),
+                    ("state", "in", ["draft", "confirm"]),
+                ]
+            )
+            if len(term_ids) > 0:
+                return
+
+            term_obj.create(term_vals)
diff --git a/hr_employee_status/models/hr_employee_termination.py b/hr_employee_status/models/hr_employee_termination.py
new file mode 100644
index 00000000..4cc6138c
--- /dev/null
+++ b/hr_employee_status/models/hr_employee_termination.py
@@ -0,0 +1,164 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+
+from datetime import date, datetime
+
+from dateutil.relativedelta import relativedelta
+
+from odoo import _, api, fields, models
+from odoo.exceptions import UserError
+
+
+class SeparationReason(models.Model):
+
+    _name = "hr.employee.termination.reason"
+    _description = "Reason for Employee Separation"
+
+    name = fields.Char(required=True)
+
+
+class Separation(models.Model):
+
+    _name = "hr.employee.termination"
+    _inherit = ["mail.thread"]
+    _description = "Data Related to Separation of Employee"
+
+    name = fields.Date(
+        string="Effective Date",
+        required=True,
+        readonly=True,
+        states={"draft": [("readonly", False)]},
+    )
+    reason_id = fields.Many2one(
+        string="Reason",
+        comodel_name="hr.employee.termination.reason",
+        required=True,
+        readonly=True,
+        states={"draft": [("readonly", False)]},
+    )
+    notes = fields.Text(readonly=True, states={"draft": [("readonly", False)]})
+    employee_id = fields.Many2one(
+        string="Employee", comodel_name="hr.employee", required=True, readonly=True
+    )
+    department_id = fields.Many2one(
+        string="Department",
+        comodel_name="hr.department",
+        related="employee_id.department_id",
+        store=True,
+    )
+    contract_date_end = fields.Date("Contract End Date")
+    employee_state = fields.Char()
+    state = fields.Selection(
+        selection=[
+            ("draft", "Draft"),
+            ("cancel", "Cancelled"),
+            ("done", "Done"),
+        ],
+        tracking=True,
+        default="draft",
+        readonly=True,
+    )
+    company_id = fields.Many2one(
+        string="Company",
+        comodel_name="res.company",
+        default=lambda self: self.env.company,
+        groups="base.group_multi_company",
+    )
+
+    def _track_subtype(self, init_values):
+        self.ensure_one()
+        if "state" in init_values:
+            if self.state == "confirm":
+                return self.env.ref("hr_employee_status.mt_alert_state_confirm")
+            elif self.state == "done":
+                return self.env.ref("hr_employee_status.mt_alert_state_done")
+            elif self.state == "cancel":
+                return self.env.ref("hr_employee_status.mt_alert_state_cancel")
+
+        return super(Separation, self)._track_subtype(init_values)
+
+    @api.model
+    def create(self, vals):
+        res = super(Separation, self).create(vals)
+        res.employee_state = res.employee_id.status
+        res.employee_id.set_state_separation()
+        if res.employee_id.contract_id:
+            c = res.employee_id.contract_id
+            res.contract_date_end = c.date_end
+            c.date_end = res.name
+        return res
+
+    def unlink(self):
+
+        for term in self:
+            if term.state == "done":
+                raise UserError(
+                    _(
+                        "Unable to delete record!"
+                        "Employment separation already completed."
+                    )
+                )
+
+            # Trigger employee status change back to Active
+            term.employee_id.set_state_active(term.employee_state)
+
+        return super(Separation, self).unlink()
+
+    def signal_cancel(self):
+
+        for term in self:
+
+            # Trigger a status change of the employee and his contract(s)
+            term.employee_id.set_state_active(term.employee_state)
+
+            term.state = "cancel"
+
+        return True
+
+    def effective_date_in_future(self):
+
+        self.ensure_one()
+        if self.name <= datetime.now().date():
+            return False
+
+        return True
+
+    def signal_done(self):
+
+        for term in self:
+            if term.effective_date_in_future():
+                raise UserError(
+                    _(
+                        "Unable to deactivate employee!"
+                        "Effective date is still in the future. Change the date \
+                      and try again"
+                    )
+                )
+
+            # Trigger a status change of the employee and any contracts pending termination.
+            term.employee_id.set_state_inactive()
+            term.employee_id.contract_id.state = "close"
+            term.employee_id.contract_ids.write({"active": False})
+            term.state = "done"
+
+        return True
+
+    @api.model
+    def update_state(self):
+        separations = self.search(
+            [
+                ("state", "=", "draft"),
+                (
+                    "name",
+                    "<=",
+                    fields.Date.to_string(date.today() + relativedelta(days=1)),
+                ),
+            ]
+        )
+        if len(separations) > 0:
+            employees = separations.mapped("employee_id")
+            employees.set_state_inactive()
+            employees.mapped("contract_id").write({"state": "close"})
+            separations.write({"state": "done"})
diff --git a/hr_employee_status/readme/CREDITS.rst b/hr_employee_status/readme/CREDITS.rst
new file mode 100644
index 00000000..d264bc7e
--- /dev/null
+++ b/hr_employee_status/readme/CREDITS.rst
@@ -0,0 +1 @@
+* Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/hr_employee_status/readme/DESCRIPTION.rst b/hr_employee_status/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..0dcc5eb4
--- /dev/null
+++ b/hr_employee_status/readme/DESCRIPTION.rst
@@ -0,0 +1,3 @@
+Track the HR status of employees
+--------------------------------
+This module manages the employee life-cycle from on-boarding to separation.
diff --git a/hr_employee_status/readme/HISTORY.rst b/hr_employee_status/readme/HISTORY.rst
new file mode 100644
index 00000000..1794276a
--- /dev/null
+++ b/hr_employee_status/readme/HISTORY.rst
@@ -0,0 +1,8 @@
+14.0.1.0.2 (2022-01-12)
+~~~~~~~~~~~~~~~~~~~~~~~
+* [ADD] Allow users to view their own (and subordinates) separation records
+
+14.0.1.0.1 (2021-10-07)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* [FIX] Scheduled actions related to employment status no longer fail because of a programming error
diff --git a/hr_employee_status/security/ir.model.access.csv b/hr_employee_status/security/ir.model.access.csv
new file mode 100644
index 00000000..77d0b315
--- /dev/null
+++ b/hr_employee_status/security/ir.model.access.csv
@@ -0,0 +1,6 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_employee_termination_readonly,access_hr_employee_termination,model_hr_employee_termination,base.group_user,1,0,0,0
+access_hr_employee_termination_user,access_hr_employee_termination,model_hr_employee_termination,hr.group_hr_user,1,1,1,1
+access_hr_employee_termination_reason_user,access_hr_employee_termination_reason,model_hr_employee_termination_reason,hr.group_hr_user,1,0,0,0
+access_hr_employee_termination_reason_manager,access_hr_employee_termination_reason,model_hr_employee_termination_reason,hr.group_hr_manager,1,1,1,1
+access_hr_contract_end,access_hr_contract_end,model_hr_contract_end,hr.group_hr_user,1,1,1,1
diff --git a/hr_employee_status/security/security.xml b/hr_employee_status/security/security.xml
new file mode 100644
index 00000000..15845962
--- /dev/null
+++ b/hr_employee_status/security/security.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data noupdate="1">
+
+        <record id="hr_employee_separation_rule_own" model="ir.rule">
+            <field name="name">Employee Separation: Own and Subordinates</field>
+            <field name="model_id" ref="model_hr_employee_termination" />
+            <field name="domain_force">
+                ['|',('employee_id.user_id', '=', user.id),
+                ('employee_id.department_id.manager_id.user_id', '=', user.id)]
+            </field>
+            <field name="groups" eval="[(4, ref('base.group_user'))]" />
+        </record>
+
+        <!-- Only show terminations in the user's current company -->
+
+        <record id="hr_contract_comp_rule" model="ir.rule">
+            <field name="name">Employee separation: multi-company</field>
+            <field
+                name="model_id"
+                ref="hr_employee_status.model_hr_employee_termination"
+            />
+            <field eval="True" name="global" />
+            <field
+                name="domain_force"
+            >['|',('company_id','=',False),('company_id', 'in', company_ids)]</field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/hr_employee_status/static/description/icon.png b/hr_employee_status/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/hr_employee_status/static/description/icon.png differ
diff --git a/hr_employee_status/static/description/index.html b/hr_employee_status/static/description/index.html
new file mode 100644
index 00000000..c23ab4a5
--- /dev/null
+++ b/hr_employee_status/static/description/index.html
@@ -0,0 +1,440 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Employment Status</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="employment-status">
+<h1 class="title">Employment Status</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:405791fd67002fbd9f1cd5ee921255705ed95ca05974f1740467bdb62b730932
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/hr_employee_status"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<div class="section" id="track-the-hr-status-of-employees">
+<h1>Track the HR status of employees</h1>
+<p>This module manages the employee life-cycle from on-boarding to separation.</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="toc-entry-1">Changelog</a><ul>
+<li><a class="reference internal" href="#section-1" id="toc-entry-2">14.0.1.0.2 (2022-01-12)</a></li>
+<li><a class="reference internal" href="#section-2" id="toc-entry-3">14.0.1.0.1 (2021-10-07)</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-4">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-5">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-6">Authors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-7">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-8">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="changelog">
+<h2><a class="toc-backref" href="#toc-entry-1">Changelog</a></h2>
+<div class="section" id="section-1">
+<h3><a class="toc-backref" href="#toc-entry-2">14.0.1.0.2 (2022-01-12)</a></h3>
+<ul class="simple">
+<li>[ADD] Allow users to view their own (and subordinates) separation records</li>
+</ul>
+</div>
+<div class="section" id="section-2">
+<h3><a class="toc-backref" href="#toc-entry-3">14.0.1.0.1 (2021-10-07)</a></h3>
+<ul class="simple">
+<li>[FIX] Scheduled actions related to employment status no longer fail because of a programming error</li>
+</ul>
+</div>
+</div>
+<div class="section" id="bug-tracker">
+<h2><a class="toc-backref" href="#toc-entry-4">Bug Tracker</a></h2>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20hr_employee_status%0Aversion:%2014.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">
+<h2><a class="toc-backref" href="#toc-entry-5">Credits</a></h2>
+<div class="section" id="authors">
+<h3><a class="toc-backref" href="#toc-entry-6">Authors</a></h3>
+<ul class="simple">
+<li>TREVI Software</li>
+<li>Michael Telahun Makonnen</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h3><a class="toc-backref" href="#toc-entry-7">Other credits</a></h3>
+<ul class="simple">
+<li>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h3><a class="toc-backref" href="#toc-entry-8">Maintainers</a></h3>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/hr_employee_status">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/hr_employee_status/static/src/img/main_screenshot.png b/hr_employee_status/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/hr_employee_status/static/src/img/main_screenshot.png differ
diff --git a/hr_employee_status/tests/__init__.py b/hr_employee_status/tests/__init__.py
new file mode 100644
index 00000000..090333ed
--- /dev/null
+++ b/hr_employee_status/tests/__init__.py
@@ -0,0 +1,6 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import test_hr_contract
+from . import test_hr_employee
+from . import test_hr_separation
diff --git a/hr_employee_status/tests/test_hr_contract.py b/hr_employee_status/tests/test_hr_contract.py
new file mode 100644
index 00000000..e944777d
--- /dev/null
+++ b/hr_employee_status/tests/test_hr_contract.py
@@ -0,0 +1,99 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+
+from datetime import date
+
+from dateutil.relativedelta import relativedelta
+
+from odoo.tests import common
+
+
+class TestEmployee(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super(TestEmployee, cls).setUpClass()
+
+        cls.Employee = cls.env["hr.employee"]
+        cls.Contract = cls.env["hr.contract"]
+        cls.ContractEnd = cls.env["hr.contract.end"]
+        cls.Separation = cls.env["hr.employee.termination"]
+        cls.reason = cls.env["hr.employee.termination.reason"].create(
+            {"name": "Retired"}
+        )
+
+    def create_employee(self, name="John Smith"):
+        return self.Employee.create(
+            {
+                "name": name,
+            }
+        )
+
+    def apply_contract_cron(self):
+        self.env.ref(
+            "hr_contract.ir_cron_data_contract_update_state"
+        ).method_direct_trigger()
+
+    def create_contract(
+        self, employee, state, kanban_state, start, end=None, trial_end=None
+    ):
+        return self.Contract.create(
+            {
+                "name": "Contract",
+                "employee_id": employee.id,
+                "state": state,
+                "kanban_state": kanban_state,
+                "wage": 1,
+                "date_start": start,
+                "trial_date_end": trial_end,
+                "date_end": end,
+            }
+        )
+
+    def test_contract_autoclose(self):
+        """Closing a contract with automated action causes separation record to be created."""
+
+        start = date.today() - relativedelta(days=100)
+        end = date.today() - relativedelta(days=1)
+        ee = self.create_employee()
+        cc = self.create_contract(ee, "draft", "done", start, end)
+        cc.signal_confirm()
+        self.assertEqual("open", cc.state)
+        self.assertEqual("active", ee.status)
+
+        # Auto-close contract
+        self.apply_contract_cron()
+
+        self.assertEqual(1, len(ee.inactive_ids))
+        self.assertEqual(end, ee.inactive_ids[0].name)
+        self.assertEqual("separation", ee.status)
+        self.assertEqual(end, cc.date_end)
+        self.assertEqual("close", cc.state)
+
+    def test_end_contract_wizard(self):
+        """Running 'End Contract' wizard creates separation record and closes contract"""
+
+        start = date.today() - relativedelta(days=100)
+        end = date.today()
+        ee = self.create_employee()
+        cc = self.create_contract(ee, "draft", "done", start)
+        cc.signal_confirm()
+        self.assertEqual("open", cc.state)
+        self.assertEqual("active", ee.status)
+
+        # End Contract wizard
+        cend = self.ContractEnd.create(
+            {
+                "contract_id": cc.id,
+                "employee_id": ee.id,
+                "reason_id": self.reason.id,
+                "date": date.today(),
+            }
+        )
+        cend.set_employee_inactive()
+
+        self.assertEqual(1, len(ee.inactive_ids))
+        self.assertEqual(end, ee.inactive_ids[0].name)
+        self.assertEqual("separation", ee.status)
+        self.assertEqual(end, cc.date_end)
+        self.assertEqual("close", cc.state)
diff --git a/hr_employee_status/tests/test_hr_employee.py b/hr_employee_status/tests/test_hr_employee.py
new file mode 100644
index 00000000..306d47f3
--- /dev/null
+++ b/hr_employee_status/tests/test_hr_employee.py
@@ -0,0 +1,145 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+
+from datetime import date
+
+from dateutil.relativedelta import relativedelta
+
+from odoo.exceptions import UserError
+from odoo.tests import common
+
+
+class TestEmployee(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super(TestEmployee, cls).setUpClass()
+
+        cls.Employee = cls.env["hr.employee"]
+        cls.Contract = cls.env["hr.contract"]
+
+    def create_employee(self, name="John Smith"):
+        return self.Employee.create(
+            {
+                "name": name,
+            }
+        )
+
+    def apply_contract_cron(self):
+        self.env.ref(
+            "hr_contract.ir_cron_data_contract_update_state"
+        ).method_direct_trigger()
+
+    def create_contract(
+        self, employee, state, kanban_state, start, end=None, trial_end=None
+    ):
+        return self.env["hr.contract"].create(
+            {
+                "name": "Contract",
+                "employee_id": employee.id,
+                "state": state,
+                "kanban_state": kanban_state,
+                "wage": 1,
+                "date_start": start,
+                "trial_date_end": trial_end,
+                "date_end": end,
+            }
+        )
+
+    def test_new_employee_state(self):
+        """New employee status is 'new'"""
+
+        ee = self.create_employee()
+        self.assertEqual("new", ee.status)
+
+    def test_contract_open_trigger(self):
+        """When contract changes to open new employee should go to trial period"""
+
+        start = date.today()
+        end = start + relativedelta(days=60)
+        ee = self.create_employee()
+        cc = self.create_contract(ee, "draft", "normal", start, trial_end=end)
+        self.assertEqual("new", ee.status)
+
+        # Open contract
+        cc.signal_confirm()
+        self.assertEqual("trial", cc.state)
+        self.assertEqual("trial", ee.status)
+
+    def test_contract_autoopen_trigger(self):
+        """When contract auto-updates to open new employee should go to trial period"""
+
+        start = date.today()
+        end = start + relativedelta(days=60)
+        ee = self.create_employee()
+        cc = self.create_contract(ee, "draft", "done", start, trial_end=end)
+        self.assertEqual("new", ee.status)
+
+        # Open contract
+        self.apply_contract_cron()
+        self.assertEqual("trial", cc.state)
+        self.assertEqual("trial", ee.status)
+
+    def test_contract_open_notrigger_trial(self):
+        """A contract without trial period does not trigger employee trial period"""
+
+        start = date.today()
+        ee = self.create_employee()
+        cc = self.create_contract(ee, "draft", "normal", start)
+        self.assertEqual("new", ee.status)
+
+        # Open contract
+        cc.signal_confirm()
+        self.assertEqual("open", cc.state)
+        self.assertEqual("active", ee.status)
+
+    def test_contract_autoopen_notrigger_trial(self):
+        """When A contract without trial period auto-updates to 'running' it
+        does not trigger employee trial period"""
+
+        start = date.today()
+        ee = self.create_employee()
+        cc = self.create_contract(ee, "draft", "done", start)
+        self.assertEqual("new", ee.status)
+
+        # Open contract
+        self.apply_contract_cron()
+        self.assertEqual("open", cc.state)
+        self.assertEqual("active", ee.status)
+
+    def test_trial_to_active(self):
+        """When the contract goes 'open' employee should move trial->active"""
+
+        start = date.today() - relativedelta(days=100)
+        end = date.today() + relativedelta(days=60)
+        ee = self.create_employee()
+        cc = self.create_contract(ee, "draft", "normal", start, trial_end=end)
+        self.assertEqual("new", ee.status)
+
+        # Open contract
+        cc.signal_confirm()
+        self.assertEqual("trial", cc.state)
+        self.assertEqual("trial", ee.status)
+
+        # End trial
+        cc.trial_date_end = date.today() - relativedelta(days=1)
+        self.apply_contract_cron()
+        self.assertEqual("open", cc.state)
+        self.assertEqual("active", ee.status)
+
+    def test_premature_transition_to_active(self):
+        """Transition from trial to active before trial period ends is prohibited"""
+
+        start = date.today() - relativedelta(days=100)
+        end = date.today() + relativedelta(days=60)
+        ee = self.create_employee()
+        cc = self.create_contract(ee, "draft", "normal", start, trial_end=end)
+        self.assertEqual("new", ee.status)
+
+        # Open contract
+        cc.signal_confirm()
+        self.assertEqual("trial", cc.state)
+        self.assertEqual("trial", ee.status)
+
+        with self.assertRaises(UserError):
+            ee.status = "active"
diff --git a/hr_employee_status/tests/test_hr_separation.py b/hr_employee_status/tests/test_hr_separation.py
new file mode 100644
index 00000000..881669fd
--- /dev/null
+++ b/hr_employee_status/tests/test_hr_separation.py
@@ -0,0 +1,315 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+
+from datetime import date
+
+from dateutil.relativedelta import relativedelta
+
+from odoo.exceptions import UserError
+from odoo.tests import common
+
+
+class TestEmployee(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super(TestEmployee, cls).setUpClass()
+
+        cls.Employee = cls.env["hr.employee"]
+        cls.Contract = cls.env["hr.contract"]
+        cls.Separation = cls.env["hr.employee.termination"]
+        cls.reason = cls.env["hr.employee.termination.reason"].create(
+            {"name": "Retired"}
+        )
+
+    def create_employee(self, name="John Smith"):
+        return self.Employee.create(
+            {
+                "name": name,
+            }
+        )
+
+    def apply_contract_cron(self):
+        self.env.ref(
+            "hr_contract.ir_cron_data_contract_update_state"
+        ).method_direct_trigger()
+
+    def apply_separation_cron(self):
+        self.env.ref(
+            "hr_employee_status.ir_cron_data_separation_update_state"
+        ).method_direct_trigger()
+
+    def create_contract(
+        self, employee, state, kanban_state, start, end=None, trial_end=None
+    ):
+        return self.Contract.create(
+            {
+                "name": "Contract",
+                "employee_id": employee.id,
+                "state": state,
+                "kanban_state": kanban_state,
+                "wage": 1,
+                "date_start": start,
+                "trial_date_end": trial_end,
+                "date_end": end,
+            }
+        )
+
+    def create_separation(self, employee, date=None):
+        if date is None:
+            date = date.today()
+        return self.Separation.create(
+            {
+                "name": date,
+                "reason_id": self.reason.id,
+                "employee_id": employee.id,
+            }
+        )
+
+    def test_separation_triggers_status_change(self):
+        """Employee separation changes employee/contract -> pending_separation"""
+
+        start = date.today() - relativedelta(days=100)
+        sep_date = date.today() + relativedelta(days=5)
+        ee = self.create_employee()
+        cc = self.create_contract(ee, "draft", "done", start)
+        cc.signal_confirm()
+        self.assertEqual("open", cc.state)
+        self.assertEqual("active", ee.status)
+
+        # Create separation
+        sep = self.create_separation(ee, sep_date)
+        self.assertEqual("draft", sep.state)
+        self.assertEqual("separation", ee.status)
+        self.assertEqual("open", cc.state)
+        self.assertEqual(sep_date, cc.date_end)
+        self.assertFalse(sep.contract_date_end)
+
+    def test_cancel_separation_trial(self):
+        """Cancelling of separation of employee in trial period reverts
+        contract and employee back to trial"""
+
+        start = date.today() - relativedelta(days=100)
+        end = date.today() + relativedelta(days=100)
+        trial_end = date.today() + relativedelta(days=50)
+        sep_date = date.today() + relativedelta(days=5)
+        ee = self.create_employee()
+        cc = self.create_contract(ee, "draft", "done", start, end, trial_end)
+        cc.signal_confirm()
+        self.assertEqual("trial", cc.state)
+        self.assertEqual("trial", ee.status)
+
+        # Create separation
+        sep = self.create_separation(ee, sep_date)
+        self.assertEqual("draft", sep.state)
+        self.assertEqual("separation", ee.status)
+        self.assertEqual("trial", cc.state)
+        self.assertEqual(sep_date, cc.date_end)
+        self.assertEqual(end, sep.contract_date_end)
+
+        # cancel separation
+        sep.signal_cancel()
+        self.assertEqual("trial", cc.state)
+        self.assertEqual("trial", ee.status)
+        self.assertEqual("cancel", sep.state)
+
+    def test_cancel_separation_open(self):
+        """Cancelling of sepration of employee with active status reverts
+        contract and employee back to open/active"""
+
+        start = date.today() - relativedelta(days=100)
+        end = date.today() + relativedelta(days=100)
+        sep_date = date.today() + relativedelta(days=5)
+        ee = self.create_employee()
+        cc = self.create_contract(ee, "draft", "done", start, end)
+        cc.signal_confirm()
+        self.assertEqual("open", cc.state)
+        self.assertEqual("active", ee.status)
+
+        # Create separation
+        sep = self.create_separation(ee, sep_date)
+        self.assertEqual("draft", sep.state)
+        self.assertEqual("separation", ee.status)
+        self.assertTrue(ee.active)
+        self.assertEqual("open", cc.state)
+        self.assertEqual(sep_date, cc.date_end)
+        self.assertEqual(end, sep.contract_date_end)
+
+        # cancel separation
+        sep.signal_cancel()
+        self.assertEqual("open", cc.state)
+        self.assertEqual("active", ee.status)
+        self.assertTrue(ee.active)
+        self.assertEqual("cancel", sep.state)
+
+    def test_unlink_separation_trial(self):
+        """Unlinking of separation of employee in trial period reverts
+        contract and employee back to trial"""
+
+        start = date.today() - relativedelta(days=100)
+        end = date.today() + relativedelta(days=100)
+        trial_end = date.today() + relativedelta(days=50)
+        sep_date = date.today() + relativedelta(days=5)
+        ee = self.create_employee()
+        cc = self.create_contract(ee, "draft", "done", start, end, trial_end)
+        cc.signal_confirm()
+        self.assertEqual("trial", cc.state)
+        self.assertEqual("trial", ee.status)
+
+        # Create separation
+        sep = self.create_separation(ee, sep_date)
+        self.assertEqual("draft", sep.state)
+        self.assertEqual("separation", ee.status)
+        self.assertEqual("trial", cc.state)
+        self.assertEqual(sep_date, cc.date_end)
+        self.assertEqual(end, sep.contract_date_end)
+
+        # Unlink() separation
+        sep.unlink()
+        self.assertEqual("trial", cc.state)
+        self.assertEqual("trial", ee.status)
+
+    def test_unlink_separation_open(self):
+        """Unlinking of sepration of employee with active status reverts
+        contract and employee back to open/active"""
+
+        start = date.today() - relativedelta(days=100)
+        end = date.today() + relativedelta(days=100)
+        sep_date = date.today() + relativedelta(days=5)
+        ee = self.create_employee()
+        cc = self.create_contract(ee, "draft", "done", start, end)
+        cc.signal_confirm()
+        self.assertEqual("open", cc.state)
+        self.assertEqual("active", ee.status)
+
+        # Create separation
+        sep = self.create_separation(ee, sep_date)
+        self.assertEqual("draft", sep.state)
+        self.assertEqual("separation", ee.status)
+        self.assertTrue(ee.active)
+        self.assertEqual("open", cc.state)
+        self.assertEqual(sep_date, cc.date_end)
+        self.assertEqual(end, sep.contract_date_end)
+
+        # Unlink() separation
+        sep.unlink()
+        self.assertEqual("open", cc.state)
+        self.assertEqual("active", ee.status)
+        self.assertTrue(ee.active)
+
+    def test_autoconfirm_separation(self):
+        """When separation date arrives, cron changes the status of
+        separation, employee, and contract"""
+
+        start = date.today() - relativedelta(days=100)
+        end = date.today() + relativedelta(days=100)
+        sep_date = date.today() + relativedelta(days=5)
+        ee = self.create_employee()
+        cc = self.create_contract(ee, "draft", "done", start, end)
+        cc.signal_confirm()
+        self.assertEqual("open", cc.state)
+        self.assertEqual("active", ee.status)
+
+        # Create separation
+        sep = self.create_separation(ee, sep_date)
+        self.assertEqual("draft", sep.state)
+        self.assertEqual("separation", ee.status)
+        self.assertEqual("open", cc.state)
+        self.assertTrue(ee.active)
+        self.assertEqual(sep_date, cc.date_end)
+        self.assertEqual(end, sep.contract_date_end)
+
+        # Update separation date to yesterday and run cron
+        sep.name = date.today() - relativedelta(days=1)
+        self.apply_separation_cron()
+
+        self.assertEqual("done", sep.state)
+        self.assertEqual("inactive", ee.status)
+        self.assertFalse(ee.active)
+        self.assertEqual("close", cc.state)
+        self.assertEqual("done", sep.state)
+
+    def test_done_separation(self):
+        """When user clicks the 'done' button it changes the status of
+        separation, employee, and contract"""
+
+        start = date.today() - relativedelta(days=100)
+        end = date.today() + relativedelta(days=100)
+        sep_date = date.today() + relativedelta(days=5)
+        ee = self.create_employee()
+        cc = self.create_contract(ee, "draft", "done", start, end)
+        cc.signal_confirm()
+        self.assertEqual("open", cc.state)
+        self.assertEqual("active", ee.status)
+
+        # Create separation
+        sep = self.create_separation(ee, sep_date)
+        self.assertEqual("draft", sep.state)
+        self.assertEqual("separation", ee.status)
+        self.assertEqual("open", cc.state)
+        self.assertTrue(ee.active)
+        self.assertEqual(sep_date, cc.date_end)
+        self.assertEqual(end, sep.contract_date_end)
+
+        # Update separation date to today and set done
+        sep.name = date.today()
+        sep.signal_done()
+
+        self.assertEqual("done", sep.state)
+        self.assertEqual("inactive", ee.status)
+        self.assertFalse(ee.active)
+        self.assertEqual("close", cc.state)
+        self.assertEqual("done", sep.state)
+
+    def test_done_separation_archives_all(self):
+        """When the separation is done employee and contracts should be archived"""
+
+        start = date.today() - relativedelta(days=100)
+        end = date.today() + relativedelta(days=100)
+        sep_date = date.today() + relativedelta(days=5)
+        ee = self.create_employee()
+        cc = self.create_contract(ee, "draft", "done", start, end)
+        cc.signal_confirm()
+        self.assertEqual("open", cc.state)
+        self.assertEqual("active", ee.status)
+
+        # Create separation
+        sep = self.create_separation(ee, sep_date)
+        self.assertEqual("draft", sep.state)
+        self.assertEqual("separation", ee.status)
+        self.assertEqual("open", cc.state)
+        self.assertTrue(ee.active)
+        self.assertEqual(sep_date, cc.date_end)
+        self.assertEqual(end, sep.contract_date_end)
+
+        # Update separation date to today and set done
+        sep.name = date.today()
+        sep.signal_done()
+
+        self.assertFalse(ee.active)
+        self.assertFalse(cc.active)
+
+    def test_done_separation_in_future(self):
+        """When user clicks the 'done' button before the separation date
+        it refuses"""
+
+        start = date.today() - relativedelta(days=100)
+        end = date.today() + relativedelta(days=100)
+        sep_date = date.today() + relativedelta(days=5)
+        ee = self.create_employee()
+        cc = self.create_contract(ee, "draft", "done", start, end)
+        cc.signal_confirm()
+        self.assertEqual("open", cc.state)
+        self.assertEqual("active", ee.status)
+
+        # Create separation
+        sep = self.create_separation(ee, sep_date)
+        self.assertEqual("draft", sep.state)
+        self.assertEqual("separation", ee.status)
+        self.assertEqual("open", cc.state)
+        self.assertTrue(ee.active)
+        self.assertEqual(sep_date, cc.date_end)
+        self.assertEqual(end, sep.contract_date_end)
+
+        with self.assertRaises(UserError):
+            sep.signal_done()
diff --git a/hr_employee_status/views/hr_view.xml b/hr_employee_status/views/hr_view.xml
new file mode 100644
index 00000000..87c15a32
--- /dev/null
+++ b/hr_employee_status/views/hr_view.xml
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+
+        <record id="view_employee_form" model="ir.ui.view">
+            <field name="name">hr.employee.form.inherit.1</field>
+            <field name="model">hr.employee</field>
+            <field name="inherit_id" ref="hr.view_employee_form" />
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="//header" position="inside">
+                        <button
+                            name="signal_reactivate"
+                            type="object"
+                            string="Re-Activate"
+                            attrs="{'invisible': [('status','!=','inactive')]}"
+                            groups="hr.group_hr_manager"
+                            class="oe_highlight"
+                        />
+                        <field name="status" widget="statusbar" />
+                    </xpath>
+                    <xpath expr="//page[@name='hr_settings']" position="after">
+                        <page string="Deactivation">
+                            <group>
+                                <group
+                                    string="Deactivation Records"
+                                    colspan="4"
+                                    col="4"
+                                >
+                                    <field name="inactive_ids" nolabel="1">
+                                        <tree string="Inactive Records">
+                                            <field name="name" />
+                                            <field name="reason_id" />
+                                            <field name="state" />
+                                        </tree>
+                                    </field>
+                                </group>
+                            </group>
+                        </page>
+                    </xpath>
+                </data>
+            </field>
+        </record>
+
+        <record id="view_termination_filter" model="ir.ui.view">
+            <field name="name">Employee Separation Search</field>
+            <field name="model">hr.employee.termination</field>
+            <field name="arch" type="xml">
+                <search string="Employee Separations">
+                    <field name="name" />
+                    <field name="employee_id" string="Employees" />
+                    <field name="department_id" />
+                    <filter
+                        string="Draft, Confirmed"
+                        icon="terp-personal"
+                        name="draft_state"
+                        domain="[('state','in', ['draft','confirm'])]"
+                        help="To be processed"
+                    />
+                    <group expand="0" string="Group By...">
+                        <filter
+                            name="group_department"
+                            string="Department"
+                            icon="terp-personal+"
+                            domain="[]"
+                            context="{'group_by':'department_id'}"
+                        />
+                    </group>
+                </search>
+             </field>
+         </record>
+
+        <record id="hr_employee_termination_tree_view" model="ir.ui.view">
+            <field name="name">hr.employee.termination.tree</field>
+            <field name="model">hr.employee.termination</field>
+            <field name="arch" type="xml">
+                <tree string="Employment Separations">
+                    <field name="employee_id" />
+                    <field name="department_id" />
+                    <field name="name" />
+                    <field name="reason_id" />
+                    <field name="state" />
+                </tree>
+            </field>
+        </record>
+
+        <record id="hr_employee_termination_form_view" model="ir.ui.view">
+            <field name="name">hr.employee.termination.form</field>
+            <field name="model">hr.employee.termination</field>
+            <field name="arch" type="xml">
+                <form string="Employment Separation">
+                    <sheet>
+                        <header>
+                            <button
+                                name="signal_done"
+                                type="object"
+                                states="draft"
+                                string="Deactivate"
+                                class="oe_highlight"
+                            />
+                            <button
+                                name="signal_cancel"
+                                type="object"
+                                states="draft"
+                                string="Cancel"
+                                class="oe_highlight"
+                            />
+                            <field name="state" widget="statusbar" />
+                        </header>
+                        <group>
+                            <group>
+                                <field name="employee_id" />
+                                <field name="reason_id" />
+                                <field name="name" />
+                            </group>
+                            <group>
+                                <field name="department_id" />
+                            </group>
+                        </group>
+                        <separator string="Notes" />
+                        <field name="notes" nolabel="1" />
+                    </sheet>
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers" />
+                        <field name="message_ids" widget="mail_thread" />
+                    </div>
+                </form>
+            </field>
+        </record>
+
+        <record id="open_hr_employee_termination" model="ir.actions.act_window">
+            <field name="name">Employee Separation</field>
+            <field name="res_model">hr.employee.termination</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'search_default_draft_state': 1}</field>
+            <field name="search_view_id" ref="view_termination_filter" />
+        </record>
+        <menuitem
+            id="menu_hr_employee_termination"
+            action="open_hr_employee_termination"
+            parent="hr.menu_hr_root"
+            groups="hr.group_hr_user"
+            sequence="8"
+        />
+
+        <!-- Termination Reason -->
+
+        <record id="view_termination_reason_tree" model="ir.ui.view">
+            <field name="name">hr.employee.termination.reason.tree</field>
+            <field name="model">hr.employee.termination.reason</field>
+            <field name="arch" type="xml">
+                <tree string="Employment Separation Reasons">
+                    <field name="name" />
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_termination_reason_form" model="ir.ui.view">
+            <field name="name">hr.employee.termination.reason.form</field>
+            <field name="model">hr.employee.termination.reason</field>
+            <field name="arch" type="xml">
+                <form string="Employment Separation Reason">
+                    <field name="name" />
+                </form>
+            </field>
+        </record>
+
+        <record id="open_termination_reason" model="ir.actions.act_window">
+            <field name="name">Employment Separation Reasons</field>
+            <field name="res_model">hr.employee.termination.reason</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem
+            id="menu_hr_employee_termination_reason"
+            action="open_termination_reason"
+            parent="hr.menu_human_resources_configuration"
+            sequence="5"
+        />
+
+        <!-- HR Contract -->
+        <record id="view_contract_form" model="ir.ui.view">
+            <field name="name">hr.contract.form.inherit.1</field>
+            <field name="model">hr.contract</field>
+            <field name="priority">99</field>
+            <field name="inherit_id" ref="hr_contract_status.view_contract_form" />
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="//button[@name='signal_close']" position="replace">
+                        <button
+                            name="end_contract"
+                            type="object"
+                            string="End Contract"
+                            groups="hr.group_hr_user"
+                            states="draft,trial,trial_ending,open,contract_ending"
+                            class="oe_highlight"
+                        />
+                        <button
+                            name="re_activate"
+                            type="object"
+                            string="Re-Activate"
+                            groups="hr.group_hr_user"
+                            states="pending_done"
+                            class="oe_highlight"
+                        />
+                    </xpath>
+                </data>
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/hr_employee_status/wizard/__init__.py b/hr_employee_status/wizard/__init__.py
new file mode 100644
index 00000000..610e31e6
--- /dev/null
+++ b/hr_employee_status/wizard/__init__.py
@@ -0,0 +1,21 @@
+##############################################################################
+#
+#    Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+#    All Rights Reserved.
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from . import end_contract
diff --git a/hr_employee_status/wizard/end_contract.py b/hr_employee_status/wizard/end_contract.py
new file mode 100644
index 00000000..076aeb12
--- /dev/null
+++ b/hr_employee_status/wizard/end_contract.py
@@ -0,0 +1,60 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+
+from odoo import api, fields, models
+
+
+class EmployeeSetInactive(models.TransientModel):
+
+    _name = "hr.contract.end"
+    _description = "Employee De-Activation Wizard"
+
+    @api.model
+    def _get_contract(self):
+
+        return self.env.context.get("end_contract_id", False)
+
+    @api.model
+    def _get_employee(self):
+
+        contract_id = self.env.context.get("end_contract_id", False)
+        if not contract_id:
+            return False
+
+        data = self.env["hr.contract"].browse(contract_id).read(["employee_id"])
+        return data["employee_id"][0]
+
+    contract_id = fields.Many2one(
+        string="Contract",
+        comodel_name="hr.contract",
+        default=_get_contract,
+        readonly=True,
+    )
+    employee_id = fields.Many2one(
+        string="Employee",
+        comodel_name="hr.employee",
+        default=_get_employee,
+        required=True,
+        readonly=True,
+    )
+    date = fields.Date(required=True, default=fields.Date.today())
+    reason_id = fields.Many2one(
+        string="Reason", comodel_name="hr.employee.termination.reason", required=True
+    )
+    notes = fields.Text()
+
+    def set_employee_inactive(self):
+
+        self.ensure_one()
+        vals = {
+            "name": self.date,
+            "employee_id": self.employee_id.id,
+            "reason_id": self.reason_id.id,
+            "notes": self.notes,
+        }
+        self.contract_id.setup_pending_done(vals)
+        self.contract_id.signal_close()
+
+        return {"type": "ir.actions.act_window_close"}
diff --git a/hr_employee_status/wizard/end_contract_view.xml b/hr_employee_status/wizard/end_contract_view.xml
new file mode 100644
index 00000000..2b2cbb3a
--- /dev/null
+++ b/hr_employee_status/wizard/end_contract_view.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+
+        <record id="action_set_inactive" model="ir.actions.act_window">
+            <field name="name">Employee De-Activation Wizard</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr.contract.end</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+        <record id="view_inactive_wizard" model="ir.ui.view">
+            <field name="name">hr.contract.end.form</field>
+            <field name="model">hr.contract.end</field>
+            <field name="arch" type="xml">
+                <form string="Employee De-Activation Wizard" version="7.0">
+                    <newline />
+                    <div>
+                        <b>
+                        This employee will no longer have any running contracts. In such a case it is
+                        customary for the employee record to be archived as an 'inactive' record.
+                        However, the record and all the employee's associated data such as contracts,
+                        leaves, attendances, etc will still be available. This is not a
+                        permanent removal of the employee record. Should you wish to you can
+                        easily re-activate it again at any time in the future.
+                        </b>
+                    </div>
+                    <group>
+                        <group>
+                            <field name="contract_id" invisible="1" />
+                            <field name="employee_id" />
+                            <field name="date" />
+                            <field name="reason_id" />
+                        </group>
+                        <group />
+                    </group>
+                    <group string="Notes" colspan="4">
+                        <field name="notes" nolabel="1" />
+                    </group>
+                    <footer>
+                        <button
+                            name="set_employee_inactive"
+                            type="object"
+                            string="End Employment"
+                            class="oe_highlight"
+                        />
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/hr_employee_status_benefit/README.rst b/hr_employee_status_benefit/README.rst
new file mode 100644
index 00000000..e032f754
--- /dev/null
+++ b/hr_employee_status_benefit/README.rst
@@ -0,0 +1,62 @@
+=======================
+Employee status benefit
+=======================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:9c0a6c9ef0dcdaf85ac5194019180793a559bc066ec1fef1608f9bc0a6002f8a
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/hr_employee_status_benefit
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+This module creates a linkage between the hr_employee_status and hr_benefit modules. It ensures that when
+an employee is separated all benefit policies are also terminated.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20hr_employee_status_benefit%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+* Michael Telahun Makonnen
+
+Other credits
+~~~~~~~~~~~~~
+
+* Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/hr_employee_status_benefit>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/hr_employee_status_benefit/__init__.py b/hr_employee_status_benefit/__init__.py
new file mode 100644
index 00000000..86f3c8b1
--- /dev/null
+++ b/hr_employee_status_benefit/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
diff --git a/hr_employee_status_benefit/__manifest__.py b/hr_employee_status_benefit/__manifest__.py
new file mode 100644
index 00000000..638b4f90
--- /dev/null
+++ b/hr_employee_status_benefit/__manifest__.py
@@ -0,0 +1,17 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Employee status benefit",
+    "summary": "Link between hr_employee_status and hr_benefit",
+    "version": "15.0.1.0.0",
+    "category": "Human Resources",
+    "images": ["static/src/img/main_screenshot.png"],
+    "license": "AGPL-3",
+    "author": "TREVI Software, Michael Telahun Makonnen",
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": ["hr", "hr_benefit", "hr_employee_status"],
+    "data": [],
+    "installable": True,
+}
diff --git a/hr_employee_status_benefit/i18n/hr_employee_status_benefit.pot b/hr_employee_status_benefit/i18n/hr_employee_status_benefit.pot
new file mode 100644
index 00000000..bce7b309
--- /dev/null
+++ b/hr_employee_status_benefit/i18n/hr_employee_status_benefit.pot
@@ -0,0 +1,34 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* hr_employee_status_benefit
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: hr_employee_status_benefit
+#: model:ir.model.fields,field_description:hr_employee_status_benefit.field_hr_employee__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: hr_employee_status_benefit
+#: model:ir.model,name:hr_employee_status_benefit.model_hr_employee
+msgid "Employee"
+msgstr ""
+
+#. module: hr_employee_status_benefit
+#: model:ir.model.fields,field_description:hr_employee_status_benefit.field_hr_employee__id
+msgid "ID"
+msgstr ""
+
+#. module: hr_employee_status_benefit
+#: model:ir.model.fields,field_description:hr_employee_status_benefit.field_hr_employee____last_update
+msgid "Last Modified on"
+msgstr ""
diff --git a/hr_employee_status_benefit/models/__init__.py b/hr_employee_status_benefit/models/__init__.py
new file mode 100644
index 00000000..0e3b5b81
--- /dev/null
+++ b/hr_employee_status_benefit/models/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import hr_employee
diff --git a/hr_employee_status_benefit/models/hr_employee.py b/hr_employee_status_benefit/models/hr_employee.py
new file mode 100644
index 00000000..e05f7dfe
--- /dev/null
+++ b/hr_employee_status_benefit/models/hr_employee.py
@@ -0,0 +1,32 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import fields, models
+
+
+class HrEmployee(models.Model):
+
+    _inherit = "hr.employee"
+
+    def set_state_inactive(self):
+
+        for ee in self:
+
+            inactive_date = False
+            for term in ee.inactive_ids:
+                if (
+                    not inactive_date
+                    or term.name > inactive_date
+                    and term.state != "cancel"
+                ):
+                    inactive_date = term.name
+            if inactive_date is False:
+                inactive_date = fields.Date.today()
+
+            for policy in ee.benefit_policy_ids:
+                if policy.state not in ["done"]:
+                    policy.end_date = inactive_date
+                    policy.state_done()
+
+        return super().set_state_inactive()
diff --git a/hr_employee_status_benefit/readme/CREDITS.rst b/hr_employee_status_benefit/readme/CREDITS.rst
new file mode 100644
index 00000000..d264bc7e
--- /dev/null
+++ b/hr_employee_status_benefit/readme/CREDITS.rst
@@ -0,0 +1 @@
+* Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/hr_employee_status_benefit/readme/DESCRIPTION.rst b/hr_employee_status_benefit/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..05c7c49b
--- /dev/null
+++ b/hr_employee_status_benefit/readme/DESCRIPTION.rst
@@ -0,0 +1,2 @@
+This module creates a linkage between the hr_employee_status and hr_benefit modules. It ensures that when
+an employee is separated all benefit policies are also terminated.
diff --git a/hr_employee_status_benefit/static/description/icon.png b/hr_employee_status_benefit/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/hr_employee_status_benefit/static/description/icon.png differ
diff --git a/hr_employee_status_benefit/static/description/index.html b/hr_employee_status_benefit/static/description/index.html
new file mode 100644
index 00000000..bcaa7928
--- /dev/null
+++ b/hr_employee_status_benefit/static/description/index.html
@@ -0,0 +1,418 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Employee status benefit</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="employee-status-benefit">
+<h1 class="title">Employee status benefit</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:9c0a6c9ef0dcdaf85ac5194019180793a559bc066ec1fef1608f9bc0a6002f8a
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/hr_employee_status_benefit"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<p>This module creates a linkage between the hr_employee_status and hr_benefit modules. It ensures that when
+an employee is separated all benefit policies are also terminated.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-4">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20hr_employee_status_benefit%0Aversion:%2014.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="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>TREVI Software</li>
+<li>Michael Telahun Makonnen</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-4">Other credits</a></h2>
+<ul class="simple">
+<li>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/hr_employee_status_benefit">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/hr_employee_status_benefit/static/src/img/main_screenshot.png b/hr_employee_status_benefit/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/hr_employee_status_benefit/static/src/img/main_screenshot.png differ
diff --git a/hr_employee_status_benefit/tests/__init__.py b/hr_employee_status_benefit/tests/__init__.py
new file mode 100644
index 00000000..b5735936
--- /dev/null
+++ b/hr_employee_status_benefit/tests/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import test_hr_employee_status
diff --git a/hr_employee_status_benefit/tests/test_hr_employee_status.py b/hr_employee_status_benefit/tests/test_hr_employee_status.py
new file mode 100644
index 00000000..7430baee
--- /dev/null
+++ b/hr_employee_status_benefit/tests/test_hr_employee_status.py
@@ -0,0 +1,156 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import date
+
+from dateutil.relativedelta import relativedelta
+
+from odoo.tests import common
+
+
+class TestEmployeeStatus(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.Benefit = cls.env["hr.benefit"]
+        cls.Earning = cls.env["hr.benefit.advantage"]
+        cls.Policy = cls.env["hr.benefit.policy"]
+        cls.Employee = cls.env["hr.employee"]
+        cls.Contract = cls.env["hr.contract"]
+        cls.Separation = cls.env["hr.employee.termination"]
+
+        cls.reason = cls.env["hr.employee.termination.reason"].create(
+            {"name": "Retired"}
+        )
+
+    def create_employee(self, name="John Smith"):
+        return self.Employee.create(
+            {
+                "name": name,
+            }
+        )
+
+    def apply_contract_cron(self):
+        self.env.ref(
+            "hr_contract.ir_cron_data_contract_update_state"
+        ).method_direct_trigger()
+
+    def create_contract(
+        self, employee, state, kanban_state, start, end=None, trial_end=None
+    ):
+        return self.env["hr.contract"].create(
+            {
+                "name": "Contract",
+                "employee_id": employee.id,
+                "state": state,
+                "kanban_state": kanban_state,
+                "wage": 1,
+                "date_start": start,
+                "trial_date_end": trial_end,
+                "date_end": end,
+            }
+        )
+
+    def create_benefit(self, vals):
+
+        return self.Benefit.create(vals)
+
+    def create_earning(
+        self,
+        benefit,
+        start=False,
+        ptype="allowance",
+        limit=0,
+        limit_period="monthly",
+        limit_mo_day="1",
+        allowance=0,
+        loan=0,
+        mindays=0,
+    ):
+        _dict = {
+            "benefit_id": benefit.id,
+            "effective_date": start is False and date.today() or start,
+            "type": ptype,
+            "allowance_amount": allowance,
+            "loan_amount": loan,
+            "min_employed_days": mindays,
+        }
+        if ptype == "reimburse":
+            _dict["reim_limit_amount"] = limit
+            _dict["reim_limit_period"] = limit_period
+            _dict["reim_period_month_day"] = limit_mo_day
+        benefit.has_advantage = True
+        return self.Earning.create(_dict)
+
+    def create_policy(
+        self,
+        employee,
+        benefit,
+        start=False,
+        end=False,
+        advantage=False,
+        premium=False,
+        premium_total=False,
+    ):
+        _dict = {
+            "employee_id": employee.id,
+            "benefit_id": benefit.id,
+            "start_date": start is False and date.today() or start,
+            "end_date": end,
+        }
+        if advantage is not False:
+            _dict["advantage_override"] = True
+            _dict["advantage_amount"] = advantage
+        if premium is not False:
+            _dict["premium_override"] = True
+            _dict["premium_override_amount"] = premium
+            _dict["premium_override_total"] = premium_total
+        return self.Policy.create(_dict)
+
+    def create_separation(self, employee, date=None):
+        if date is None:
+            date = date.today()
+        return self.Separation.create(
+            {
+                "name": date,
+                "reason_id": self.reason.id,
+                "employee_id": employee.id,
+            }
+        )
+
+    def test_deactivate_employee(self):
+
+        start = date.today() - relativedelta(days=100)
+        end = date.today() + relativedelta(days=60)
+        ee = self.create_employee()
+        cc = self.create_contract(ee, "draft", "normal", start, trial_end=end)
+        cc.trial_date_end = date.today() - relativedelta(days=1)
+        self.assertEqual("new", ee.status)
+
+        # Open contract
+        cc.signal_confirm()
+        self.assertEqual("open", cc.state)
+        self.assertEqual("active", ee.status)
+
+        # create benefit policy
+        bn = self.create_benefit({"name": "B", "code": "B"})
+        self.create_earning(bn, date.today() - relativedelta(days=100), allowance=1000)
+        pol = self.create_policy(ee, bn, date.today() - relativedelta(days=100))
+        pol.state_open()
+        self.assertEqual(pol.state, "open", "The benefit policy is open and running")
+
+        # Create separation
+        sep = self.create_separation(ee, date.today())
+        self.assertEqual(ee.status, "separation", "The employee is pending separation")
+        self.assertEqual(cc.state, "open", "The contract is still open")
+        self.assertEqual(pol.state, "open", "The benefit policy is still open")
+
+        sep.signal_done()
+
+        self.assertEqual(pol.state, "done", "The benefit policy has also ended")
+        self.assertEqual(
+            pol.end_date,
+            sep.name,
+            "The separation record and benefit policy end date are the same",
+        )
diff --git a/hr_employee_status_payroll/README.rst b/hr_employee_status_payroll/README.rst
new file mode 100644
index 00000000..e844373f
--- /dev/null
+++ b/hr_employee_status_payroll/README.rst
@@ -0,0 +1,56 @@
+===================================
+Employment Status - Payroll Linkage
+===================================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:c92a2d830634dfffbc7315dbdf69509407df7e6e43a6005532a12318d9455c48
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/hr_employee_status_payroll
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+This module creates the necessary access records for the payroll manager to view employee separation records.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20hr_employee_status_payroll%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+* Michael Telahun Makonnen
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/hr_employee_status_payroll>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/hr_employee_status_payroll/__manifest__.py b/hr_employee_status_payroll/__manifest__.py
new file mode 100644
index 00000000..a1a5c7b3
--- /dev/null
+++ b/hr_employee_status_payroll/__manifest__.py
@@ -0,0 +1,22 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Employment Status - Payroll Linkage",
+    "summary": "Adds access records to employee separation records",
+    "version": "15.0.1.0.0",
+    "category": "Payroll",
+    "images": ["static/src/img/main_screenshot.png"],
+    "license": "AGPL-3",
+    "author": "TREVI Software, Michael Telahun Makonnen",
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "hr_employee_status",
+        "payroll",
+    ],
+    "data": [
+        "security/ir.model.access.csv",
+    ],
+    "installable": True,
+}
diff --git a/hr_employee_status_payroll/i18n/hr_employee_status_payroll.pot b/hr_employee_status_payroll/i18n/hr_employee_status_payroll.pot
new file mode 100644
index 00000000..4d8b20f9
--- /dev/null
+++ b/hr_employee_status_payroll/i18n/hr_employee_status_payroll.pot
@@ -0,0 +1,13 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
diff --git a/hr_employee_status_payroll/readme/DESCRIPTION.rst b/hr_employee_status_payroll/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..f18aeeca
--- /dev/null
+++ b/hr_employee_status_payroll/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+This module creates the necessary access records for the payroll manager to view employee separation records.
diff --git a/hr_employee_status_payroll/security/ir.model.access.csv b/hr_employee_status_payroll/security/ir.model.access.csv
new file mode 100644
index 00000000..e1a06720
--- /dev/null
+++ b/hr_employee_status_payroll/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_employee_termination_pm,access_hr_employee_termination,hr_employee_status.model_hr_employee_termination,payroll.group_payroll_manager,1,0,0,0
+access_hr_employee_termination_reason_pm,access_hr_employee_termination_reason,hr_employee_status.model_hr_employee_termination_reason,payroll.group_payroll_manager,1,0,0,0
diff --git a/hr_employee_status_payroll/static/description/icon.png b/hr_employee_status_payroll/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/hr_employee_status_payroll/static/description/icon.png differ
diff --git a/hr_employee_status_payroll/static/description/index.html b/hr_employee_status_payroll/static/description/index.html
new file mode 100644
index 00000000..41c6cb7c
--- /dev/null
+++ b/hr_employee_status_payroll/static/description/index.html
@@ -0,0 +1,410 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Employment Status - Payroll Linkage</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="employment-status-payroll-linkage">
+<h1 class="title">Employment Status - Payroll Linkage</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:c92a2d830634dfffbc7315dbdf69509407df7e6e43a6005532a12318d9455c48
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/hr_employee_status_payroll"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<p>This module creates the necessary access records for the payroll manager to view employee separation records.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-4">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20hr_employee_status_payroll%0Aversion:%2014.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="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>TREVI Software</li>
+<li>Michael Telahun Makonnen</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-4">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/hr_employee_status_payroll">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/hr_employee_status_payroll/static/src/img/main_screenshot.png b/hr_employee_status_payroll/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/hr_employee_status_payroll/static/src/img/main_screenshot.png differ
diff --git a/hr_employee_wizard/README.rst b/hr_employee_wizard/README.rst
new file mode 100644
index 00000000..87f170f8
--- /dev/null
+++ b/hr_employee_wizard/README.rst
@@ -0,0 +1,61 @@
+===================
+New Employee Wizard
+===================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:708ccf415da0398953eb23a6882f01ef41bc1a5f46ed84067e1cc38db87463a0
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/hr_employee_wizard
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+This module implements a wizard that allows an HR Officer to create properly configured employee records.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20hr_employee_wizard%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+* Michael Telahun Makonnen
+
+Other credits
+~~~~~~~~~~~~~
+
+* Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/hr_employee_wizard>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/hr_employee_wizard/__init__.py b/hr_employee_wizard/__init__.py
new file mode 100644
index 00000000..63868e3e
--- /dev/null
+++ b/hr_employee_wizard/__init__.py
@@ -0,0 +1,6 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
+from . import wizard
diff --git a/hr_employee_wizard/__manifest__.py b/hr_employee_wizard/__manifest__.py
new file mode 100644
index 00000000..6a393939
--- /dev/null
+++ b/hr_employee_wizard/__manifest__.py
@@ -0,0 +1,36 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "New Employee Wizard",
+    "summary": "Streamline the creation of a new employee record",
+    "version": "15.0.1.0.0",
+    "category": "Human Resources",
+    "images": ["static/src/img/main_screenshot.png"],
+    "license": "AGPL-3",
+    "author": "TREVI Software, Michael Telahun Makonnen",
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "hr_benefit",
+        # 'ethiopic_calendar',
+        "hr_contract_reference",
+        "hr_contract_values_payroll",
+        "hr_contract_values_resource_schedule",
+        "hr_employee_status",
+        # 'hr_recruitment_streamline',
+        # 'hr_employee_education',
+        "hr_recruitment",
+        "payroll_period_contract_values",
+        "payroll_periods",
+        "payroll_policy_group",
+        "resource_schedule",
+    ],
+    "data": [
+        "security/ir.model.access.csv",
+        # 'data/hr_recruitment_data.xml',
+        "wizard/hr_employee_wizard_views.xml",
+        "views/hr_recruitment_view.xml",
+    ],
+    "installable": True,
+}
diff --git a/hr_employee_wizard/i18n/hr_employee_wizard.pot b/hr_employee_wizard/i18n/hr_employee_wizard.pot
new file mode 100644
index 00000000..5c10329d
--- /dev/null
+++ b/hr_employee_wizard/i18n/hr_employee_wizard.pot
@@ -0,0 +1,398 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* hr_employee_wizard
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: hr_employee_wizard
+#: model_terms:ir.ui.view,arch_db:hr_employee_wizard.new_labour_form
+msgid "Additional Benefits"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_benefit__adv_amount
+msgid "Advantage Amount"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model,name:hr_employee_wizard.model_hr_applicant
+msgid "Applicant"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_new__job_id
+msgid "Applied Job"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields.selection,name:hr_employee_wizard.selection__hr_applicant__education__bachelor
+#: model:ir.model.fields.selection,name:hr_employee_wizard.selection__hr_employee_wizard_new__education__bachelor
+msgid "Bachelor"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,help:hr_employee_wizard.field_hr_employee_wizard_new__wage
+msgid "Basic Salary of the employee"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_benefit__benefit_id
+msgid "Benefit"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields.selection,name:hr_employee_wizard.selection__hr_employee_wizard_new__state__benefits
+#: model_terms:ir.ui.view,arch_db:hr_employee_wizard.new_labour_form
+msgid "Benefits"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_applicant__birth_date
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_new__birth_date
+msgid "Birth Date"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_new__city
+msgid "City"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_new__company_id
+msgid "Company"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields.selection,name:hr_employee_wizard.selection__hr_employee_wizard_new__state__contract
+#: model_terms:ir.ui.view,arch_db:hr_employee_wizard.new_labour_form
+msgid "Contract"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model_terms:ir.ui.view,arch_db:hr_employee_wizard.new_labour_form
+msgid "Contract Duration"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_new__country_id
+msgid "Country"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_benefit__create_uid
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_new__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_benefit__create_date
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_new__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_new__department_id
+msgid "Department"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_applicant__display_name
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_benefit__display_name
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_new__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields.selection,name:hr_employee_wizard.selection__hr_applicant__education__doctor
+#: model:ir.model.fields.selection,name:hr_employee_wizard.selection__hr_employee_wizard_new__education__doctor
+msgid "Doctor"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model_terms:ir.ui.view,arch_db:hr_employee_wizard.view_benefit
+msgid "Duration"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_applicant__education
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_new__education
+msgid "Education"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_benefit__effective_date
+msgid "Effective Date"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_new__employee_ids
+msgid "Employees"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_benefit__end_date
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_new__date_end
+msgid "End Date"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model_terms:ir.ui.view,arch_db:hr_employee_wizard.new_labour_form
+msgid "Extra"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields.selection,name:hr_employee_wizard.selection__hr_applicant__gender__f
+#: model:ir.model.fields.selection,name:hr_employee_wizard.selection__hr_employee_wizard_new__gender__f
+msgid "Female"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_applicant__gender
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_new__gender
+msgid "Gender"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields.selection,name:hr_employee_wizard.selection__hr_applicant__education__graduate
+#: model:ir.model.fields.selection,name:hr_employee_wizard.selection__hr_employee_wizard_new__education__graduate
+msgid "Graduate"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model_terms:ir.ui.view,arch_db:hr_employee_wizard.new_labour_form
+msgid "Hire"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_applicant__id
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_benefit__id
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_new__id
+msgid "ID"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model_terms:ir.ui.view,arch_db:hr_employee_wizard.new_labour_form
+msgid "Job"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_applicant____last_update
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_benefit____last_update
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_new____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_benefit__write_uid
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_new__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_benefit__write_date
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_new__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields.selection,name:hr_employee_wizard.selection__hr_applicant__gender__m
+#: model:ir.model.fields.selection,name:hr_employee_wizard.selection__hr_employee_wizard_new__gender__m
+msgid "Male"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: code:addons/hr_employee_wizard/wizard/hr_employee_wizard_new.py:0
+#: code:addons/hr_employee_wizard/wizard/hr_employee_wizard_new.py:0
+#, python-format
+msgid ""
+"Mandatory Fields Missing Make sure that at least the Name, Birth Date and "
+"Gender fields have been filled in."
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields.selection,name:hr_employee_wizard.selection__hr_applicant__education__master
+#: model:ir.model.fields.selection,name:hr_employee_wizard.selection__hr_employee_wizard_new__education__master
+msgid "Master"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_new__mobile
+msgid "Mobile"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_new__name
+msgid "Name"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_new__new_benefit_ids
+msgid "New Benefits"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model_terms:ir.ui.view,arch_db:hr_employee_wizard.new_labour_form
+msgid "New Employee Recruitment"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model,name:hr_employee_wizard.model_hr_employee_wizard_new
+msgid "New Employee Wizard"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model_terms:ir.ui.view,arch_db:hr_employee_wizard.view_benefit
+msgid "New Hire Benefit"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model,name:hr_employee_wizard.model_hr_employee_wizard_benefit
+msgid "New Hire Benefits"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.actions.act_window,name:hr_employee_wizard.action_new_labour
+#: model:ir.ui.menu,name:hr_employee_wizard.menu_new_labour
+msgid "New Recruitment"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model_terms:ir.ui.view,arch_db:hr_employee_wizard.new_labour_form
+msgid "Next"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_new__id_no
+msgid "Official ID"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields.selection,name:hr_employee_wizard.selection__hr_applicant__education__other
+#: model:ir.model.fields.selection,name:hr_employee_wizard.selection__hr_employee_wizard_new__education__other
+msgid "Other"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_benefit__adv_override
+msgid "Override Advantage"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_benefit__prm_override
+msgid "Override Premium"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_new__pps_id
+msgid "Payroll Period Schedule"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields.selection,name:hr_employee_wizard.selection__hr_employee_wizard_new__state__personal
+msgid "Personal"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model_terms:ir.ui.view,arch_db:hr_employee_wizard.new_labour_form
+msgid "Personal Info"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_new__policy_group_id
+msgid "Policy Group"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_benefit__prm_amount
+msgid "Premium Amount"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_benefit__prm_total
+msgid "Premium Total"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields.selection,name:hr_employee_wizard.selection__hr_employee_wizard_new__state__review
+#: model_terms:ir.ui.view,arch_db:hr_employee_wizard.new_labour_form
+msgid "Review"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_new__struct_id
+msgid "Salary Structure"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_new__date_start
+msgid "Start Date"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model_terms:ir.ui.view,arch_db:hr_employee_wizard.new_labour_form
+msgid "Start Recruitment"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_new__state_id
+msgid "State"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_new__state
+msgid "Status"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_new__street
+msgid "Street"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_new__telephone
+msgid "Telephone"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_new__trial_date_end
+msgid "Trial End Date"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model_terms:ir.ui.view,arch_db:hr_employee_wizard.new_labour_form
+msgid "Trial Period"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_new__trial_date_start
+msgid "Trial Start Date"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model_terms:ir.ui.view,arch_db:hr_employee_wizard.new_labour_form
+msgid "View New Hires"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_new__wage
+msgid "Wage"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_benefit__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: hr_employee_wizard
+#: model:ir.model.fields,field_description:hr_employee_wizard.field_hr_employee_wizard_new__calendar_id
+msgid "Working Schedule Template"
+msgstr ""
diff --git a/hr_employee_wizard/models/__init__.py b/hr_employee_wizard/models/__init__.py
new file mode 100644
index 00000000..a2486a1a
--- /dev/null
+++ b/hr_employee_wizard/models/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import hr_applicant
diff --git a/hr_employee_wizard/models/hr_applicant.py b/hr_employee_wizard/models/hr_applicant.py
new file mode 100644
index 00000000..80128c11
--- /dev/null
+++ b/hr_employee_wizard/models/hr_applicant.py
@@ -0,0 +1,38 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+
+from odoo import fields, models
+
+
+class HrApplicant(models.Model):
+
+    _name = "hr.applicant"
+    _inherit = "hr.applicant"
+
+    gender = fields.Selection(selection=[("f", "Female"), ("m", "Male")])
+    birth_date = fields.Date()
+    education = fields.Selection(
+        selection=[
+            ("graduate", "Graduate"),
+            ("bachelor", "Bachelor"),
+            ("master", "Master"),
+            ("doctor", "Doctor"),
+            ("other", "Other"),
+        ],
+    )
+
+    def create_employee_from_applicant(self):
+
+        res = super(HrApplicant, self).create_employee_from_applicant()
+
+        for applicant in self:
+            vals = {
+                "default_gender": applicant.gender == "f" and "female" or "male",
+                "default_birthday": applicant.birth_date,
+                "default_education": applicant.education,
+            }
+            res["context"].update(vals)
+
+        return res
diff --git a/hr_employee_wizard/readme/CREDITS.rst b/hr_employee_wizard/readme/CREDITS.rst
new file mode 100644
index 00000000..d264bc7e
--- /dev/null
+++ b/hr_employee_wizard/readme/CREDITS.rst
@@ -0,0 +1 @@
+* Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/hr_employee_wizard/readme/DESCRIPTION.rst b/hr_employee_wizard/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..c50dc593
--- /dev/null
+++ b/hr_employee_wizard/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+This module implements a wizard that allows an HR Officer to create properly configured employee records.
diff --git a/hr_employee_wizard/security/ir.model.access.csv b/hr_employee_wizard/security/ir.model.access.csv
new file mode 100644
index 00000000..81dd0cec
--- /dev/null
+++ b/hr_employee_wizard/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_wizard_new_user,access_wizard_new,model_hr_employee_wizard_new,hr_recruitment.group_hr_recruitment_user,1,1,1,1
+access_wizard_benefit_user,access_wizard_benefit,model_hr_employee_wizard_benefit,hr_recruitment.group_hr_recruitment_user,1,1,1,1
diff --git a/hr_employee_wizard/static/description/icon.png b/hr_employee_wizard/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/hr_employee_wizard/static/description/icon.png differ
diff --git a/hr_employee_wizard/static/description/index.html b/hr_employee_wizard/static/description/index.html
new file mode 100644
index 00000000..2810c081
--- /dev/null
+++ b/hr_employee_wizard/static/description/index.html
@@ -0,0 +1,417 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>New Employee Wizard</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="new-employee-wizard">
+<h1 class="title">New Employee Wizard</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:708ccf415da0398953eb23a6882f01ef41bc1a5f46ed84067e1cc38db87463a0
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/hr_employee_wizard"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<p>This module implements a wizard that allows an HR Officer to create properly configured employee records.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-4">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20hr_employee_wizard%0Aversion:%2014.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="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>TREVI Software</li>
+<li>Michael Telahun Makonnen</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-4">Other credits</a></h2>
+<ul class="simple">
+<li>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/hr_employee_wizard">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/hr_employee_wizard/static/src/img/main_screenshot.png b/hr_employee_wizard/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/hr_employee_wizard/static/src/img/main_screenshot.png differ
diff --git a/hr_employee_wizard/tests/__init__.py b/hr_employee_wizard/tests/__init__.py
new file mode 100644
index 00000000..44f41370
--- /dev/null
+++ b/hr_employee_wizard/tests/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import test_wizard_new
diff --git a/hr_employee_wizard/tests/test_wizard_new.py b/hr_employee_wizard/tests/test_wizard_new.py
new file mode 100644
index 00000000..e6f0f9fc
--- /dev/null
+++ b/hr_employee_wizard/tests/test_wizard_new.py
@@ -0,0 +1,156 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import date
+
+from odoo.exceptions import ValidationError
+from odoo.tests.common import Form, TransactionCase
+
+
+class RecruitmentTestCase(TransactionCase):
+    def setUp(self):
+        super(RecruitmentTestCase, self).setUp()
+
+        self.Contract = self.env["hr.contract"]
+        self.Partner = self.env["res.partner"]
+        self.Period = self.env["hr.payroll.period"]
+        self.PPSchedule = self.env["hr.payroll.period.schedule"]
+        self.PolicyGroup = self.env["hr.policy.group"]
+        self.labour_model = self.env["hr.employee.wizard.new"]
+        benefits_model = self.env["hr.employee.wizard.benefit"]
+        self.company = self.env.user.company_id
+        self.state = self.env["res.country.state"].search([], limit=1)[0]
+        self.country = self.env["res.country"].search([], limit=1)[0]
+        self.job = self.env["hr.job"].search([], limit=1)[0]
+        self.department = self.env["hr.department"].search([], limit=1)[0]
+        self.structure = self.env["hr.payroll.structure"].search([], limit=1)[0]
+        self.pps = self.create_payroll_schedule("monthly", date.today())
+        self.pgroup = self.PolicyGroup.create({"name": "PGroup"})
+        self.calendar_id = self.env.ref("resource_schedule.resource_calendar_44h")
+        self.benefits = self.env["hr.benefit"].create({"name": "A", "code": "A"})
+
+        benefits_data = {
+            "benefit_id": self.benefits.id,
+            "effective_date": "2017-01-01",
+            "end_date": "2017-12-30",
+            "adv_override": True,
+            "prm_override": True,
+            "adv_amount": 50.0,
+            "prm_amount": 100.0,
+            "prm_total": 2000.0,
+        }
+        self.benefit = benefits_model.create(benefits_data)
+
+        self.labour_data = {
+            "name": "Jean-Luc Picard",
+            "new_benefit_ids": [(6, 0, [self.benefit.id])],
+            "state": "personal",
+            "company_id": self.company.id,
+            "birth_date": "1990-01-01",
+            "gender": "m",
+            "id_no": "123",
+            "city": "test_city",
+            "state_id": self.state.id,
+            "country_id": self.country.id,
+            "telephone": "123456789",
+            "mobile": "09124578",
+            "education": "graduate",
+            "job_id": self.job.id,
+            "department_id": self.department.id,
+            "struct_id": self.structure.id,
+            "pps_id": self.pps.id,
+            "policy_group_id": self.pgroup.id,
+            "wage": 2000,
+            "calendar_id": self.calendar_id.id,
+            "date_start": "2017-01-01",
+            "date_end": "2017-12-30",
+            "trial_date_end": "2017-03-30",
+        }
+
+    def create_wizard(self):
+        ctx = self.env.context.copy()
+        ctx["csdate"] = self.labour_data["date_start"]
+        return self.labour_model.with_context(ctx).create(self.labour_data)
+
+    def create_payroll_schedule(self, stype=False, initial_date=False):
+        return self.PPSchedule.create(
+            {
+                "name": "PPS",
+                "tz": "Africa/Addis_Ababa",
+                "type": stype,
+                "initial_period_date": initial_date,
+            }
+        )
+
+    def create_payroll_period(self, sched_id, start, end):
+        return self.Period.create(
+            {
+                "name": "Period 1",
+                "schedule_id": sched_id,
+                "date_start": start,
+                "date_end": end,
+            }
+        )
+
+    def test_create_partner(self):
+
+        wizard = self.create_wizard()
+        wizard.create_partner()
+
+        self.assertEqual(
+            self.Partner.search_count([("name", "=", "Jean-Luc Picard")]),
+            1,
+            "A partner record is created for the employee",
+        )
+
+    def test_create_employee(self):
+
+        wizard = self.create_wizard()
+        wizard.hire_applicant()
+
+        self.assertEqual(
+            self.env["hr.employee"].search_count([("name", "=", "Jean-Luc Picard")]),
+            1,
+            "One new employee was created",
+        )
+
+        ee = self.env["hr.employee"].search([("name", "=", "Jean-Luc Picard")])
+        self.assertEqual(
+            len(ee.contract_ids), 1, "The newly created employee has a contract"
+        )
+        self.assertTrue(
+            ee.applicant_id, "An applicant record is attached to the employee"
+        )
+        self.assertEqual(
+            ee.applicant_id.partner_id.address_get(["contact"])["contact"],
+            ee.address_home_id.id,
+            "The employee home address is correct",
+        )
+        self.assertEqual(ee.gender, "male", "Gender field set according to wizard")
+        self.assertEqual(
+            ee.birthday, date(1990, 1, 1), "Gender field set according to wizard"
+        )
+        self.assertEqual(ee.job_title, wizard.job_id.name, "The job title is correct")
+
+        c = self.Contract.search([("employee_id", "=", ee.id)])
+        self.assertEqual(c.job_id, wizard.job_id, "The job position is correct")
+        self.assertEqual(
+            ee.department_id, wizard.department_id, "The department is correct"
+        )
+
+    def test_required_fields(self):
+
+        f = Form(self.env["hr.employee.wizard.new"])
+        wiz = f.save()
+
+        # name, birth date, gender are required
+        with self.assertRaises(ValidationError):
+            wiz.create_applicant()
+
+        f.name = "Zaphod Beeblebrox"
+        f.gender = "m"
+        f.save()
+
+        with self.assertRaises(ValidationError):
+            wiz.hire_applicant()
diff --git a/hr_employee_wizard/views/hr_recruitment_view.xml b/hr_employee_wizard/views/hr_recruitment_view.xml
new file mode 100644
index 00000000..22589e29
--- /dev/null
+++ b/hr_employee_wizard/views/hr_recruitment_view.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+
+        <!-- Employee recruitment wizard -->
+        <menuitem
+            action="action_new_labour"
+            id="menu_new_labour"
+            parent="hr_recruitment.menu_hr_recruitment_root"
+            groups="hr_recruitment.group_hr_recruitment_user"
+            sequence="4"
+        />
+
+    </data>
+</odoo>
diff --git a/hr_employee_wizard/wizard/__init__.py b/hr_employee_wizard/wizard/__init__.py
new file mode 100644
index 00000000..72b1b43f
--- /dev/null
+++ b/hr_employee_wizard/wizard/__init__.py
@@ -0,0 +1,6 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import hr_employee_wizard_benefit
+from . import hr_employee_wizard_new
diff --git a/hr_employee_wizard/wizard/hr_employee_wizard_benefit.py b/hr_employee_wizard/wizard/hr_employee_wizard_benefit.py
new file mode 100644
index 00000000..bdf64144
--- /dev/null
+++ b/hr_employee_wizard/wizard/hr_employee_wizard_benefit.py
@@ -0,0 +1,29 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import datetime
+
+from odoo import api, fields, models
+
+
+class Benefits(models.TransientModel):
+
+    _name = "hr.employee.wizard.benefit"
+    _description = "New Hire Benefits"
+
+    @api.model
+    def _find_contract_start_date(self):
+        if not self.env.context.get("csdate"):
+            return datetime.now().date()
+        return fields.Date.from_string(self.env.context.get("csdate"))
+
+    wizard_id = fields.Many2one("hr.employee.wizard.new", "Wizard")
+    benefit_id = fields.Many2one("hr.benefit", "Benefit", required=True)
+    effective_date = fields.Date(required=True, default=_find_contract_start_date)
+    end_date = fields.Date()
+    adv_override = fields.Boolean("Override Advantage")
+    prm_override = fields.Boolean("Override Premium")
+    adv_amount = fields.Float("Advantage Amount", digits="Payroll Rate")
+    prm_amount = fields.Float("Premium Amount", digits="Payroll Rate")
+    prm_total = fields.Float("Premium Total", digits="Payroll Rate")
diff --git a/hr_employee_wizard/wizard/hr_employee_wizard_new.py b/hr_employee_wizard/wizard/hr_employee_wizard_new.py
new file mode 100644
index 00000000..15754875
--- /dev/null
+++ b/hr_employee_wizard/wizard/hr_employee_wizard_new.py
@@ -0,0 +1,413 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import date
+
+from odoo import _, api, exceptions, fields, models
+
+
+class NewLabour(models.TransientModel):
+
+    _name = "hr.employee.wizard.new"
+    _description = "New Employee Wizard"
+
+    @api.model
+    def _get_wage(self):
+
+        Contract = self.env["hr.contract"].with_company(self.env.company)
+        return Contract._get_wage()
+
+    @api.model
+    def _get_trial_start(self):
+
+        Contract = self.env["hr.contract"].with_company(self.env.company)
+        return Contract._get_trial_date_start()
+
+    @api.model
+    def _get_trial_end(self):
+
+        Contract = self.env["hr.contract"].with_company(self.env.company)
+        return Contract._get_trial_date_end()
+
+    @api.model
+    def _get_struct(self):
+
+        Contract = self.env["hr.contract"].with_company(self.env.company)
+        return Contract._get_struct()
+
+    @api.model
+    def _get_policy_group(self):
+
+        Contract = self.env["hr.contract"].with_company(self.env.company)
+        return Contract._get_policy_group()
+
+    @api.model
+    def _get_resource_calendar(self):
+
+        Contract = self.env["hr.contract"].with_company(self.env.company)
+        return Contract._get_resource_calendar()
+
+    @api.model
+    def _get_pps(self):
+
+        Contract = self.env["hr.contract"].with_company(self.env.company)
+        return Contract._get_pay_sched()
+
+    employee_ids = fields.Many2many(
+        string="Employees",
+        comodel_name="hr.employee",
+    )
+    new_benefit_ids = fields.One2many(
+        string="New Benefits",
+        comodel_name="hr.employee.wizard.benefit",
+        inverse_name="wizard_id",
+    )
+    state = fields.Selection(
+        selection=[
+            ("personal", "Personal"),
+            ("contract", "Contract"),
+            ("benefits", "Benefits"),
+            ("review", "Review"),
+        ],
+        default="personal",
+        readonly=True,
+        string="Status",
+    )
+    company_id = fields.Many2one(
+        string="Company",
+        comodel_name="res.company",
+        default=lambda s: s.env.company,
+        required=True,
+    )
+
+    # Personal Details
+    #
+    name = fields.Char()
+    birth_date = fields.Date()
+    gender = fields.Selection(selection=[("f", "Female"), ("m", "Male")])
+    id_no = fields.Char(string="Official ID")
+    street = fields.Char()
+    city = fields.Char()
+    state_id = fields.Many2one(comodel_name="res.country.state", string="State")
+    country_id = fields.Many2one(
+        comodel_name="res.country",
+        string="Country",
+        default=lambda s: s.env.company.country_id,
+    )
+    telephone = fields.Char()
+    mobile = fields.Char()
+    education = fields.Selection(
+        selection=[
+            ("graduate", "Graduate"),
+            ("bachelor", "Bachelor"),
+            ("master", "Master"),
+            ("doctor", "Doctor"),
+            ("other", "Other"),
+        ],
+        default="other",
+    )
+
+    # Contract Details
+    #
+    job_id = fields.Many2one(comodel_name="hr.job", string="Applied Job")
+    department_id = fields.Many2one(comodel_name="hr.department", string="Department")
+    struct_id = fields.Many2one(
+        string="Salary Structure",
+        comodel_name="hr.payroll.structure",
+        default=_get_struct,
+    )
+    pps_id = fields.Many2one(
+        string="Payroll Period Schedule",
+        comodel_name="hr.payroll.period.schedule",
+        default=_get_pps,
+    )
+    policy_group_id = fields.Many2one(
+        string="Policy Group", comodel_name="hr.policy.group", default=_get_policy_group
+    )
+    wage = fields.Float(
+        digits="Payroll", default=_get_wage, help="Basic Salary of the employee"
+    )
+    calendar_id = fields.Many2one(
+        string="Working Schedule Template",
+        comodel_name="resource.calendar",
+        default=_get_resource_calendar,
+    )
+    date_start = fields.Date(string="Start Date", default=fields.Date.today())
+    date_end = fields.Date(string="End Date")
+    trial_date_start = fields.Date(string="Trial Start Date", default=_get_trial_start)
+    trial_date_end = fields.Date(string="Trial End Date", default=_get_trial_end)
+
+    @api.onchange("company_id")
+    def onchange_company(self):
+
+        for rec in self:
+            if not self.company_id:
+                continue
+
+            Contract = self.env["hr.contract"].with_company(self.company_id)
+            rec.wage = Contract._get_wage()
+            rec.struct_id = Contract._get_struct()
+            rec.trial_date_start = Contract._get_trial_date_start()
+            rec.trial_date_end = Contract._get_trial_date_end()
+            rec.calendar_id = Contract._get_resource_calendar()
+            rec.pps_id = Contract._get_pay_sched()
+            rec.policy_group_id = Contract._get_policy_group()
+
+    @api.onchange("job_id")
+    def onchange_job(self):
+
+        for rec in self:
+
+            if not rec.job_id:
+                rec.department_id = False
+                rec.wage = False
+                continue
+            Contract = self.env["hr.contract"].with_company(rec.company_id)
+            rec.department_id = rec.job_id.department_id
+            rec.wage = Contract._get_wage(job_id=self.job_id.id)
+
+    @api.onchange("date_start")
+    def onchange_date(self):
+
+        for rec in self:
+            if rec.date_start:
+                rec.trial_date_start = rec.date_start
+            else:
+                rec.trial_date_start = date.today()
+            rec.onchange_trial()
+
+    @api.onchange("trial_date_start")
+    def onchange_trial(self):
+
+        for rec in self:
+            Contract = self.env["hr.contract"].with_company(rec.company_id)
+            if rec.trial_date_start:
+                dStart = self.trial_date_start
+                rec.trial_date_end = Contract._get_trial_date_end_from_start(dStart)
+
+    @api.onchange("country_id")
+    def onchange_country(self):
+
+        res = {"domain": {"state_id": False}}
+        if self.country_id:
+            res["domain"]["state_id"] = [("country_id", "=", self.country_id.id)]
+
+        return res
+
+    def create_partner(self):
+
+        self.ensure_one()
+        values = {
+            "type": "private",
+            "name": self.name,
+            "phone": self.telephone,
+            "mobile": self.mobile,
+            "street": self.street,
+            "city": self.city,
+            "country_id": self.country_id.id,
+            "state_id": self.state_id and self.state_id.id or False,
+            "employee": True,
+            "is_company": False,
+            "company_id": self.company_id.id,
+        }
+
+        return self.env["res.partner"].create(values)
+
+    def _create_hr_applicant(self, partner):
+
+        self.ensure_one()
+        applicant_vals = {
+            "name": f"{self.job_id.name} {self.name}",
+            "partner_name": self.name,
+            "partner_id": partner.id,
+            "partner_phone": self.telephone,
+            "partner_mobile": self.mobile,
+            "job_id": self.job_id.id,
+            "department_id": self.department_id.id,
+            "gender": self.gender,
+            "birth_date": self.birth_date,
+            "education": self.education,
+        }
+        return self.env["hr.applicant"].create(applicant_vals)
+
+    def create_applicant(self):
+
+        self.ensure_one()
+        if not self.name or not self.birth_date or not self.gender:
+            raise exceptions.ValidationError(
+                _(
+                    "Mandatory Fields Missing "
+                    "Make sure that at least the Name, Birth Date and Gender "
+                    "fields have been filled in."
+                )
+            )
+
+        # Create partner
+        partner = self.create_partner()
+
+        # Create applicant
+        applicant = self._create_hr_applicant(partner)
+
+        return {
+            "view_type": "form",
+            "view_mode": "form",
+            "res_model": "hr.employee.wizard.new",
+            "res_id": applicant.id,
+            "type": "ir.actions.act_window",
+            "target": "new",
+            "context": self.env.context,
+        }
+
+    def _get_employee_values(self, context):
+
+        return {
+            "name": context["default_name"],
+            "job_id": context["default_job_id"],
+            "job_title": context["default_job_title"],
+            "address_home_id": context["default_address_home_id"],
+            "department_id": context["default_department_id"],
+            "address_id": context["default_address_id"],
+            "work_email": context["default_work_email"],
+            "work_phone": context["default_work_phone"],
+            "applicant_id": context["default_applicant_id"],
+            "gender": context["default_gender"],
+            "birthday": context["default_birthday"],
+            "certificate": context["default_education"],
+        }
+
+    def hire_applicant(self):
+
+        if not self.name or not self.birth_date or not self.gender:
+            raise exceptions.ValidationError(
+                _(
+                    "Mandatory Fields Missing "
+                    "Make sure that at least the Name, Birth Date and Gender "
+                    "fields have been filled in."
+                )
+            )
+
+        # Create partner
+        partner_id = self.create_partner()
+
+        # Create applicant
+        applicant = self._create_hr_applicant(partner_id)
+
+        # Set the applicant's stage to 'Contract Signed'
+        stage = self.env.ref("hr_recruitment.stage_job5")
+        if stage:
+            applicant.stage_id = stage.id
+
+        # Create employee
+        dict_act_window = applicant.create_employee_from_applicant()
+        employee_values = self._get_employee_values(dict_act_window["context"])
+        ee = self.env["hr.employee"].create(employee_values)
+
+        # Create contract
+        #
+        c_vals = {
+            "employee_id": ee.id,
+            "job_id": self.job_id.id,
+            "department_id": self.department_id.id,
+            "wage": self.wage,
+            "struct_id": self.struct_id.id,
+            "policy_group_id": self.policy_group_id.id,
+            "date_start": self.date_start,
+            "date_end": self.date_end,
+            "trial_date_start": self.trial_date_start,
+            "trial_date_end": self.trial_date_end,
+            "resource_calendar_id": self.calendar_id.id,
+            "pps_id": self.pps_id.id,
+        }
+        self.env["hr.contract"].create(c_vals)
+
+        # Enroll in benefits
+        #
+        BenefitPolicy = self.env["hr.benefit.policy"]
+        for newb in self.new_benefit_ids:
+            newb_vals = {
+                "employee_id": ee.id,
+                "benefit_id": newb.benefit_id.id,
+                "benefit_code": newb.benefit_id.code,
+                "start_date": newb.effective_date,
+                "end_date": newb.end_date,
+                "advantage_override": newb.adv_override,
+                "premium_override": newb.prm_override,
+                "advantage_amount": newb.adv_amount,
+                "premium_amount": newb.prm_amount,
+                "premium_total": newb.prm_total,
+            }
+            BenefitPolicy.create(newb_vals)
+
+        # Add employee ID to list of hired employees
+        if self.env.context.get("new_employee_ids", False):
+            ctx = dict(self.env.context)
+            ctx["new_employee_ids"].append(ee.id)
+        else:
+            ctx = dict(self.env.context)
+            ctx.update({"new_employee_ids": [ee.id]})
+
+        return {
+            "view_type": "form",
+            "view_mode": "form",
+            "res_model": "hr.employee.wizard.new",
+            "type": "ir.actions.act_window",
+            "target": "new",
+            "context": ctx,
+        }
+
+    def cancel_wizard(self):
+
+        action = self.env.ref("hr.open_view_employee_list_my")
+        dict_act_window = action.read([])[0]
+        dict_act_window["view_mode"] = "kanban,tree,form"
+        dict_act_window["domain"] = [
+            ("id", "in", self.env.context.get("new_employee_ids", False))
+        ]
+        self.env.context.get("new_employee_ids", False)
+        return dict_act_window
+
+    def state_contract(self):
+
+        self.ensure_one()
+        self.state = "contract"
+        return {
+            "view_type": "form",
+            "view_mode": "form",
+            "res_model": "hr.employee.wizard.new",
+            "res_id": self.ids[0],
+            "type": "ir.actions.act_window",
+            "target": "new",
+            "nodestroy": True,
+            "context": self.env.context,
+        }
+
+    def state_benefits(self):
+
+        self.ensure_one()
+        self.state = "benefits"
+        return {
+            "view_type": "form",
+            "view_mode": "form",
+            "res_model": "hr.employee.wizard.new",
+            "res_id": self.ids[0],
+            "type": "ir.actions.act_window",
+            "target": "new",
+            "nodestroy": True,
+            "context": self.env.context,
+        }
+
+    def state_review(self):
+
+        self.ensure_one()
+        self.state = "review"
+        return {
+            "view_type": "form",
+            "view_mode": "form",
+            "res_model": "hr.employee.wizard.new",
+            "res_id": self.ids[0],
+            "type": "ir.actions.act_window",
+            "target": "new",
+            "nodestroy": True,
+            "context": self.env.context,
+        }
diff --git a/hr_employee_wizard/wizard/hr_employee_wizard_views.xml b/hr_employee_wizard/wizard/hr_employee_wizard_views.xml
new file mode 100644
index 00000000..5a1ea882
--- /dev/null
+++ b/hr_employee_wizard/wizard/hr_employee_wizard_views.xml
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+
+        <record id="new_labour_form" model="ir.ui.view">
+            <field name="name">hr.employee.wizard.new.form</field>
+            <field name="model">hr.employee.wizard.new</field>
+            <field name="arch" type="xml">
+                <form string="New Employee Recruitment">
+                    <header>
+                        <field name="state" widget="statusbar" />
+                    </header>
+                    <div class="oe_title">
+                        <label for="name" class="oe_edit_only" />
+                        <h1>
+                            <field name="name" />
+                        </h1>
+                    </div>
+                    <newline />
+                    <group>
+                        <group>
+                            <h2>
+                                <field name="company_id" nolabel="1" />
+                            </h2>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="Personal Info" states="personal,review">
+                            <group>
+                                <group name="personal_1">
+                                    <field name="gender" />
+                                    <field name="birth_date" />
+                                    <field name="education" />
+                                    <field name="id_no" />
+                                    <field name="mobile" />
+                                    <field name="telephone" />
+                                </group>
+                                <group name="personal_2">
+                                    <field name="street" />
+                                    <field name="city" />
+                                    <field name="state_id" />
+                                    <field name="country_id" />
+                                </group>
+                            </group>
+                        </page>
+                        <page string="Contract" states="contract,review">
+                            <group>
+                                <group string="Job">
+                                    <field
+                                        name="job_id"
+                                        domain="[('company_id','=',company_id)]"
+                                        attrs="{'required': [('state', '!=', 'personal')]}"
+                                    />
+                                    <field
+                                        name="wage"
+                                        attrs="{'required': [('state', '!=', 'personal')]}"
+                                    />
+                                    <field
+                                        name="struct_id"
+                                        attrs="{'required': [('state', '!=', 'personal')]}"
+                                    />
+                                </group>
+                                <group string="Extra">
+                                    <field
+                                        name="department_id"
+                                        domain="[('company_id','=',company_id)]"
+                                    />
+                                    <field
+                                        name="pps_id"
+                                        attrs="{'required': [('state', '!=', 'personal')]}"
+                                    />
+                                    <field
+                                        name="policy_group_id"
+                                        attrs="{'required': [('state', '!=', 'personal')]}"
+                                    />
+                                    <field
+                                        name="calendar_id"
+                                        attrs="{'required': [('state', '!=', 'personal')]}"
+                                    />
+                                </group>
+                            </group>
+                            <group>
+                                <group>
+                                    <label
+                                        for="date_start"
+                                        string="Contract Duration"
+                                    />
+                                    <div>
+                                        <field
+                                            name="date_start"
+                                            class="oe_inline"
+                                            attrs="{'required': [('state', '!=', 'personal')]}"
+                                        /> - <field name="date_end" class="oe_inline" />
+                                    </div>
+                                    <label
+                                        for="trial_date_start"
+                                        string="Trial Period"
+                                    />
+                                    <div>
+                                        <field
+                                            name="trial_date_start"
+                                            class="oe_inline"
+                                        /> - <field
+                                            name="trial_date_end"
+                                            class="oe_inline"
+                                        />
+                                    </div>
+                                </group>
+                            </group>
+                        </page>
+                        <page string="Benefits" states="benefits,review">
+                            <group string="Additional Benefits">
+                                <field
+                                    name="new_benefit_ids"
+                                    nolabel="1"
+                                    context="{'csdate': date_start}"
+                                >
+                                    <tree string="Additional Benefits">
+                                        <field name="benefit_id" />
+                                        <field name="effective_date" />
+                                        <field name="adv_override" />
+                                        <field name="adv_amount" />
+                                        <field name="prm_override" />
+                                        <field name="prm_amount" />
+                                    </tree>
+                                </field>
+                            </group>
+                        </page>
+                    </notebook>
+                    <footer>
+                        <button
+                            name="state_contract"
+                            type="object"
+                            states="personal"
+                            class="oe_highlight"
+                            string="Next"
+                        />
+                        <button
+                            name="state_benefits"
+                            type="object"
+                            states="contract"
+                            class="oe_highlight"
+                            string="Next"
+                        />
+                        <button
+                            name="state_review"
+                            type="object"
+                            states="benefits"
+                            class="oe_highlight"
+                            string="Review"
+                        />
+                        <button
+                            name="create_applicant"
+                            type="object"
+                            states="review"
+                            class="oe_highlight"
+                            string="Start Recruitment"
+                        />
+                        <button
+                            name="hire_applicant"
+                            type="object"
+                            states="review"
+                            class="oe_highlight"
+                            string="Hire"
+                        />
+                        <button
+                            name="cancel_wizard"
+                            type="object"
+                            states="personal,contract,benefits,review"
+                            string="View New Hires"
+                        />
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_new_labour" model="ir.actions.act_window">
+            <field name="name">New Recruitment</field>
+            <field name="res_model">hr.employee.wizard.new</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="new_labour_form" />
+            <field name="target">new</field>
+        </record>
+
+        <record id="view_benefit" model="ir.ui.view">
+            <field name="name">hr.employee.wizard.benefit.form</field>
+            <field name="model">hr.employee.wizard.benefit</field>
+            <field name="arch" type="xml">
+                <form string="New Hire Benefit">
+                    <group>
+                        <group>
+                            <field name="benefit_id" />
+                            <field name="adv_override" />
+                            <field name="prm_override" />
+                        </group>
+                        <group>
+                            <label for="effective_date" string="Duration" />
+                            <div>
+                                <field
+                                    name="effective_date"
+                                    class="oe_inline"
+                                /> - <field name="end_date" class="oe_inline" />
+                            </div>
+                            <field
+                                name="adv_amount"
+                                attrs="{'readonly': [('adv_override', '=', False)]}"
+                            />
+                            <field
+                                name="prm_amount"
+                                attrs="{'readonly': [('prm_override', '=', False)]}"
+                            />
+                            <field
+                                name="prm_total"
+                                attrs="{'readonly': [('prm_override', '=', False)]}"
+                            />
+                        </group>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/hr_job_change_state/README.rst b/hr_job_change_state/README.rst
new file mode 100644
index 00000000..872859e4
--- /dev/null
+++ b/hr_job_change_state/README.rst
@@ -0,0 +1,2 @@
+Change the Recruitment State of Jobs in Batches
+===============================================
diff --git a/hr_job_change_state/__init__.py b/hr_job_change_state/__init__.py
new file mode 100644
index 00000000..70d3db9b
--- /dev/null
+++ b/hr_job_change_state/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import wizard
diff --git a/hr_job_change_state/__manifest__.py b/hr_job_change_state/__manifest__.py
new file mode 100644
index 00000000..4432048b
--- /dev/null
+++ b/hr_job_change_state/__manifest__.py
@@ -0,0 +1,18 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Change State of Jobs",
+    "version": "15.0.1.0.0",
+    "license": "AGPL-3",
+    "category": "Human Resources",
+    "author": "TREVI Software",
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": ["hr"],
+    "data": [
+        "security/ir.model.access.csv",
+        "wizard/change_state.xml",
+    ],
+    "installable": True,
+}
diff --git a/hr_job_change_state/i18n/hr_job_change_state.pot b/hr_job_change_state/i18n/hr_job_change_state.pot
new file mode 100644
index 00000000..b7cae24f
--- /dev/null
+++ b/hr_job_change_state/i18n/hr_job_change_state.pot
@@ -0,0 +1,86 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* hr_job_change_state
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: hr_job_change_state
+#: model_terms:ir.ui.view,arch_db:hr_job_change_state.view_change_job_state_wizard
+msgid "Change"
+msgstr ""
+
+#. module: hr_job_change_state
+#: model_terms:ir.ui.view,arch_db:hr_job_change_state.view_change_job_state_wizard
+msgid "Change Job State"
+msgstr ""
+
+#. module: hr_job_change_state
+#: model:ir.actions.act_window,name:hr_job_change_state.action_change_job_state_wizard
+#: model_terms:ir.ui.view,arch_db:hr_job_change_state.view_hr_job_tree
+msgid "Change Recruitment State"
+msgstr ""
+
+#. module: hr_job_change_state
+#: model:ir.model,name:hr_job_change_state.model_hr_job_wizard_state_change
+msgid "Change recruitment state of jobs in batches"
+msgstr ""
+
+#. module: hr_job_change_state
+#: model:ir.model.fields,field_description:hr_job_change_state.field_hr_job_wizard_state_change__do_open
+msgid "Close Recruitment"
+msgstr ""
+
+#. module: hr_job_change_state
+#: model:ir.model.fields,field_description:hr_job_change_state.field_hr_job_wizard_state_change__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: hr_job_change_state
+#: model:ir.model.fields,field_description:hr_job_change_state.field_hr_job_wizard_state_change__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: hr_job_change_state
+#: model:ir.model.fields,field_description:hr_job_change_state.field_hr_job_wizard_state_change__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: hr_job_change_state
+#: model:ir.model.fields,field_description:hr_job_change_state.field_hr_job_wizard_state_change__id
+msgid "ID"
+msgstr ""
+
+#. module: hr_job_change_state
+#: model:ir.model.fields,field_description:hr_job_change_state.field_hr_job_wizard_state_change__job_ids
+#: model_terms:ir.ui.view,arch_db:hr_job_change_state.view_change_job_state_wizard
+msgid "Jobs"
+msgstr ""
+
+#. module: hr_job_change_state
+#: model:ir.model.fields,field_description:hr_job_change_state.field_hr_job_wizard_state_change____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: hr_job_change_state
+#: model:ir.model.fields,field_description:hr_job_change_state.field_hr_job_wizard_state_change__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: hr_job_change_state
+#: model:ir.model.fields,field_description:hr_job_change_state.field_hr_job_wizard_state_change__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: hr_job_change_state
+#: model:ir.model.fields,field_description:hr_job_change_state.field_hr_job_wizard_state_change__do_recruit
+msgid "Open for Recruitment"
+msgstr ""
diff --git a/hr_job_change_state/security/ir.model.access.csv b/hr_job_change_state/security/ir.model.access.csv
new file mode 100644
index 00000000..86860de1
--- /dev/null
+++ b/hr_job_change_state/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_job_wizard_state_change_hr_manager,hr.job.wizard.state.change,model_hr_job_wizard_state_change,hr.group_hr_manager,1,1,1,0
diff --git a/hr_job_change_state/static/description/icon.png b/hr_job_change_state/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/hr_job_change_state/static/description/icon.png differ
diff --git a/hr_job_change_state/tests/__init__.py b/hr_job_change_state/tests/__init__.py
new file mode 100644
index 00000000..4cd47c03
--- /dev/null
+++ b/hr_job_change_state/tests/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import test_hr_job_wizard
diff --git a/hr_job_change_state/tests/test_hr_job_wizard.py b/hr_job_change_state/tests/test_hr_job_wizard.py
new file mode 100644
index 00000000..a821d72c
--- /dev/null
+++ b/hr_job_change_state/tests/test_hr_job_wizard.py
@@ -0,0 +1,98 @@
+from odoo.exceptions import AccessError
+from odoo.tests.common import Form, SavepointCase
+
+
+class TestHrJobWizard(SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super(TestHrJobWizard, cls).setUpClass()
+        cls.Job = cls.env["hr.job"]
+        cls.Wizard = cls.env["hr.job.wizard.state.change"]
+        cls.User = cls.env["res.users"]
+
+        cls.group_hr_manager = cls.env.ref("hr.group_hr_manager")
+        cls.group_hr_user = cls.env.ref("hr.group_hr_user")
+
+        # -- Users
+        cls.hr_user = cls.User.create(
+            {
+                "name": "Hr User",
+                "login": "hruser",
+                "groups_id": [(4, cls.group_hr_user.id)],
+            }
+        )
+        cls.hr_officer = cls.User.create(
+            {
+                "name": "Hr Officer",
+                "login": "hrofficer",
+                "groups_id": [(4, cls.group_hr_manager.id)],
+            }
+        )
+
+    def create_job_position(self):
+
+        return self.Job.create(
+            [
+                {
+                    "name": "#Sales Associate",
+                    "no_of_recruitment": 4,
+                    "no_of_hired_employee": 2,
+                    "state": "recruit",
+                },
+                {
+                    "name": "#Store Manager",
+                    "no_of_recruitment": 2,
+                    "no_of_hired_employee": 1,
+                    "state": "recruit",
+                },
+                {
+                    "name": "#Product Manager",
+                    "no_of_recruitment": 2,
+                    "no_of_hired_employee": 0,
+                    "state": "recruit",
+                },
+            ]
+        )
+
+    def test_only_manager_can_change_recruitment_state(self):
+        jobs = self.create_job_position()
+
+        with self.assertRaises(AccessError):
+            with Form(
+                self.Wizard.with_user(self.hr_user).with_context(
+                    {"active_ids": jobs.ids}
+                )
+            ) as wizard1:
+                for job in wizard1.job_ids:
+                    self.assertIn(job, jobs)
+
+        with Form(
+            self.Wizard.with_user(self.hr_officer).with_context(
+                {"active_ids": jobs.ids}
+            )
+        ) as wizard2:
+            for job in wizard2.job_ids:
+                self.assertIn(job, jobs)
+
+    def test_can_change_multiple_job_position_state(self):
+
+        jobs = self.create_job_position()
+        for job in jobs:
+            self.assertEqual(job.state, "recruit")
+
+        ManWiz = (
+            self.Wizard.with_user(self.hr_officer)
+            .with_context({"active_ids": jobs.ids})
+            .create({})
+        )
+        for job in ManWiz.job_ids:
+            self.assertIn(job, jobs)
+
+        with Form(ManWiz) as wizard:
+            wizard.do_open = True
+
+        ManWiz.change_state()
+
+        for job in jobs:
+            self.assertEqual(job.state, "open")
+            self.assertIn(job, ManWiz.job_ids)
diff --git a/hr_job_change_state/wizard/__init__.py b/hr_job_change_state/wizard/__init__.py
new file mode 100644
index 00000000..1e139de6
--- /dev/null
+++ b/hr_job_change_state/wizard/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import change_state
diff --git a/hr_job_change_state/wizard/change_state.py b/hr_job_change_state/wizard/change_state.py
new file mode 100644
index 00000000..40c63fcd
--- /dev/null
+++ b/hr_job_change_state/wizard/change_state.py
@@ -0,0 +1,50 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import api, fields, models
+
+
+class HrJobStateWizard(models.TransientModel):
+
+    _name = "hr.job.wizard.state.change"
+    _description = "Change recruitment state of jobs in batches"
+
+    @api.model
+    def _get_jobs(self):
+
+        res = []
+        if self.env.context.get("active_ids", False):
+            res = self.env.context["active_ids"]
+
+        return res
+
+    job_ids = fields.Many2many(
+        comodel_name="hr.job",
+        relation="hr_job_state_change_wizard_rel",
+        column1="wizard_id",
+        column2="job_id",
+        default=_get_jobs,
+        string="Jobs",
+    )
+    do_open = fields.Boolean(string="Close Recruitment")
+    do_recruit = fields.Boolean(string="Open for Recruitment")
+
+    @api.onchange("do_open")
+    def _onchange_open(self):
+        if self.do_open:
+            self.do_recruit = False
+
+    @api.onchange("do_recruit")
+    def _onchange_recruit(self):
+        if self.do_recruit:
+            self.do_open = False
+
+    def change_state(self):
+
+        if self.do_open:
+            self.job_ids.set_open()
+        elif self.do_recruit:
+            self.job_ids.set_recruit()
+
+        return {"type": "ir.actions.act_window_close"}
diff --git a/hr_job_change_state/wizard/change_state.xml b/hr_job_change_state/wizard/change_state.xml
new file mode 100644
index 00000000..1d35b503
--- /dev/null
+++ b/hr_job_change_state/wizard/change_state.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+
+    <record id="view_change_job_state_wizard" model="ir.ui.view">
+        <field name="name">Change Job State Wizard</field>
+        <field name="model">hr.job.wizard.state.change</field>
+        <field name="arch" type="xml">
+            <form string="Change Job State">
+                <header>
+                    <button
+                        icon="fa-cogs"
+                        string="Change"
+                        name="change_state"
+                        type="object"
+                        class="oe_highlight"
+                    />
+                </header>
+                <group>
+                    <group>
+                        <field name="do_recruit" />
+                        <field name="do_open" />
+                    </group>
+                </group>
+                <group string="Jobs">
+                    <field name="job_ids" nolabel="1" />
+                </group>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_change_job_state_wizard" model="ir.actions.act_window">
+        <field name="name">Change Recruitment State</field>
+        <field name="res_model">hr.job.wizard.state.change</field>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="view_change_job_state_wizard" />
+        <field name="target">new</field>
+    </record>
+
+    <record id="view_hr_job_tree" model="ir.ui.view">
+        <field name="name">hr.job.tree.inherited</field>
+        <field name="model">hr.job</field>
+        <field name="inherit_id" ref="hr.view_hr_job_tree" />
+        <field name="arch" type="xml">
+
+            <field name="name" position="before">
+                <header>
+                    <button
+                        name="%(action_change_job_state_wizard)d"
+                        string="Change Recruitment State"
+                        type="action"
+                    />
+                </header>
+            </field>
+
+        </field>
+    </record>
+
+</odoo>
diff --git a/hr_job_transfer/README.rst b/hr_job_transfer/README.rst
new file mode 100644
index 00000000..dbca8801
--- /dev/null
+++ b/hr_job_transfer/README.rst
@@ -0,0 +1,2 @@
+Transfer Employees between Departments
+======================================
diff --git a/hr_job_transfer/__init__.py b/hr_job_transfer/__init__.py
new file mode 100644
index 00000000..2b0f2dca
--- /dev/null
+++ b/hr_job_transfer/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
diff --git a/hr_job_transfer/__manifest__.py b/hr_job_transfer/__manifest__.py
new file mode 100644
index 00000000..489665ec
--- /dev/null
+++ b/hr_job_transfer/__manifest__.py
@@ -0,0 +1,26 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Departmental Transfer",
+    "category": "HR",
+    "version": "15.0.1.0.0",
+    "images": ["static/src/img/main_screenshot.png"],
+    "author": "TREVI Software, Michael Telahun Makonnen",
+    "license": "AGPL-3",
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "base_setup",
+        "hr",
+        "hr_contract_status",
+    ],
+    "data": [
+        "security/groups.xml",
+        "security/ir.model.access.csv",
+        "data/hr_transfer_cron.xml",
+        "data/hr_transfer_data.xml",
+        "views/hr_transfer_view.xml",
+    ],
+    "installable": True,
+}
diff --git a/hr_job_transfer/data/hr_transfer_cron.xml b/hr_job_transfer/data/hr_transfer_cron.xml
new file mode 100644
index 00000000..3a96800a
--- /dev/null
+++ b/hr_job_transfer/data/hr_transfer_cron.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+
+    <data noupdate="1">
+
+        <record id="hr_department_transfer_cron" model="ir.cron" forcecreate="True">
+            <field name="name">Departmental Transfers</field>
+            <field name="interval_number">1</field>
+            <field name="interval_type">days</field>
+            <field name="numbercall">-1</field>
+            <field
+                name="nextcall"
+                eval="(DateTime.now() + timedelta(hours= +(24-DateTime.now().hour))).strftime('%Y-%m-%d %H:%M:%S')"
+            />
+            <field name="doall" eval="True" />
+            <field name="model_id" ref="model_hr_department_transfer" />
+            <field name="code">model.try_pending_department_transfers()</field>
+        </record>
+
+    </data>
+
+</odoo>
diff --git a/hr_job_transfer/data/hr_transfer_data.xml b/hr_job_transfer/data/hr_transfer_data.xml
new file mode 100644
index 00000000..23b00c07
--- /dev/null
+++ b/hr_job_transfer/data/hr_transfer_data.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+
+    <!-- Alert-related subtypes for messaging / Chatter -->
+    <record id="mt_alert_xfer_confirmed" model="mail.message.subtype">
+        <field name="name">Department Transfer - Confirmed</field>
+        <field name="res_model">hr.department.transfer</field>
+        <field name="description">Transfer submitted</field>
+    </record>
+
+    <record id="mt_alert_xfer_pending" model="mail.message.subtype">
+        <field name="name">Department Transfer - Pending</field>
+        <field name="res_model">hr.department.transfer</field>
+        <field name="description">Transfer pending effective date</field>
+    </record>
+
+    <record id="mt_alert_xfer_done" model="mail.message.subtype">
+        <field name="name">Department Transfer - Completed</field>
+        <field name="res_model">hr.department.transfer</field>
+        <field name="description">Transfer complete</field>
+    </record>
+
+</odoo>
diff --git a/hr_job_transfer/i18n/hr_job_transfer.pot b/hr_job_transfer/i18n/hr_job_transfer.pot
new file mode 100644
index 00000000..48799bb4
--- /dev/null
+++ b/hr_job_transfer/i18n/hr_job_transfer.pot
@@ -0,0 +1,342 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* hr_job_transfer
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: hr_job_transfer
+#: model:res.groups,comment:hr_job_transfer.group_hr_transfer
+msgid ""
+"\n"
+"            the user will be able to approve employee transfers\n"
+"        "
+msgstr ""
+
+#. module: hr_job_transfer
+#: code:addons/hr_job_transfer/models/hr_transfer.py:0
+#, python-format
+msgid "%s's Contract [%d]"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields,field_description:hr_job_transfer.field_hr_department_transfer__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:res.groups,name:hr_job_transfer.group_hr_transfer
+msgid "Approve Employee Transfers"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields,field_description:hr_job_transfer.field_hr_department_transfer__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model_terms:ir.ui.view,arch_db:hr_job_transfer.department_transfer_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields.selection,name:hr_job_transfer.selection__hr_department_transfer__state__cancel
+msgid "Cancelled"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields,field_description:hr_job_transfer.field_hr_department_transfer__company_id
+msgid "Company"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model_terms:ir.ui.view,arch_db:hr_job_transfer.department_transfer_form_view
+msgid "Confirm"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields.selection,name:hr_job_transfer.selection__hr_department_transfer__state__confirm
+msgid "Confirmed"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields,field_description:hr_job_transfer.field_hr_department_transfer__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields,field_description:hr_job_transfer.field_hr_department_transfer__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:mail.message.subtype,name:hr_job_transfer.mt_alert_xfer_done
+msgid "Department Transfer - Completed"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:mail.message.subtype,name:hr_job_transfer.mt_alert_xfer_confirmed
+msgid "Department Transfer - Confirmed"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:mail.message.subtype,name:hr_job_transfer.mt_alert_xfer_pending
+msgid "Department Transfer - Pending"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model,name:hr_job_transfer.model_hr_department_transfer
+#: model_terms:ir.ui.view,arch_db:hr_job_transfer.department_transfer_form_view
+msgid "Departmental Transfer"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.actions.act_window,name:hr_job_transfer.open_hr_department_transfer
+#: model:ir.actions.server,name:hr_job_transfer.hr_department_transfer_cron_ir_actions_server
+#: model:ir.cron,cron_name:hr_job_transfer.hr_department_transfer_cron
+#: model:ir.cron,name:hr_job_transfer.hr_department_transfer_cron
+#: model:ir.ui.menu,name:hr_job_transfer.menu_hr_department_transfer
+#: model_terms:ir.ui.view,arch_db:hr_job_transfer.department_transfer_tree_view
+msgid "Departmental Transfers"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields,field_description:hr_job_transfer.field_hr_department_transfer__dst_id
+msgid "Destination"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields,field_description:hr_job_transfer.field_hr_department_transfer__dst_contract_id
+msgid "Destination Contract"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields,field_description:hr_job_transfer.field_hr_department_transfer__dst_department_id
+msgid "Destination Department"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields,field_description:hr_job_transfer.field_hr_department_transfer__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields.selection,name:hr_job_transfer.selection__hr_department_transfer__state__done
+msgid "Done"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields.selection,name:hr_job_transfer.selection__hr_department_transfer__state__draft
+msgid "Draft"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields,field_description:hr_job_transfer.field_hr_department_transfer__date
+msgid "Effective Date"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields,field_description:hr_job_transfer.field_hr_department_transfer__employee_id
+msgid "Employee"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields,field_description:hr_job_transfer.field_hr_department_transfer__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields,field_description:hr_job_transfer.field_hr_department_transfer__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields,field_description:hr_job_transfer.field_hr_department_transfer__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields,field_description:hr_job_transfer.field_hr_department_transfer__src_id
+msgid "From"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields,field_description:hr_job_transfer.field_hr_department_transfer__src_contract_id
+msgid "From Contract"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields,field_description:hr_job_transfer.field_hr_department_transfer__src_department_id
+msgid "From Department"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields,field_description:hr_job_transfer.field_hr_department_transfer__id
+msgid "ID"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields,help:hr_job_transfer.field_hr_department_transfer__message_needaction
+#: model:ir.model.fields,help:hr_job_transfer.field_hr_department_transfer__message_unread
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields,help:hr_job_transfer.field_hr_department_transfer__message_has_error
+#: model:ir.model.fields,help:hr_job_transfer.field_hr_department_transfer__message_has_sms_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields,field_description:hr_job_transfer.field_hr_department_transfer__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields,field_description:hr_job_transfer.field_hr_department_transfer____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields,field_description:hr_job_transfer.field_hr_department_transfer__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields,field_description:hr_job_transfer.field_hr_department_transfer__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields,field_description:hr_job_transfer.field_hr_department_transfer__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields,field_description:hr_job_transfer.field_hr_department_transfer__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields,field_description:hr_job_transfer.field_hr_department_transfer__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields,field_description:hr_job_transfer.field_hr_department_transfer__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields,field_description:hr_job_transfer.field_hr_department_transfer__message_has_error_counter
+msgid "Number of errors"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields,help:hr_job_transfer.field_hr_department_transfer__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields,help:hr_job_transfer.field_hr_department_transfer__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields,help:hr_job_transfer.field_hr_department_transfer__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields.selection,name:hr_job_transfer.selection__hr_department_transfer__state__pending
+msgid "Pending"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields,field_description:hr_job_transfer.field_hr_department_transfer__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields,field_description:hr_job_transfer.field_hr_department_transfer__state
+msgid "State"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model_terms:ir.ui.view,arch_db:hr_job_transfer.department_transfer_form_view
+msgid "Transfer"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:mail.message.subtype,description:hr_job_transfer.mt_alert_xfer_done
+msgid "Transfer complete"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:mail.message.subtype,description:hr_job_transfer.mt_alert_xfer_pending
+msgid "Transfer pending effective date"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:mail.message.subtype,description:hr_job_transfer.mt_alert_xfer_confirmed
+msgid "Transfer submitted"
+msgstr ""
+
+#. module: hr_job_transfer
+#: code:addons/hr_job_transfer/models/hr_transfer.py:0
+#, python-format
+msgid ""
+"Unable to Delete Transfer!\n"
+"Transfer has been initiated. Either cancel the transfer or\n"
+"create another transfer to undo it."
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields,field_description:hr_job_transfer.field_hr_department_transfer__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields,field_description:hr_job_transfer.field_hr_department_transfer__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: hr_job_transfer
+#: code:addons/hr_job_transfer/models/hr_transfer.py:0
+#, python-format
+msgid ""
+"Warning!\n"
+"The contract end date is on or before the effective date of the transfer."
+msgstr ""
+
+#. module: hr_job_transfer
+#: code:addons/hr_job_transfer/models/hr_transfer.py:0
+#, python-format
+msgid ""
+"Warning!\n"
+"The current state of the contract does not permit changes."
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields,field_description:hr_job_transfer.field_hr_department_transfer__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: hr_job_transfer
+#: model:ir.model.fields,help:hr_job_transfer.field_hr_department_transfer__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: hr_job_transfer
+#: code:addons/hr_job_transfer/models/hr_transfer.py:0
+#, python-format
+msgid "You don't have the access rights to take this action."
+msgstr ""
diff --git a/hr_job_transfer/models/__init__.py b/hr_job_transfer/models/__init__.py
new file mode 100644
index 00000000..07111d77
--- /dev/null
+++ b/hr_job_transfer/models/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import hr_transfer
diff --git a/hr_job_transfer/models/hr_transfer.py b/hr_job_transfer/models/hr_transfer.py
new file mode 100644
index 00000000..89f5665c
--- /dev/null
+++ b/hr_job_transfer/models/hr_transfer.py
@@ -0,0 +1,318 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from dateutil.relativedelta import relativedelta
+
+from odoo import _, api, fields, models
+from odoo.exceptions import AccessError, UserError
+
+
+class HrTransfer(models.Model):
+    _name = "hr.department.transfer"
+    _inherit = ["mail.thread"]
+    _description = "Departmental Transfer"
+    _rec_name = "date"
+    _check_company_auto = True
+
+    employee_id = fields.Many2one(
+        string="Employee",
+        comodel_name="hr.employee",
+        required=True,
+        readonly=True,
+        states={"draft": [("readonly", False)]},
+        check_company=True,
+    )
+    src_id = fields.Many2one(
+        string="From",
+        comodel_name="hr.job",
+        compute="_compute_onchange_employee",
+        store=True,
+        readonly=True,
+        states={"draft": [("readonly", False)]},
+        check_company=True,
+    )
+    dst_id = fields.Many2one(
+        string="Destination",
+        comodel_name="hr.job",
+        required=True,
+        readonly=True,
+        states={"draft": [("readonly", False)]},
+        check_company=True,
+    )
+    src_department_id = fields.Many2one(
+        string="From Department",
+        related="src_id.department_id",
+        comodel_name="hr.department",
+        store=True,
+        readonly=True,
+    )
+    dst_department_id = fields.Many2one(
+        string="Destination Department",
+        related="dst_id.department_id",
+        comodel_name="hr.department",
+        store=True,
+        readonly=True,
+        check_company=True,
+    )
+    src_contract_id = fields.Many2one(
+        string="From Contract",
+        comodel_name="hr.contract",
+        compute="_compute_onchange_employee",
+        store=True,
+        readonly=True,
+        states={"draft": [("readonly", False)]},
+        check_company=True,
+    )
+    dst_contract_id = fields.Many2one(
+        string="Destination Contract",
+        comodel_name="hr.contract",
+        readonly=True,
+        check_company=True,
+    )
+    date = fields.Date(
+        string="Effective Date",
+        required=True,
+        readonly=True,
+        states={"draft": [("readonly", False)]},
+    )
+    state = fields.Selection(
+        selection=[
+            ("draft", "Draft"),
+            ("confirm", "Confirmed"),
+            ("pending", "Pending"),
+            ("done", "Done"),
+            ("cancel", "Cancelled"),
+        ],
+        default="draft",
+        readonly=True,
+    )
+    company_id = fields.Many2one(
+        string="Company",
+        comodel_name="res.company",
+        default=lambda self: self.env.company,
+        store=True,
+        readonly=True,
+    )
+
+    @api.depends("employee_id")
+    def _compute_onchange_employee(self):
+
+        for transfer in self:
+            if transfer.employee_id:
+                transfer.src_id = transfer.employee_id.job_id
+                transfer.src_contract_id = transfer.employee_id.contract_id
+            else:
+                transfer.src_id = False
+                transfer.src_contract_id = False
+
+    def _track_subtype(self, init_values):
+
+        self.ensure_one()
+
+        if "state" in init_values:
+            if self.state == "confirm":
+                return self.env.ref("hr_job_transfer.mt_alert_xfer_confirmed")
+            elif self.state == "pending":
+                return self.env.ref("hr_job_transfer.mt_alert_xfer_pending")
+            elif self.state == "done":
+                return self.env.ref("hr_job_transfer.mt_alert_xfer_done")
+
+        return super(HrTransfer, self)._track_subtype(init_values)
+
+    def effective_date_in_future(self):
+
+        for transfer in self:
+            if transfer.date <= fields.Date.today():
+                return False
+        return True
+
+    def unlink(self):
+
+        if not self.env.context.get("force_delete", False):
+            for transfer in self:
+                if transfer.state not in ["draft"]:
+                    raise UserError(
+                        _(
+                            "Unable to Delete Transfer!\n"
+                            "Transfer has been initiated. Either cancel the transfer or\n"
+                            "create another transfer to undo it."
+                        )
+                    )
+        return super(HrTransfer, self).unlink()
+
+    def action_transfer(self):
+
+        self.ensure_one()
+        has_permission = self._check_permission_group(
+            "hr_job_transfer.group_hr_transfer"
+        )
+        if has_permission and not self.effective_date_in_future():
+            self.state_done()
+        else:
+            self.write({"state": "pending"})
+
+    def action_confirm(self):
+
+        self.ensure_one()
+        has_permission = self._check_permission_group(
+            "hr_job_transfer.group_hr_transfer"
+        )
+        if has_permission:
+            self.signal_confirm()
+
+    def action_cancel(self):
+
+        self.ensure_one()
+        has_permission = self._check_permission_group(
+            "hr_job_transfer.group_hr_transfer"
+        )
+        if has_permission:
+            self.write({"state": "cancel"})
+
+    @api.model
+    def _check_state(self, contract, effective_date):
+
+        _state_kanban_state = [
+            ("trial", "normal"),
+            ("trial", "blocked"),
+            ("open", "normal"),
+            ("open", "blocked"),
+        ]
+
+        if (contract.state, contract.kanban_state) not in _state_kanban_state:
+            raise UserError(
+                _(
+                    "Warning!\n"
+                    "The current state of the contract does not permit changes."
+                )
+            )
+
+        if contract.date_end and effective_date >= contract.date_end:
+            raise UserError(
+                _(
+                    "Warning!\n"
+                    "The contract end date is on or before the effective date of the transfer."
+                )
+            )
+
+        return True
+
+    def _check_permission_group(self, group=None):
+
+        for transfer in self:
+            if group and not transfer.user_has_groups(group):
+                raise AccessError(
+                    _("You don't have the access rights to take this action.")
+                )
+            else:
+                continue
+        return True
+
+    @api.model
+    def transfer_contract(self, contract, job, transfer, effective_date):
+
+        Contract = self.env["hr.contract"]
+
+        # If the start and date is the same as the contract start date simply change
+        # the current contract.
+        if effective_date == contract.date_start:
+            contract.job_id = job
+            # Link to the new contract
+            transfer.dst_contract_id = contract
+            return
+
+        # generate unique contract name as it is a required field.
+        emp_contract_count = self.env["hr.contract"].search_count(
+            [("employee_id", "=", contract.employee_id.id)]
+        )
+        _contract_name = _(
+            "%s's Contract [%d]", contract.employee_id.name, (emp_contract_count + 1)
+        )
+
+        # Copy the contract and adjust start/end dates, job id, etc. accordingly.
+        default = {
+            "job_id": job.id,
+            "date_start": effective_date,
+            "name": _contract_name,
+            "state": False,
+            "message_ids": False,
+            "trial_date_start": contract.trial_date_start,
+            "trial_date_end": contract.trial_date_end,
+        }
+        data = contract.copy_data(default=default)
+
+        # Terminate the current contract (and trigger appropriate state change)
+        contract.date_end = effective_date - relativedelta(days=1)
+        contract.signal_close()
+
+        # create new contract
+        new_contract = Contract.create(data)
+
+        if new_contract:
+            # Set the new contract to the appropriate state
+            new_contract.signal_confirm()
+
+            # Link to the new contract
+            transfer.dst_contract_id = new_contract
+
+        return True
+
+    def state_confirm(self):
+
+        for transfer in self:
+            self._check_state(transfer.src_contract_id, transfer.date)
+            transfer.state = "confirm"
+
+        return True
+
+    def state_done(self):
+
+        today = fields.Date.today()
+
+        for transfer in self:
+            if transfer.date <= today:
+                self._check_state(transfer.src_contract_id, transfer.date)
+                transfer.employee_id.department_id = transfer.dst_department_id
+                self.transfer_contract(
+                    transfer.src_contract_id,
+                    transfer.dst_id,
+                    transfer,
+                    transfer.date,
+                )
+                transfer.state = "done"
+            else:
+                return False
+
+        return True
+
+    def signal_confirm(self):
+
+        for transfer in self:
+            self._check_state(transfer.src_contract_id, transfer.date)
+            # If the user is a member of 'approval' group, go straight to 'approval'
+            if (
+                self.user_has_groups("hr_job_transfer.group_hr_transfer")
+                and transfer.effective_date_in_future()
+            ):
+                transfer.state = "pending"
+            else:
+                transfer.state_confirm()
+
+        return True
+
+    @api.model
+    def try_pending_department_transfers(self):
+        """Completes pending departmental transfers. Called from the scheduler."""
+
+        self._check_permission_group("hr_job_transfer.group_hr_transfer")
+
+        Transfer = self.env["hr.department.transfer"]
+        pending_transfers = Transfer.search(
+            [("state", "=", "pending"), ("date", "<=", fields.Date.today())]
+        )
+
+        for transfer in pending_transfers:
+            transfer.state_done()
+
+        return True
diff --git a/hr_job_transfer/security/groups.xml b/hr_job_transfer/security/groups.xml
new file mode 100644
index 00000000..c3c94306
--- /dev/null
+++ b/hr_job_transfer/security/groups.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <!-- Transfer Approval -->
+    <record id="group_hr_transfer" model="res.groups">
+        <field name="name">Approve Employee Transfers</field>
+        <field name="category_id" ref="base.module_category_human_resources" />
+        <field
+            name="implied_ids"
+            eval="[(4, ref('hr_contract.group_hr_contract_manager')), (4, ref('base.group_system'))]"
+        />
+        <field name="users" eval="[(4, ref('base.user_root'))]" />
+        <field name="comment">
+            the user will be able to approve employee transfers
+        </field>
+    </record>
+
+    <data noupdate="1">
+
+        <record id="hr_dept_tfr_comp_rule" model="ir.rule">
+            <field name="name">Department Transfer multi-company rule</field>
+            <field name="model_id" ref="model_hr_department_transfer" />
+            <field eval="True" name="global" />
+            <field name="domain_force">
+                ['|',('company_id','=',False),('company_id', 'in', company_ids)]
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/hr_job_transfer/security/ir.model.access.csv b/hr_job_transfer/security/ir.model.access.csv
new file mode 100644
index 00000000..a9789a68
--- /dev/null
+++ b/hr_job_transfer/security/ir.model.access.csv
@@ -0,0 +1,4 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_transfer_default,access_hr_transfer_default,model_hr_department_transfer,base.group_user,1,0,0,0
+access_hr_transfer_officer,access_hr_transfer_officer,model_hr_department_transfer,hr.group_hr_user,1,1,1,1
+access_hr_transfer_approve,access_hr_transfer_approve,model_hr_department_transfer,group_hr_transfer,1,1,1,1
diff --git a/hr_job_transfer/static/description/icon.png b/hr_job_transfer/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/hr_job_transfer/static/description/icon.png differ
diff --git a/hr_job_transfer/tests/__init__.py b/hr_job_transfer/tests/__init__.py
new file mode 100644
index 00000000..5a514897
--- /dev/null
+++ b/hr_job_transfer/tests/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import test_hr_transfer
diff --git a/hr_job_transfer/tests/test_hr_transfer.py b/hr_job_transfer/tests/test_hr_transfer.py
new file mode 100644
index 00000000..f646ee40
--- /dev/null
+++ b/hr_job_transfer/tests/test_hr_transfer.py
@@ -0,0 +1,216 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from dateutil.relativedelta import relativedelta
+
+from odoo import fields
+from odoo.exceptions import AccessError, UserError
+from odoo.tests.common import SavepointCase
+
+
+class TestHrTransfer(SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super(TestHrTransfer, cls).setUpClass()
+        # -- Models
+        cls.Contract = cls.env["hr.contract"]
+        cls.Department = cls.env["hr.department"]
+        cls.Job = cls.env["hr.job"]
+        cls.Employee = cls.env["hr.employee"]
+        cls.Transfer = cls.env["hr.department.transfer"]
+        cls.User = cls.env["res.users"]
+
+        # -- groups
+        cls.group_hr_user = cls.env.ref("hr.group_hr_user")
+        cls.group_hr_transfer = cls.env.ref("hr_job_transfer.group_hr_transfer")
+        cls.group_hr_manager = cls.env.ref("hr.group_hr_manager")
+
+        # -- user
+        cls.hr_user = cls.User.create(
+            {
+                "name": "#Hr User",
+                "login": "hruser",
+                "groups_id": [(4, cls.group_hr_user.id)],
+            }
+        )
+        cls.hr_officer = cls.User.create(
+            {
+                "name": "#Hr Officer",
+                "login": "hroffcer",
+                "groups_id": [(4, cls.group_hr_transfer.id)],
+            }
+        )
+
+        # -- departments
+        cls.dpt_temp = cls.Department.create({"name": "#Temp"})
+        cls.dpt_parttime = cls.Department.create({"name": "#Parttime"})
+
+        # -- jobs
+        cls.job_trainee = cls.Job.create(
+            {"name": "#trainee", "state": "recruit", "department_id": cls.dpt_temp.id}
+        )
+        cls.job_consultant = cls.Job.create(
+            {
+                "name": "#consultant",
+                "state": "recruit",
+                "department_id": cls.dpt_parttime.id,
+            }
+        )
+
+        # -- dates
+        cls.two_month_ago = fields.Date.today() - relativedelta(days=60)
+        cls.today = fields.Date.today()
+        cls.after_one_month = fields.Date.today() + relativedelta(days=30)
+
+    def create_employee(self, name, job_id):
+        return self.Employee.with_user(self.hr_officer).create(
+            [
+                {
+                    "name": name,
+                    "job_id": self.Employee.browse(job_id).id,
+                }
+            ]
+        )
+
+    def create_contract(
+        self, employee, state, kanban_start, start, end=None, trial_end=None, user=False
+    ):
+        _contract_name = f"{employee.name}'s Contract"
+        _user = self.hr_user if not user else user
+        return self.Contract.with_user(_user).create(
+            [
+                {
+                    "name": _contract_name,
+                    "employee_id": employee.id,
+                    "state": state,
+                    "kanban_state": kanban_start,
+                    "wage": 1,
+                    "date_start": start,
+                    "trial_date_end": trial_end if trial_end else False,
+                    "date_end": end if end else False,
+                }
+            ]
+        )
+
+    def apply_transfer_cron(self):
+        self.env.ref(
+            "hr_job_transfer.hr_department_transfer_cron"
+        ).method_direct_trigger()
+
+    def test_only_draft_transfer_can_be_deleted(self):
+        employee = self.create_employee("#John", self.job_trainee.id)
+        contract = self.create_contract(
+            employee=employee,
+            state="open",
+            kanban_start="normal",
+            start=self.two_month_ago,
+            end=self.after_one_month,
+            user=self.hr_officer,
+        )
+        transfer1 = self.Transfer.with_user(self.hr_officer).create(
+            {
+                "employee_id": employee.id,
+                "dst_id": self.job_consultant.id,
+                "date": self.today,
+            }
+        )
+        self.assertEqual(transfer1.src_id, contract.job_id)
+        self.assertEqual(transfer1.src_contract_id.state, "open")
+        self.assertEqual(transfer1.state, "draft")
+        transfer1.unlink()
+
+        transfer2 = self.Transfer.with_user(self.hr_officer).create(
+            {
+                "employee_id": employee.id,
+                "dst_id": self.job_consultant.id,
+                "date": self.today,
+            }
+        )
+        self.assertEqual(transfer2.src_contract_id.state, "open")
+        self.assertEqual(transfer2.state, "draft")
+
+        transfer2.action_confirm()
+        self.assertEqual(transfer2.state, "confirm")
+        with self.assertRaises(UserError):
+            transfer2.unlink()
+
+        transfer2.action_transfer()
+        self.assertEqual(transfer2.state, "done")
+        with self.assertRaises(UserError):
+            transfer2.unlink()
+
+    def test_only_users_in_transfer_group_can_manage_transfer(self):
+        employee = self.create_employee("#John", self.job_trainee.id)
+        self.create_contract(
+            employee=employee,
+            state="open",
+            kanban_start="normal",
+            start=self.two_month_ago,
+            end=self.after_one_month,
+            user=self.hr_officer,
+        )
+        transfer = self.Transfer.with_user(self.hr_user).create(
+            {
+                "employee_id": employee.id,
+                "dst_id": self.job_consultant.id,
+                "date": self.today,
+            }
+        )
+        self.assertEqual(transfer.state, "draft")
+        with self.assertRaises(AccessError):
+            transfer.action_confirm()
+
+        transfer.with_user(self.hr_officer).action_confirm()
+        self.assertEqual(transfer.state, "confirm")
+        with self.assertRaises(AccessError):
+            transfer.action_transfer()
+
+        transfer.with_user(self.hr_officer).action_transfer()
+        self.assertEqual(transfer.state, "done")
+
+    def test_transfer_on_inactive_contract_is_not_allowed(self):
+        employee = self.create_employee("#John", self.job_trainee.id)
+        contract = self.create_contract(
+            employee=employee,
+            state="open",
+            kanban_start="normal",
+            start=self.two_month_ago,
+            end=self.after_one_month,
+            user=self.hr_officer,
+        )
+        transfer = self.Transfer.with_user(self.hr_user).create(
+            {
+                "employee_id": employee.id,
+                "dst_id": self.job_consultant.id,
+                "date": self.today,
+            }
+        )
+        transfer.with_user(self.hr_officer).action_confirm()
+        self.assertEqual(transfer.state, "confirm")
+        contract.signal_close()
+        with self.assertRaises(UserError):
+            transfer.with_user(self.hr_officer).action_transfer()
+
+    def test_cron_transfer(self):
+        employee = self.create_employee("#John", self.job_trainee.id)
+        self.create_contract(
+            employee=employee,
+            state="open",
+            kanban_start="normal",
+            start=self.two_month_ago,
+            end=self.after_one_month,
+            user=self.hr_officer,
+        )
+        transfer = self.Transfer.with_user(self.hr_user).create(
+            {
+                "employee_id": employee.id,
+                "dst_id": self.job_consultant.id,
+                "date": self.today + relativedelta(days=1),
+            }
+        )
+        transfer.with_user(self.hr_officer).action_confirm()
+        self.assertEqual(transfer.state, "pending")
+        transfer.date = self.today
+        self.apply_transfer_cron()
+        self.assertEqual(transfer.state, "done")
diff --git a/hr_job_transfer/views/hr_transfer_view.xml b/hr_job_transfer/views/hr_transfer_view.xml
new file mode 100644
index 00000000..2f4fea02
--- /dev/null
+++ b/hr_job_transfer/views/hr_transfer_view.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+
+    <record id="department_transfer_tree_view" model="ir.ui.view">
+        <field name="name">hr.department.transfer.tree</field>
+        <field name="model">hr.department.transfer</field>
+        <field name="arch" type="xml">
+            <tree string="Departmental Transfers">
+                <field name="employee_id" />
+                <field name="src_id" />
+                <field name="dst_id" />
+                <field name="date" />
+                <field name="state" />
+            </tree>
+        </field>
+    </record>
+
+    <record id="department_transfer_form_view" model="ir.ui.view">
+        <field name="name">hr.department.transfer.form</field>
+        <field name="model">hr.department.transfer</field>
+        <field name="arch" type="xml">
+            <form string="Departmental Transfer">
+                <header>
+                    <button
+                        name="action_confirm"
+                        type="object"
+                        states="draft"
+                        string="Confirm"
+                        class="oe_highlight"
+                        groups="hr_job_transfer.group_hr_transfer"
+                    />
+                    <button
+                        name="action_transfer"
+                        type="object"
+                        states="confirm"
+                        string="Transfer"
+                        class="oe_highlight"
+                        groups="hr_job_transfer.group_hr_transfer"
+                    />
+                    <button
+                        name="action_cancel"
+                        type="object"
+                        states="confirm,pending"
+                        string="Cancel"
+                        class="oe_highlight"
+                        groups="hr_job_transfer.group_hr_transfer"
+                    />
+                    <field name="state" widget="statusbar" />
+                </header>
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="employee_id" />
+                            <field name="src_id" widget="selection" />
+                            <field name="dst_id" widget="selection" />
+                            <field name="date" />
+                        </group>
+                        <group>
+                            <field name="src_department_id" />
+                            <field name="src_contract_id" />
+                            <field name="dst_department_id" />
+                            <field name="dst_contract_id" />
+                            <field
+                                name="company_id"
+                                groups="base.group_multi_company"
+                            />
+                        </group>
+                    </group>
+                </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids" widget="mail_followers" />
+                    <field name="message_ids" widget="mail_thread" />
+                </div>
+            </form>
+        </field>
+    </record>
+
+    <record id="open_hr_department_transfer" model="ir.actions.act_window">
+        <field name="name">Departmental Transfers</field>
+        <field name="res_model">hr.department.transfer</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+    <menuitem
+        id="menu_hr_department_transfer"
+        action="open_hr_department_transfer"
+        parent="hr.menu_hr_root"
+        sequence="6"
+    />
+
+</odoo>
diff --git a/hr_jobs_hierarchy/README.rst b/hr_jobs_hierarchy/README.rst
new file mode 100644
index 00000000..43b8f18c
--- /dev/null
+++ b/hr_jobs_hierarchy/README.rst
@@ -0,0 +1,9 @@
+Define Hierarchy of Jobs
+========================
+
+    1. Define parent/child relationship for jobs, which is useful for
+       determining supervisor/subordinate relationships.
+    2. Provide a knob in Job configuration to specify if the person with that
+       job should be considered the Department manager.
+    3. Automatically set the manager of a department based on this knob in job configuration.
+    4. Automatically set an employee's manager from the department's manager.
diff --git a/hr_jobs_hierarchy/__init__.py b/hr_jobs_hierarchy/__init__.py
new file mode 100644
index 00000000..2b0f2dca
--- /dev/null
+++ b/hr_jobs_hierarchy/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
diff --git a/hr_jobs_hierarchy/__manifest__.py b/hr_jobs_hierarchy/__manifest__.py
new file mode 100644
index 00000000..9897fc70
--- /dev/null
+++ b/hr_jobs_hierarchy/__manifest__.py
@@ -0,0 +1,20 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Job Hierarchy",
+    "version": "15.0.1.0.0",
+    "category": "Human Resources",
+    "license": "AGPL-3",
+    "author": "TREVI Software ",
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "hr",
+        "hr_contract",
+    ],
+    "data": [
+        "views/hr_view.xml",
+    ],
+    "installable": True,
+}
diff --git a/hr_jobs_hierarchy/i18n/hr_jobs_hierarchy.pot b/hr_jobs_hierarchy/i18n/hr_jobs_hierarchy.pot
new file mode 100644
index 00000000..f728279b
--- /dev/null
+++ b/hr_jobs_hierarchy/i18n/hr_jobs_hierarchy.pot
@@ -0,0 +1,82 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* hr_jobs_hierarchy
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: hr_jobs_hierarchy
+#: model:ir.model.fields,field_description:hr_jobs_hierarchy.field_hr_job__all_child_ids
+msgid "All Child"
+msgstr ""
+
+#. module: hr_jobs_hierarchy
+#: model:ir.model,name:hr_jobs_hierarchy.model_hr_department
+msgid "Department"
+msgstr ""
+
+#. module: hr_jobs_hierarchy
+#: model:ir.model.fields,field_description:hr_jobs_hierarchy.field_hr_job__department_manager
+msgid "Department Manager"
+msgstr ""
+
+#. module: hr_jobs_hierarchy
+#: model:ir.model.fields,field_description:hr_jobs_hierarchy.field_hr_contract__display_name
+#: model:ir.model.fields,field_description:hr_jobs_hierarchy.field_hr_department__display_name
+#: model:ir.model.fields,field_description:hr_jobs_hierarchy.field_hr_job__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: hr_jobs_hierarchy
+#: model:ir.model,name:hr_jobs_hierarchy.model_hr_contract
+msgid "Employee Contract"
+msgstr ""
+
+#. module: hr_jobs_hierarchy
+#: code:addons/hr_jobs_hierarchy/models/hr.py:0
+#, python-format
+msgid "Error! You cannot create recursive jobs."
+msgstr ""
+
+#. module: hr_jobs_hierarchy
+#: model:ir.model.fields,field_description:hr_jobs_hierarchy.field_hr_contract__id
+#: model:ir.model.fields,field_description:hr_jobs_hierarchy.field_hr_department__id
+#: model:ir.model.fields,field_description:hr_jobs_hierarchy.field_hr_job__id
+msgid "ID"
+msgstr ""
+
+#. module: hr_jobs_hierarchy
+#: model:ir.model.fields,field_description:hr_jobs_hierarchy.field_hr_job__child_ids
+#: model_terms:ir.ui.view,arch_db:hr_jobs_hierarchy.job_form_view
+msgid "Immediate Subordinates"
+msgstr ""
+
+#. module: hr_jobs_hierarchy
+#: model:ir.model.fields,field_description:hr_jobs_hierarchy.field_hr_job__parent_id
+msgid "Immediate Superior"
+msgstr ""
+
+#. module: hr_jobs_hierarchy
+#: model:ir.model,name:hr_jobs_hierarchy.model_hr_job
+msgid "Job Position"
+msgstr ""
+
+#. module: hr_jobs_hierarchy
+#: model:ir.model.fields,field_description:hr_jobs_hierarchy.field_hr_contract____last_update
+#: model:ir.model.fields,field_description:hr_jobs_hierarchy.field_hr_department____last_update
+#: model:ir.model.fields,field_description:hr_jobs_hierarchy.field_hr_job____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: hr_jobs_hierarchy
+#: model:ir.model.fields,field_description:hr_jobs_hierarchy.field_hr_job__parent_path
+msgid "Parent Path"
+msgstr ""
diff --git a/hr_jobs_hierarchy/models/__init__.py b/hr_jobs_hierarchy/models/__init__.py
new file mode 100644
index 00000000..4c6d96de
--- /dev/null
+++ b/hr_jobs_hierarchy/models/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import hr
diff --git a/hr_jobs_hierarchy/models/hr.py b/hr_jobs_hierarchy/models/hr.py
new file mode 100644
index 00000000..1067da89
--- /dev/null
+++ b/hr_jobs_hierarchy/models/hr.py
@@ -0,0 +1,189 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+import logging
+
+from odoo import api, fields, models
+from odoo.exceptions import ValidationError
+from odoo.tools.translate import _
+
+_l = logging.getLogger(__name__)
+
+
+class HrJob(models.Model):
+
+    _inherit = "hr.job"
+    _parent_store = True
+    _order = "parent_path"
+
+    department_manager = fields.Boolean()
+    parent_id = fields.Many2one(
+        string="Immediate Superior", comodel_name="hr.job", ondelete="cascade"
+    )
+    child_ids = fields.One2many(
+        string="Immediate Subordinates",
+        comodel_name="hr.job",
+        inverse_name="parent_id",
+    )
+    all_child_ids = fields.Many2many(
+        compute="_compute_all_child_ids", comodel_name="hr.job"
+    )
+    parent_path = fields.Char(index=True)
+
+    def _compute_all_child_ids(self):
+        for rec in self:
+            rec.child_ids = self.search([("parent_id", "child_of", rec.id)])
+
+    @api.constrains("parent_id")
+    def _check_job_recursion(self):
+        if not self._check_recursion():
+            raise ValidationError(_("Error! You cannot create recursive jobs."))
+
+    def write(self, vals):
+
+        res = super(HrJob, self).write(vals)
+
+        dept_obj = self.env["hr.department"]
+        if vals.get("department_manager", False):
+            for job in self:
+                dept_id = False
+                if vals.get("department_id", False):
+                    dept_id = vals["department_id"]
+                else:
+                    dept_id = job.department_id.id
+                employee_id = False
+                for ee in job.employee_ids:
+                    employee_id = ee.id
+                if employee_id:
+                    dept_obj.browse(dept_id).write({"manager_id": employee_id})
+        elif vals.get("department_id", False):
+            for job in self:
+                if job.department_manager:
+                    employee_id = False
+                    for ee in job.employee_ids:
+                        employee_id = ee.id
+                    dept_obj.browse(vals["department_id"]).write(
+                        {"manager_id": employee_id}
+                    )
+        elif vals.get("parent_id", False):
+            parent_job = self.browse(vals["parent_id"])
+            parent_id = False
+            for ee in parent_job.employee_ids:
+                parent_id = ee.id
+            for job in self:
+                for ee in job.employee_ids:
+                    ee.parent_id = parent_id
+
+        return res
+
+
+class HrContract(models.Model):
+
+    _name = "hr.contract"
+    _inherit = "hr.contract"
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        res = super(HrContract, self).create(vals_list)
+
+        if not any([vals.get("job_id", False) for vals in vals_list]):
+            return res
+
+        Employee = self.env["hr.employee"]
+        Job = self.env["hr.job"]
+
+        for vals in vals_list:
+
+            job = Job.browse(vals["job_id"])
+
+            if job and job.parent_id:
+                parent_ee_id = False
+                for employee in job.parent_id.employee_ids:
+                    parent_ee_id = employee.id
+                if parent_ee_id and vals.get("employee_id"):
+                    Employee.browse(vals["employee_id"]).write(
+                        {"parent_id": parent_ee_id}
+                    )
+
+            # Write any employees with jobs that are immediate descendants of this job
+            if job:
+                job_child_ids = []
+                [job_child_ids.append(child.id) for child in job.child_ids]
+                if len(job_child_ids) > 0:
+                    ee_ids = Employee.search([("job_id", "in", job_child_ids)])
+                    if len(ee_ids) > 0:
+                        parent_ee_id = False
+                        for employee in job.employee_ids:
+                            parent_ee_id = employee.id
+                        if parent_ee_id:
+                            ee_ids.write({"parent_id": parent_ee_id})
+        return res
+
+    def write(self, vals):
+
+        res = super(HrContract, self).write(vals)
+
+        if not vals.get("job_id", False):
+            return res
+
+        ee_obj = self.env["hr.employee"]
+
+        job = self.env["hr.job"].browse(vals["job_id"])
+
+        # Write the employee's manager
+        if job and job.parent_id:
+            parent_id = False
+            for ee in job.parent_id.employee_ids:
+                parent_id = ee.id
+            if parent_id:
+                for contract in self:
+                    contract.employee_id.parent_id = parent_id
+
+        # Write any employees with jobs that are immediate descendants of this job
+        if job:
+            job_child_ids = []
+            [job_child_ids.append(child.id) for child in job.child_ids]
+            if len(job_child_ids) > 0:
+                ee_ids = ee_obj.search(
+                    [("job_id", "in", job_child_ids), ("active", "=", True)]
+                )
+                if len(ee_ids) > 0:
+                    parent_id = False
+                    for ee in job.employee_ids:
+                        parent_id = ee.id
+                    if parent_id:
+                        ee_ids.write({"parent_id": parent_id})
+
+        return res
+
+
+class HrDepartment(models.Model):
+
+    _inherit = "hr.department"
+
+    def write(self, vals):
+
+        # Get previous manager(s)
+        manager_ids = []
+        if "manager_id" in vals:
+            for rec in self:
+                if rec.manager_id and rec.manager_id.id not in manager_ids:
+                    manager_ids.append(rec.manager_id.id)
+
+        res = super(HrDepartment, self).write(vals)
+
+        Employee = self.env["hr.employee"]
+
+        if "manager_id" in vals:
+            manager_ids.append(vals["manager_id"])
+            ee_ids = Employee.search(
+                [
+                    ("department_id", "in", self.ids),
+                    ("active", "=", True),
+                    ("id", "not in", manager_ids),
+                ]
+            )
+            ee_ids.write({"parent_id": vals["manager_id"]})
+
+        return res
diff --git a/hr_jobs_hierarchy/static/description/icon.png b/hr_jobs_hierarchy/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/hr_jobs_hierarchy/static/description/icon.png differ
diff --git a/hr_jobs_hierarchy/tests/__init__.py b/hr_jobs_hierarchy/tests/__init__.py
new file mode 100644
index 00000000..bf4f33d3
--- /dev/null
+++ b/hr_jobs_hierarchy/tests/__init__.py
@@ -0,0 +1,7 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import test_hr_contract
+from . import test_hr_department
+from . import test_hr_job
diff --git a/hr_jobs_hierarchy/tests/common.py b/hr_jobs_hierarchy/tests/common.py
new file mode 100644
index 00000000..0c82d0ac
--- /dev/null
+++ b/hr_jobs_hierarchy/tests/common.py
@@ -0,0 +1,73 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import timedelta
+
+from odoo.fields import Date
+from odoo.tests.common import SavepointCase
+
+
+class TestHrCommon(SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super(TestHrCommon, cls).setUpClass()
+
+        # -- models
+        cls.Contract = cls.env["hr.contract"]
+        cls.Department = cls.env["hr.department"]
+        cls.Employee = cls.env["hr.employee"]
+        cls.Job = cls.env["hr.job"]
+
+        # departments
+        cls.dept_sales = cls.Department.create({"name": "#Sales"})
+
+        cls.contract_data = {
+            "name": "Contract #1",
+            "employee_id": False,
+            "job_id": False,
+            "wage": 1,
+            "state": "open",
+            "kanban_state": "normal",
+            "date_start": Date.today(),
+            "date_end": Date.today() + timedelta(days=90),
+        }
+
+    def create_department(self, name):
+        return self.Department.create({"name": name})
+
+    def create_employee(self, name, department=None):
+        return self.Employee.create(
+            {"name": name, "department_id": department.id if department else False}
+        )
+
+    def create_job(
+        self, name, parent_job=None, department=None, is_manager=False, employees=None
+    ):
+        employees_xpr = (
+            [(4, employee.id) for employee in employees] if employees else False
+        )
+        return self.Job.create(
+            {
+                "name": name,
+                "state": "open",
+                "parent_id": parent_job.id if parent_job else False,
+                "department_manager": is_manager,
+                "department_id": department.id if department else False,
+                "employee_ids": employees_xpr,
+            }
+        )
+
+    def create_contract(self, name, employee, job=None, start_date=None, end_date=None):
+        c_data = self.contract_data.copy()
+        c_data.update(
+            {
+                "name": name if name else c_data["name"],
+                "employee_id": employee.id,
+                "job_id": job.id if job else False,
+            }
+        )
+        return self.Contract.create(c_data)
+
+    def create_contract_multi(self, contracts):
+        return self.Contract.create(contracts)
diff --git a/hr_jobs_hierarchy/tests/test_hr_contract.py b/hr_jobs_hierarchy/tests/test_hr_contract.py
new file mode 100644
index 00000000..c8138e6b
--- /dev/null
+++ b/hr_jobs_hierarchy/tests/test_hr_contract.py
@@ -0,0 +1,58 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from .common import TestHrCommon
+
+
+class TestHrContract(TestHrCommon):
+    @classmethod
+    def setUpClass(cls):
+        super(TestHrContract, cls).setUpClass()
+
+    def test_manager_for_contract_employee_is_set(self):
+        # -- employees
+        emp_SM = self.create_employee("#EMP (sales manager)")
+        emp_SA = self.create_employee("#EMP (sales associate)")
+        emp_SR = self.create_employee("#EMP (sales representative)")
+
+        # -- jobs
+        job_SM = self.create_job(
+            name="#Sales Manager",
+            department=self.dept_sales,
+            is_manager=True,
+            employees=emp_SM,
+        )
+        job_SA = self.create_job(
+            name="#Sales Associate",
+            parent_job=job_SM,
+            department=self.dept_sales,
+            employees=emp_SA,
+        )
+        job_SR = self.create_job(
+            name="#Sales Representative",
+            parent_job=job_SM,
+            department=self.dept_sales,
+            employees=emp_SR,
+        )
+
+        c_data_SM = self.contract_data.copy()
+        c_data_SR = self.contract_data.copy()
+        c_data_SA = self.contract_data.copy()
+
+        c_data_SM.update(
+            {"name": "#CONTRACT SM", "employee_id": emp_SM.id, "job_id": job_SM.id}
+        )
+        c_data_SR.update(
+            {"name": "#CONTRACT SR", "employee_id": emp_SR.id, "job_id": job_SR.id}
+        )
+        c_data_SA.update(
+            {"name": "#CONTRACT SA", "employee_id": emp_SA.id, "job_id": job_SA.id}
+        )
+
+        self.create_contract_multi([c_data_SA, c_data_SR, c_data_SM])
+
+        test_contracts = self.Contract.search([("name", "like", "#CONTRACT")])
+        self.assertEqual(len(test_contracts), 3)
+        self.assertEqual(emp_SA.parent_id, emp_SM)
+        self.assertEqual(emp_SR.parent_id, emp_SM)
diff --git a/hr_jobs_hierarchy/tests/test_hr_department.py b/hr_jobs_hierarchy/tests/test_hr_department.py
new file mode 100644
index 00000000..063f9bf4
--- /dev/null
+++ b/hr_jobs_hierarchy/tests/test_hr_department.py
@@ -0,0 +1,23 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from .common import TestHrCommon
+
+
+class TestHrDepartment(TestHrCommon):
+    @classmethod
+    def setUpClass(cls):
+        super(TestHrDepartment, cls).setUpClass()
+
+    def test_department_manager_is_set_as_employees_manager(self):
+        emp_SM = self.create_employee("#EMP (sales manager)")
+        emp_SA = self.create_employee(
+            "#EMP (sales associate)", department=self.dept_sales
+        )
+        emp_SR = self.create_employee(
+            "#EMP (sales representative)", department=self.dept_sales
+        )
+        self.dept_sales.manager_id = emp_SM
+        self.assertEqual(emp_SA.parent_id, emp_SM)
+        self.assertEqual(emp_SR.parent_id, emp_SM)
diff --git a/hr_jobs_hierarchy/tests/test_hr_job.py b/hr_jobs_hierarchy/tests/test_hr_job.py
new file mode 100644
index 00000000..fd85a327
--- /dev/null
+++ b/hr_jobs_hierarchy/tests/test_hr_job.py
@@ -0,0 +1,37 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from .common import TestHrCommon
+
+
+class TestHrJob(TestHrCommon):
+    @classmethod
+    def setUpClass(cls):
+        super(TestHrJob, cls).setUpClass()
+
+    def test_employee_with_manager_job_position_is_set_as_department_manager(self):
+        emp_SM = self.create_employee("#EMP (sale manager)")
+        job_SM = self.create_job(
+            "#Sales Manager", department=self.dept_sales, employees=emp_SM
+        )
+        job_SM.department_manager = True
+        self.assertEqual(self.dept_sales.manager_id, emp_SM)
+
+    def test_parent_job_position_employee_is_set_as_employee_parent(self):
+        emp_SM = self.create_employee("#EMP (sales manager)")
+        emp_SA = self.create_employee("#EMP (sales associate)")
+        job_SM = self.create_job(
+            name="#Sales Manager",
+            department=self.dept_sales,
+            is_manager=True,
+            employees=emp_SM,
+        )
+        job_SA = self.create_job(
+            name="#Sales Associate",
+            parent_job=job_SM,
+            department=self.dept_sales,
+            employees=emp_SA,
+        )
+        job_SA.parent_id = job_SM
+        self.assertEqual(emp_SA.parent_id, emp_SM)
diff --git a/hr_jobs_hierarchy/views/hr_view.xml b/hr_jobs_hierarchy/views/hr_view.xml
new file mode 100644
index 00000000..4f7481f5
--- /dev/null
+++ b/hr_jobs_hierarchy/views/hr_view.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+
+    <!-- Job Form -->
+    <record id="job_form_view" model="ir.ui.view">
+        <field name="name">hr.job.form.hierarchy</field>
+        <field name="model">hr.job</field>
+        <field name="inherit_id" ref="hr.view_hr_job_form" />
+        <field name="arch" type="xml">
+            <data>
+                <xpath expr="//field[@name='department_id']" position="after">
+                    <field name="parent_id" />
+                    <field name="department_manager" />
+                </xpath>
+                <xpath expr="//sheet" position="inside">
+                    <group string="Immediate Subordinates">
+                        <field name="child_ids" nolabel="1" />
+                    </group>
+                </xpath>
+            </data>
+        </field>
+    </record>
+
+</odoo>
diff --git a/hr_leave_type_unique/README.rst b/hr_leave_type_unique/README.rst
new file mode 100644
index 00000000..84cd2797
--- /dev/null
+++ b/hr_leave_type_unique/README.rst
@@ -0,0 +1,61 @@
+=================
+Leave Type Unique
+=================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:a5d61b79ca76490d3856da404421a00b40e213c8955bda7bad6aa8b255b43b62
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/hr_leave_type_unique
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+This module make leave type codes unique  per company.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20hr_leave_type_unique%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+* Michael Telahun Makonnen
+
+Other credits
+~~~~~~~~~~~~~
+
+* Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/hr_leave_type_unique>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/hr_leave_type_unique/__init__.py b/hr_leave_type_unique/__init__.py
new file mode 100644
index 00000000..2b0f2dca
--- /dev/null
+++ b/hr_leave_type_unique/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
diff --git a/hr_leave_type_unique/__manifest__.py b/hr_leave_type_unique/__manifest__.py
new file mode 100644
index 00000000..2cac6821
--- /dev/null
+++ b/hr_leave_type_unique/__manifest__.py
@@ -0,0 +1,20 @@
+# Copyright (C) 2021,2023 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Leave Type Unique",
+    "summary": "Ensure leave types are unique",
+    "version": "15.0.1.0.0",
+    "category": "Hidden",
+    "license": "AGPL-3",
+    "author": "TREVI Software, Michael Telahun Makonnen",
+    "images": ["static/src/img/main_screenshot.png"],
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "hr_holidays",
+        "hr_leave_type_unique_preinstall",
+    ],
+    "data": [],
+    "installable": True,
+}
diff --git a/hr_leave_type_unique/i18n/hr_leave_type_unique.pot b/hr_leave_type_unique/i18n/hr_leave_type_unique.pot
new file mode 100644
index 00000000..5dc02ce7
--- /dev/null
+++ b/hr_leave_type_unique/i18n/hr_leave_type_unique.pot
@@ -0,0 +1,44 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* hr_leave_type_unique
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: hr_leave_type_unique
+#: model:ir.model.fields,field_description:hr_leave_type_unique.field_hr_leave_type__code
+msgid "Code"
+msgstr ""
+
+#. module: hr_leave_type_unique
+#: model:ir.model.constraint,message:hr_leave_type_unique.constraint_hr_leave_type_code_unique
+msgid "Codes for leave type must be unique!"
+msgstr ""
+
+#. module: hr_leave_type_unique
+#: model:ir.model.fields,field_description:hr_leave_type_unique.field_hr_leave_type__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: hr_leave_type_unique
+#: model:ir.model.fields,field_description:hr_leave_type_unique.field_hr_leave_type__id
+msgid "ID"
+msgstr ""
+
+#. module: hr_leave_type_unique
+#: model:ir.model.fields,field_description:hr_leave_type_unique.field_hr_leave_type____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: hr_leave_type_unique
+#: model:ir.model,name:hr_leave_type_unique.model_hr_leave_type
+msgid "Time Off Type"
+msgstr ""
diff --git a/hr_leave_type_unique/models/__init__.py b/hr_leave_type_unique/models/__init__.py
new file mode 100644
index 00000000..f04df88d
--- /dev/null
+++ b/hr_leave_type_unique/models/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import hr_leave_type
diff --git a/hr_leave_type_unique/models/hr_leave_type.py b/hr_leave_type_unique/models/hr_leave_type.py
new file mode 100644
index 00000000..0fac6445
--- /dev/null
+++ b/hr_leave_type_unique/models/hr_leave_type.py
@@ -0,0 +1,19 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import fields, models
+
+
+class LeaveType(models.Model):
+
+    _inherit = "hr.leave.type"
+    _sql_constraints = [
+        (
+            "code_unique",
+            "UNIQUE(company_id,code)",
+            "Codes for leave type must be unique!",
+        )
+    ]
+
+    code = fields.Char(required=True)
diff --git a/hr_leave_type_unique/readme/CREDITS.rst b/hr_leave_type_unique/readme/CREDITS.rst
new file mode 100644
index 00000000..d264bc7e
--- /dev/null
+++ b/hr_leave_type_unique/readme/CREDITS.rst
@@ -0,0 +1 @@
+* Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/hr_leave_type_unique/readme/DESCRIPTION.rst b/hr_leave_type_unique/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..75f21c67
--- /dev/null
+++ b/hr_leave_type_unique/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+This module make leave type codes unique  per company.
diff --git a/hr_leave_type_unique/static/description/icon.png b/hr_leave_type_unique/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/hr_leave_type_unique/static/description/icon.png differ
diff --git a/hr_leave_type_unique/static/description/index.html b/hr_leave_type_unique/static/description/index.html
new file mode 100644
index 00000000..f6dac4ec
--- /dev/null
+++ b/hr_leave_type_unique/static/description/index.html
@@ -0,0 +1,417 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Leave Type Unique</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="leave-type-unique">
+<h1 class="title">Leave Type Unique</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:a5d61b79ca76490d3856da404421a00b40e213c8955bda7bad6aa8b255b43b62
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/hr_leave_type_unique"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<p>This module make leave type codes unique  per company.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-4">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20hr_leave_type_unique%0Aversion:%2014.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="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>TREVI Software</li>
+<li>Michael Telahun Makonnen</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-4">Other credits</a></h2>
+<ul class="simple">
+<li>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/hr_leave_type_unique">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/hr_leave_type_unique/static/src/img/main_screenshot.png b/hr_leave_type_unique/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/hr_leave_type_unique/static/src/img/main_screenshot.png differ
diff --git a/hr_leave_type_unique/tests/__init__.py b/hr_leave_type_unique/tests/__init__.py
new file mode 100644
index 00000000..0736fe64
--- /dev/null
+++ b/hr_leave_type_unique/tests/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import test_hr_leave_type
diff --git a/hr_leave_type_unique/tests/test_hr_leave_type.py b/hr_leave_type_unique/tests/test_hr_leave_type.py
new file mode 100644
index 00000000..2f9484d1
--- /dev/null
+++ b/hr_leave_type_unique/tests/test_hr_leave_type.py
@@ -0,0 +1,37 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+
+from psycopg2 import IntegrityError
+
+from odoo.tests import common
+
+CODE = "XXX"
+
+
+class TestHrLeaveType(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super(TestHrLeaveType, cls).setUpClass()
+
+        cls.HrLeaveType = cls.env["hr.leave.type"]
+        cls.company1 = cls.env["res.company"].create({"name": "A company"})
+        cls.company2 = cls.env["res.company"].create({"name": "B company"})
+
+    def test_leave_type_is_unique(self):
+        """Leave type codes should be unique"""
+
+        self.HrLeaveType.create({"name": "X", "code": CODE})
+        with self.assertRaises(IntegrityError):
+            self.HrLeaveType.create({"name": "Y", "code": CODE})
+
+    def test_unique_multicompany(self):
+        """Multiple companies can have the same code"""
+
+        self.HrLeaveType.with_company(self.company1).create({"name": "X", "code": CODE})
+        try:
+            self.HrLeaveType.with_company(self.company2).create(
+                {"name": "X", "code": CODE}
+            )
+        except Exception:
+            self.assertFail("An unexpected exception was raised")
diff --git a/hr_leave_type_unique_preinstall/README.rst b/hr_leave_type_unique_preinstall/README.rst
new file mode 100644
index 00000000..35847004
--- /dev/null
+++ b/hr_leave_type_unique_preinstall/README.rst
@@ -0,0 +1,2 @@
+This is a technical module. It is required by the module hr_leave_type_unique. It adds values to the 'code' column of hr.leave.type so
+that we may later add a 'UNIQUE' constraint to the database table.
diff --git a/hr_leave_type_unique_preinstall/__init__.py b/hr_leave_type_unique_preinstall/__init__.py
new file mode 100644
index 00000000..d1d3ed0a
--- /dev/null
+++ b/hr_leave_type_unique_preinstall/__init__.py
@@ -0,0 +1,2 @@
+# Copyright (C) 2023 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
diff --git a/hr_leave_type_unique_preinstall/__manifest__.py b/hr_leave_type_unique_preinstall/__manifest__.py
new file mode 100644
index 00000000..ece80bde
--- /dev/null
+++ b/hr_leave_type_unique_preinstall/__manifest__.py
@@ -0,0 +1,21 @@
+# Copyright (C) 2023 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+# pylint: disable=pointless-statement
+{
+    "name": "Leave Type Unique - Preinstall",
+    "summary": "Technical module depended on by Leave Type Unique",
+    "version": "15.0.1.0.0",
+    "category": "Human Resources",
+    "license": "AGPL-3",
+    "author": "TREVI Software, Michael Telahun Makonnen",
+    "images": ["static/src/img/main_screenshot.png"],
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "hr_holidays",
+    ],
+    "data": [
+        "data/hr_holidays_data.xml",
+    ],
+    "installable": True,
+}
diff --git a/hr_leave_type_unique_preinstall/data/hr_holidays_data.xml b/hr_leave_type_unique_preinstall/data/hr_holidays_data.xml
new file mode 100644
index 00000000..41e847db
--- /dev/null
+++ b/hr_leave_type_unique_preinstall/data/hr_holidays_data.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data noupdate="1">
+        <!-- Casual leave -->
+        <record id="hr_holidays.holiday_status_cl" model="hr.leave.type">
+            <field name="code">LCASU</field>
+        </record>
+
+        <!-- Sick leave -->
+        <record id="hr_holidays.holiday_status_sl" model="hr.leave.type">
+            <field name="code">LSICK</field>
+        </record>
+
+        <!-- Compensatory Days -->
+        <record id="hr_holidays.holiday_status_comp" model="hr.leave.type">
+            <field name="code">LCOMP</field>
+        </record>
+
+        <!--Unpaid Leave -->
+        <record id="hr_holidays.holiday_status_unpaid" model="hr.leave.type">
+            <field name="code">LUNPA</field>
+        </record>
+    </data>
+</odoo>
diff --git a/hr_photobooth/README.rst b/hr_photobooth/README.rst
new file mode 100644
index 00000000..a6a294cf
--- /dev/null
+++ b/hr_photobooth/README.rst
@@ -0,0 +1,70 @@
+===========
+Photo Booth
+===========
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:c6d0d4dac42173b8eb787ffc1e66fc3a61db0fbcb8a8451c3d3ef64004734f08
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/hr_photobooth
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+Take an employee's picture using an attached webcam.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Usage
+=====
+
+The photo booth can be accessed from the "Actions" menu of an employee record.
+
+Known issues / Roadmap
+======================
+
+* Modern versions of web browsers allow access to the webcam only from SSL encrypted web sites.
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20hr_photobooth%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+
+Other credits
+~~~~~~~~~~~~~
+
+Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/hr_photobooth>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/hr_photobooth/__init__.py b/hr_photobooth/__init__.py
new file mode 100644
index 00000000..1cc5116e
--- /dev/null
+++ b/hr_photobooth/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import models
diff --git a/hr_photobooth/__manifest__.py b/hr_photobooth/__manifest__.py
new file mode 100644
index 00000000..b423a4e1
--- /dev/null
+++ b/hr_photobooth/__manifest__.py
@@ -0,0 +1,25 @@
+# Copyright (C) 2021 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    "name": "Photo Booth",
+    "summary": "Capture employee picture with webcam",
+    "version": "15.0.1.0.0",
+    "category": "Human Resources",
+    "author": "TREVI Software",
+    "license": "AGPL-3",
+    "images": ["static/src/img/main_screenshot.png"],
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "hr",
+        "web",
+    ],
+    "data": [
+        "security/ir.model.access.csv",
+        "views/hr_photobooth_view.xml",
+        "views/assets.xml",
+    ],
+    "demo": [],
+    "installable": True,
+}
diff --git a/hr_photobooth/i18n/hr_photobooth.pot b/hr_photobooth/i18n/hr_photobooth.pot
new file mode 100644
index 00000000..a898f3ce
--- /dev/null
+++ b/hr_photobooth/i18n/hr_photobooth.pot
@@ -0,0 +1,90 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* hr_photobooth
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: hr_photobooth
+#. openerp-web
+#: code:addons/hr_photobooth/static/src/xml/webcam_widget.xml:0
+#, python-format
+msgid "Cancel"
+msgstr ""
+
+#. module: hr_photobooth
+#: model:ir.model.fields,field_description:hr_photobooth.field_hr_employee_webcam__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: hr_photobooth
+#: model:ir.model.fields,field_description:hr_photobooth.field_hr_employee_webcam__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: hr_photobooth
+#: model:ir.model.fields,field_description:hr_photobooth.field_hr_employee_webcam__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: hr_photobooth
+#: model:ir.model.fields,field_description:hr_photobooth.field_hr_employee_webcam__employee_id
+msgid "Employee"
+msgstr ""
+
+#. module: hr_photobooth
+#: model_terms:ir.ui.view,arch_db:hr_photobooth.view_webcam_form
+msgid "Employee Webcam Dialog"
+msgstr ""
+
+#. module: hr_photobooth
+#: model:ir.model.fields,field_description:hr_photobooth.field_hr_employee_webcam__id
+msgid "ID"
+msgstr ""
+
+#. module: hr_photobooth
+#: model:ir.model.fields,field_description:hr_photobooth.field_hr_employee_webcam____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: hr_photobooth
+#: model:ir.model.fields,field_description:hr_photobooth.field_hr_employee_webcam__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: hr_photobooth
+#: model:ir.model.fields,field_description:hr_photobooth.field_hr_employee_webcam__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: hr_photobooth
+#: model:ir.actions.act_window,name:hr_photobooth.action_open_webcam_form
+msgid "Photo Booth"
+msgstr ""
+
+#. module: hr_photobooth
+#. openerp-web
+#: code:addons/hr_photobooth/static/src/xml/webcam_widget.xml:0
+#, python-format
+msgid "Take Picture"
+msgstr ""
+
+#. module: hr_photobooth
+#. openerp-web
+#: code:addons/hr_photobooth/static/src/xml/webcam_widget.xml:0
+#, python-format
+msgid "Update & Close"
+msgstr ""
+
+#. module: hr_photobooth
+#: model:ir.model,name:hr_photobooth.model_hr_employee_webcam
+msgid "Webcam Form"
+msgstr ""
diff --git a/hr_photobooth/models/__init__.py b/hr_photobooth/models/__init__.py
new file mode 100644
index 00000000..63ae93cc
--- /dev/null
+++ b/hr_photobooth/models/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import hr
diff --git a/hr_photobooth/models/hr.py b/hr_photobooth/models/hr.py
new file mode 100644
index 00000000..d592d703
--- /dev/null
+++ b/hr_photobooth/models/hr.py
@@ -0,0 +1,14 @@
+from odoo import fields, models
+
+
+class HrEmployeeWebcam(models.TransientModel):
+    _name = "hr.employee.webcam"
+    _description = "Webcam Form"
+
+    def _compute_employee(self):
+        eid = False
+        if self.env.context.get("active_id", False):
+            eid = self.env.context.get("active_id")
+        return eid
+
+    employee_id = fields.Many2one("hr.employee", "Employee", default=_compute_employee)
diff --git a/hr_photobooth/readme/CREDITS.rst b/hr_photobooth/readme/CREDITS.rst
new file mode 100644
index 00000000..47150bbd
--- /dev/null
+++ b/hr_photobooth/readme/CREDITS.rst
@@ -0,0 +1 @@
+Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/hr_photobooth/readme/DESCRIPTION.rst b/hr_photobooth/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..999d1b99
--- /dev/null
+++ b/hr_photobooth/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+Take an employee's picture using an attached webcam.
diff --git a/hr_photobooth/readme/ROADMAP.rst b/hr_photobooth/readme/ROADMAP.rst
new file mode 100644
index 00000000..fea737eb
--- /dev/null
+++ b/hr_photobooth/readme/ROADMAP.rst
@@ -0,0 +1 @@
+* Modern versions of web browsers allow access to the webcam only from SSL encrypted web sites.
diff --git a/hr_photobooth/readme/USAGE.rst b/hr_photobooth/readme/USAGE.rst
new file mode 100644
index 00000000..4dc8eb4e
--- /dev/null
+++ b/hr_photobooth/readme/USAGE.rst
@@ -0,0 +1 @@
+The photo booth can be accessed from the "Actions" menu of an employee record.
diff --git a/hr_photobooth/security/ir.model.access.csv b/hr_photobooth/security/ir.model.access.csv
new file mode 100644
index 00000000..88bf17c2
--- /dev/null
+++ b/hr_photobooth/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_employee_webcam,access_hr_employee_webcam,model_hr_employee_webcam,hr.group_hr_user,1,1,1,1
diff --git a/hr_photobooth/static/description/icon.png b/hr_photobooth/static/description/icon.png
new file mode 100644
index 00000000..3704f9cf
Binary files /dev/null and b/hr_photobooth/static/description/icon.png differ
diff --git a/hr_photobooth/static/description/index.html b/hr_photobooth/static/description/index.html
new file mode 100644
index 00000000..3fc7d727
--- /dev/null
+++ b/hr_photobooth/static/description/index.html
@@ -0,0 +1,426 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Photo Booth</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="photo-booth">
+<h1 class="title">Photo Booth</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:c6d0d4dac42173b8eb787ffc1e66fc3a61db0fbcb8a8451c3d3ef64004734f08
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/hr_photobooth"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<p>Take an employee’s picture using an attached webcam.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#usage" id="toc-entry-1">Usage</a></li>
+<li><a class="reference internal" href="#known-issues-roadmap" id="toc-entry-2">Known issues / Roadmap</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-3">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-4">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-5">Authors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-6">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-7">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="usage">
+<h1><a class="toc-backref" href="#toc-entry-1">Usage</a></h1>
+<p>The photo booth can be accessed from the “Actions” menu of an employee record.</p>
+</div>
+<div class="section" id="known-issues-roadmap">
+<h1><a class="toc-backref" href="#toc-entry-2">Known issues / Roadmap</a></h1>
+<ul class="simple">
+<li>Modern versions of web browsers allow access to the webcam only from SSL encrypted web sites.</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20hr_photobooth%0Aversion:%2014.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="#toc-entry-4">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-5">Authors</a></h2>
+<ul class="simple">
+<li>TREVI Software</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-6">Other credits</a></h2>
+<p>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</p>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/hr_photobooth">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/hr_photobooth/static/src/img/main_screenshot.png b/hr_photobooth/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/hr_photobooth/static/src/img/main_screenshot.png differ
diff --git a/hr_photobooth/static/src/js/webcam_widget.js b/hr_photobooth/static/src/js/webcam_widget.js
new file mode 100644
index 00000000..c06c3ef4
--- /dev/null
+++ b/hr_photobooth/static/src/js/webcam_widget.js
@@ -0,0 +1,116 @@
+/**
+ * Copyright 2021 TREVI Software <support@trevi.et>
+ * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+ *
+ */
+
+odoo.define("hr_photobooth.webcam_widget", function (require) {
+    "use strict";
+
+    const IMG_WIDTH = 320;
+    const IMG_HEIGHT = 240;
+    const framework = require("web.framework");
+    const rpc = require("web.rpc");
+    const Widget = require("web.Widget");
+    const widgetRegistry = require("web.widget_registry");
+
+    var WebcamWidget = Widget.extend({
+        template: "photo.action",
+        xmlDependencies: ["/hr_photobooth/static/src/xml/webcam_widget.xml"],
+        events: {
+            "click .webcam_snap": "onClickSnap",
+            "click .webcam_close": "onClickSaveClose",
+            "click .webcam_cancel": "onClickCancel",
+        },
+
+        /**
+         * @override
+         */
+        init: function (parent, record, nodeInfo) {
+            this._super.apply(this, arguments);
+            this.res_model = nodeInfo.attrs.dst_model;
+            this.res_field = nodeInfo.attrs.dst_field;
+            this.res_id = record.data.employee_id.res_id;
+            this.flagStream = false;
+        },
+
+        /**
+         * @override
+         */
+        start: function () {
+            var self = this;
+            var $video = this.$("video.webcam_video");
+
+            if (navigator.mediaDevices) {
+                navigator.mediaDevices
+                    .getUserMedia({video: true, audio: false})
+                    .then(function (mediaStream) {
+                        $video[0].srcObject = mediaStream;
+                        self.flagStream = true;
+                    })
+                    .catch(function (err) {
+                        console.log(err.name + " : " + err.message);
+                    });
+            }
+        },
+
+        onClickSnap: function (event) {
+            event.preventDefault();
+            event.stopPropagation();
+            var $video = this.$("video.webcam_video");
+            var $canvas = this.$("canvas.webcam_canvas");
+            var ctx = $canvas[0].getContext("2d");
+            ctx.drawImage($video[0], 0, 0, IMG_WIDTH, IMG_HEIGHT);
+            this.$(".webcam_close").removeAttr("disabled");
+        },
+
+        onClickSaveClose: function (event) {
+            event.preventDefault();
+            event.stopPropagation();
+            var $canvas = this.$("canvas.webcam_canvas");
+            var imgData = $canvas[0]
+                .toDataURL("image/png")
+                .replace(/^data:image\/(png|jpg);base64,/, "");
+
+            var $video = this.$("video.webcam_video");
+            var mediaStream = $video[0].srcObject;
+            var mediaTracks = mediaStream.getTracks();
+            for (var i = 0; i < mediaTracks.length; i++) {
+                mediaTracks[i].stop();
+            }
+            $video.srcObject = null;
+
+            const always = () => {
+                this.trigger_up("reload");
+                framework.unblockUI();
+                this.trigger_up("close_dialog");
+            };
+            framework.blockUI();
+            var vals = {};
+            vals[this.res_field] = imgData;
+            const rpcProm = rpc.query({
+                method: "write",
+                model: this.res_model,
+                args: [this.res_id, vals],
+            });
+            rpcProm.then(always).guardedCatch(always);
+            return rpcProm;
+        },
+
+        onClickCancel: function (event) {
+            event.preventDefault();
+            event.stopPropagation();
+            var $video = this.$("video.webcam_video");
+            var mediaStream = $video[0].srcObject;
+            var mediaTracks = mediaStream.getTracks();
+            for (var i = 0; i < mediaTracks.length; i++) {
+                mediaTracks[i].stop();
+            }
+            $video.srcObject = null;
+            this.trigger_up("close_dialog");
+        },
+    });
+
+    widgetRegistry.add("webcam_widget", WebcamWidget);
+    return WebcamWidget;
+});
diff --git a/hr_photobooth/static/src/xml/webcam_widget.xml b/hr_photobooth/static/src/xml/webcam_widget.xml
new file mode 100644
index 00000000..8a0d497c
--- /dev/null
+++ b/hr_photobooth/static/src/xml/webcam_widget.xml
@@ -0,0 +1,32 @@
+<templates>
+    <div t-name="photo.action" class="oe_hr_webcam oe_hr_webcam_stopped">
+        <div>
+            <div class="oe_inline">
+                <span class="oe_window_webcam">
+                    <video
+                        class="webcam_video"
+                        height="240"
+                        autoplay="true"
+                        muted="true"
+                    />
+                </span>
+
+                <span>
+                    <canvas class="webcam_canvas" width="320" height="240" />
+                </span>
+                <div text-align="center">
+                    <button
+                        class="btn btn-primary webcam_snap"
+                        icon="fa fa-camera"
+                    >Take Picture</button>
+                    | <button
+                        class="btn btn-primary webcam_close"
+                        icon="fa fa-disk"
+                        disabled="1"
+                    >Update &amp; Close</button>
+                    | <button class="btn btn-primary webcam_cancel">Cancel</button>
+                </div>
+            </div>
+        </div>
+    </div>
+</templates>
diff --git a/hr_photobooth/views/assets.xml b/hr_photobooth/views/assets.xml
new file mode 100644
index 00000000..98a1a61c
--- /dev/null
+++ b/hr_photobooth/views/assets.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <template
+        id="assets_backend"
+        name="hr_photobooth assets"
+        inherit_id="web.assets_backend"
+    >
+        <xpath expr="." position="inside">
+            <script
+                type="text/javascript"
+                src="/hr_photobooth/static/src/js/webcam_widget.js"
+            />
+        </xpath>
+    </template>
+</odoo>
diff --git a/hr_photobooth/views/hr_photobooth_view.xml b/hr_photobooth/views/hr_photobooth_view.xml
new file mode 100644
index 00000000..0422397e
--- /dev/null
+++ b/hr_photobooth/views/hr_photobooth_view.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+
+        <record id="view_webcam_form" model="ir.ui.view">
+            <field name="name">hr.employee.webcam.form</field>
+            <field name="model">hr.employee.webcam</field>
+            <field name="arch" type="xml">
+                <form string="Employee Webcam Dialog">
+                    <group>
+                        <field name="employee_id" nolabel="1" invisible="1" />
+                    </group>
+                    <newline />
+                    <group>
+                        <widget
+                        name="webcam_widget"
+                        dst_model="hr.employee"
+                        dst_field="image_1920"
+                    />
+                    </group>
+                    <footer />
+                </form>
+            </field>
+        </record>
+        <record id="action_open_webcam_form" model="ir.actions.act_window">
+            <field name="name">Photo Booth</field>
+            <field name="res_model">hr.employee.webcam</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            <field name="binding_model_id" ref="hr.model_hr_employee" />
+            <field name="groups_id" eval="[(4, ref('hr.group_hr_user'))]" />
+            <field name="binding_view_types">form</field>
+        </record>
+
+</odoo>
diff --git a/payroll_default_salary_rules/README.rst b/payroll_default_salary_rules/README.rst
new file mode 100644
index 00000000..577f7868
--- /dev/null
+++ b/payroll_default_salary_rules/README.rst
@@ -0,0 +1,66 @@
+===================================
+Default Salary Rules and Categories
+===================================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:e2f70281a747e5f13b5ebe99a6d0d84ee1821fd9134c5f474f11e4a1c84fa4ec
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_default_salary_rules
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+This module defines a default set of salary rule and category code settings that can be used by an
+administrator to specify the codes of often used rules and categories. Developers can then rely on
+the codes configured in those settings to develop their modules regardless of the actual codes
+used by the administrator.  Salary rule categories modeled after these settings are made available.
+Additionaly a very basic set of salary rules that are essential to correct payslip calculations
+are included.
+In addition this module allows salary rule categories to be archived.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_default_salary_rules%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+
+Other credits
+~~~~~~~~~~~~~
+
+* Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_default_salary_rules>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/payroll_default_salary_rules/__init__.py b/payroll_default_salary_rules/__init__.py
new file mode 100644
index 00000000..4e124ccb
--- /dev/null
+++ b/payroll_default_salary_rules/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
diff --git a/payroll_default_salary_rules/__manifest__.py b/payroll_default_salary_rules/__manifest__.py
new file mode 100644
index 00000000..7f74dda3
--- /dev/null
+++ b/payroll_default_salary_rules/__manifest__.py
@@ -0,0 +1,23 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Default Salary Rules and Categories",
+    "summary": "Default set of salary rules and categories.",
+    "version": "15.0.1.0.0",
+    "category": "Payroll",
+    "images": ["static/src/img/main_screenshot.png"],
+    "author": "TREVI Software",
+    "license": "AGPL-3",
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "payroll",
+    ],
+    "data": [
+        "data/default_salary_data.xml",
+        "views/res_config_settings_views.xml",
+        "views/hr_salary_rule_category_views.xml",
+    ],
+    "demo": [],
+    "installable": True,
+}
diff --git a/payroll_default_salary_rules/data/default_salary_data.xml b/payroll_default_salary_rules/data/default_salary_data.xml
new file mode 100644
index 00000000..4ca65093
--- /dev/null
+++ b/payroll_default_salary_rules/data/default_salary_data.xml
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data noupdate="1">
+
+        <!-- Rule Codes -->
+        <function
+            model="ir.config_parameter"
+            name="set_param"
+            eval="('payroll_default_salary_rules.rule_gross', 'GRS')"
+        />
+        <function
+            model="ir.config_parameter"
+            name="set_param"
+            eval="('payroll_default_salary_rules.rule_net', 'NET')"
+        />
+
+        <!-- Category Codes -->
+        <function
+            model="ir.config_parameter"
+            name="set_param"
+            eval="('payroll_default_salary_rules.categ_gross', 'GROSS')"
+        />
+        <function
+            model="ir.config_parameter"
+            name="set_param"
+            eval="('payroll_default_salary_rules.categ_net', 'NET')"
+        />
+        <function
+            model="ir.config_parameter"
+            name="set_param"
+            eval="('payroll_default_salary_rules.categ_info', 'INFO')"
+        />
+        <function
+            model="ir.config_parameter"
+            name="set_param"
+            eval="('payroll_default_salary_rules.categ_basic', 'BASIC')"
+        />
+        <function
+            model="ir.config_parameter"
+            name="set_param"
+            eval="('payroll_default_salary_rules.categ_ot', 'OVERTM')"
+        />
+        <function
+            model="ir.config_parameter"
+            name="set_param"
+            eval="('payroll_default_salary_rules.categ_allowance', 'ALLWNC')"
+        />
+        <function
+            model="ir.config_parameter"
+            name="set_param"
+            eval="('payroll_default_salary_rules.categ_deduction', 'DEDUCT')"
+        />
+        <function
+            model="ir.config_parameter"
+            name="set_param"
+            eval="('payroll_default_salary_rules.categ_taxexempt', 'TAXEXT')"
+        />
+        <function
+            model="ir.config_parameter"
+            name="set_param"
+            eval="('payroll_default_salary_rules.categ_taxable', 'TAXBLE')"
+        />
+        <function
+            model="ir.config_parameter"
+            name="set_param"
+            eval="('payroll_default_salary_rules.categ_payroll_tax_ee', 'PRLTAX')"
+        />
+        <function
+            model="ir.config_parameter"
+            name="set_param"
+            eval="('payroll_default_salary_rules.categ_payroll_tax_er', 'ERPTAX')"
+        />
+        <function
+            model="ir.config_parameter"
+            name="set_param"
+            eval="('payroll_default_salary_rules.categ_income_tax', 'INCTAX')"
+        />
+        <function
+            model="ir.config_parameter"
+            name="set_param"
+            eval="('payroll_default_salary_rules.categ_ee_contribution', 'EECONT')"
+        />
+        <function
+            model="ir.config_parameter"
+            name="set_param"
+            eval="('payroll_default_salary_rules.categ_er_contribution', 'ERCONT')"
+        />
+
+    </data>
+
+    <data noupdate="1">
+
+        <!-- Salary Rule Categories -->
+        <record id="INFO" model="hr.salary.rule.category">
+            <field name="name">Informational</field>
+            <field name="code">INFO</field>
+        </record>
+        <record id="BASIC" model="hr.salary.rule.category">
+            <field name="name">Basic</field>
+            <field name="code">BASIC</field>
+        </record>
+        <record id="OVERTM" model="hr.salary.rule.category">
+            <field name="name">Overtime</field>
+            <field name="code">OVERTM</field>
+        </record>
+        <record id="ALLWNC" model="hr.salary.rule.category">
+            <field name="name">Allowance</field>
+            <field name="code">ALLWNC</field>
+        </record>
+        <record id="TAXEXT" model="hr.salary.rule.category">
+            <field name="name">Tax-exempt Earnings</field>
+            <field name="code">TAXEXT</field>
+        </record>
+        <record id="TAXBLE" model="hr.salary.rule.category">
+            <field name="name">Taxable Gross Earnings</field>
+            <field name="code">TAXBLE</field>
+        </record>
+        <record id="GROSS" model="hr.salary.rule.category">
+            <field name="name">Gross Earnings</field>
+            <field name="code">GROSS</field>
+        </record>
+        <record id="PRLTAX" model="hr.salary.rule.category">
+            <field name="name">Payroll Taxes EE</field>
+            <field name="code">PRLTAX</field>
+        </record>
+        <record id="ERPTAX" model="hr.salary.rule.category">
+            <field name="name">Payroll Taxes ER</field>
+            <field name="code">ERPTAX</field>
+        </record>
+        <record id="INCTAX" model="hr.salary.rule.category">
+            <field name="name">Income Taxes</field>
+            <field name="code">INCTAX</field>
+        </record>
+        <record id="EECONT" model="hr.salary.rule.category">
+            <field name="name">Employee Contributions</field>
+            <field name="code">EECONT</field>
+        </record>
+        <record id="ERCONT" model="hr.salary.rule.category">
+            <field name="name">Employer Contributions</field>
+            <field name="code">ERCONT</field>
+        </record>
+        <record id="DEDUCT" model="hr.salary.rule.category">
+            <field name="name">Deduction</field>
+            <field name="code">DEDUCT</field>
+        </record>
+        <record id="NET" model="hr.salary.rule.category">
+            <field name="name">Net Earnings</field>
+            <field name="code">NET</field>
+        </record>
+
+        <!-- Salary Rules -->
+        <record id="rule_taxable_gross" model="hr.salary.rule">
+            <field name="name">Taxable Earnings</field>
+            <field name="sequence" eval="93" />
+            <field name="code">TXB</field>
+            <field name="category_id" ref="payroll_default_salary_rules.TAXBLE" />
+            <field name="condition_select">none</field>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">
+result = categories.BASIC + categories.OVERTM + categories.ALLWNC - categories.TAXEXT
+            </field>
+        </record>
+        <record id="rule_estimated_monthly_gross" model="hr.salary.rule">
+            <field name="name">Estimated Monthly Taxable Earnings</field>
+            <field name="sequence" eval="95" />
+            <field name="code">EMT</field>
+            <field name="category_id" ref="payroll_default_salary_rules.INFO" />
+            <field name="condition_select">none</field>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">
+result = payroll.contracts.count == 1 and categories.TAXBLE or (categories.TAXBLE / current_contract.ppf)
+            </field>
+        </record>
+        <record id="rule_gross" model="hr.salary.rule">
+            <field name="name">Gross Earnings</field>
+            <field name="sequence" eval="100" />
+            <field name="code">GRS</field>
+            <field name="category_id" ref="payroll_default_salary_rules.GROSS" />
+            <field name="condition_select">none</field>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">
+result = categories.BASIC + categories.OVERTM + categories.ALLWNC + categories.TAXEXT
+            </field>
+        </record>
+        <record id="rule_net" model="hr.salary.rule">
+            <field name="name">Net Earnings</field>
+            <field name="sequence" eval="200" />
+            <field name="code">NET</field>
+            <field name="category_id" ref="payroll_default_salary_rules.NET" />
+            <field name="condition_select">none</field>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">
+result = categories.GROSS - categories.PRLTAX - categories.INCTAX - categories.EECONT - categories.DEDUCT
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/payroll_default_salary_rules/i18n/payroll_default_salary_rules.pot b/payroll_default_salary_rules/i18n/payroll_default_salary_rules.pot
new file mode 100644
index 00000000..02cfc0a4
--- /dev/null
+++ b/payroll_default_salary_rules/i18n/payroll_default_salary_rules.pot
@@ -0,0 +1,325 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* payroll_default_salary_rules
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: payroll_default_salary_rules
+#: model:hr.salary.rule.category,name:payroll_default_salary_rules.ALLWNC
+msgid "Allowance"
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model:ir.model.fields,field_description:payroll_default_salary_rules.field_res_config_settings__categ_allowance
+msgid "Allowance Categ."
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model:hr.salary.rule.category,name:payroll_default_salary_rules.BASIC
+msgid "Basic"
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model:ir.model.fields,field_description:payroll_default_salary_rules.field_res_config_settings__categ_basic
+msgid "Basic Categ."
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model:ir.model,name:payroll_default_salary_rules.model_res_config_settings
+msgid "Config Settings"
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model:hr.salary.rule.category,name:payroll_default_salary_rules.DEDUCT
+msgid "Deduction"
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model:ir.model.fields,field_description:payroll_default_salary_rules.field_res_config_settings__categ_deduction
+msgid "Deduction Categ."
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model:ir.model.fields,field_description:payroll_default_salary_rules.field_res_config_settings__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model:ir.model.fields,field_description:payroll_default_salary_rules.field_res_config_settings__categ_payroll_tax_ee
+msgid "EE Payroll Tax Categ."
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model:ir.model.fields,field_description:payroll_default_salary_rules.field_res_config_settings__categ_payroll_tax_er
+msgid "ER Payroll Tax Categ."
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model:ir.model.fields,field_description:payroll_default_salary_rules.field_res_config_settings__categ_ee_contribution
+msgid "Employee Contribution Categ."
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model:hr.salary.rule.category,name:payroll_default_salary_rules.EECONT
+msgid "Employee Contributions"
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model:ir.model.fields,field_description:payroll_default_salary_rules.field_res_config_settings__categ_er_contribution
+msgid "Employer Contribution Categ."
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model:hr.salary.rule.category,name:payroll_default_salary_rules.ERCONT
+msgid "Employer Contributions"
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model:hr.salary.rule,name:payroll_default_salary_rules.rule_estimated_monthly_gross
+msgid "Estimated Monthly Taxable Earnings"
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model:ir.model.fields,field_description:payroll_default_salary_rules.field_res_config_settings__categ_gross
+msgid "Gross Categ."
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model:hr.salary.rule,name:payroll_default_salary_rules.rule_gross
+#: model:hr.salary.rule.category,name:payroll_default_salary_rules.GROSS
+msgid "Gross Earnings"
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model:ir.model.fields,field_description:payroll_default_salary_rules.field_res_config_settings__rule_gross
+msgid "Gross Rule"
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model_terms:ir.ui.view,arch_db:payroll_default_salary_rules.res_config_settings_view_form
+msgid ""
+"Gross earnings payslip line. For use in cases\n"
+"                                    where the employee's gross earnings are\n"
+"                                    calculated on a single payslip line. It is always\n"
+"                                    better to use the sum of the Gross Earnings\n"
+"                                    category for calculations."
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model_terms:ir.ui.view,arch_db:payroll_default_salary_rules.res_config_settings_view_form
+msgid ""
+"Gross earnings. Payslip lines that calculate the\n"
+"                                    employee's total earnings, including tax-exempt\n"
+"                                    lines."
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model_terms:ir.ui.view,arch_db:payroll_default_salary_rules.res_config_settings_view_form
+msgid ""
+"Gross taxable. Payslip lines calculating the\n"
+"                                    portion of the employee's earnings that are\n"
+"                                    taxable."
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model:ir.model.fields,field_description:payroll_default_salary_rules.field_res_config_settings__id
+msgid "ID"
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model:ir.model.fields,field_description:payroll_default_salary_rules.field_res_config_settings__categ_income_tax
+msgid "Income Tax Categ."
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model:hr.salary.rule.category,name:payroll_default_salary_rules.INCTAX
+msgid "Income Taxes"
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model_terms:ir.ui.view,arch_db:payroll_default_salary_rules.res_config_settings_view_form
+msgid ""
+"Income tax deductions. Deducted from the employee\n"
+"                                    and used to fund the general government."
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model:hr.salary.rule.category,name:payroll_default_salary_rules.INFO
+msgid "Informational"
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model:ir.model.fields,field_description:payroll_default_salary_rules.field_res_config_settings__categ_info
+msgid "Informational Categ."
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model_terms:ir.ui.view,arch_db:payroll_default_salary_rules.res_config_settings_view_form
+msgid ""
+"Informational payslip lines that may be\n"
+"                                    indirectly used in other lines, but don't\n"
+"                                    have a direct effect on the payslip."
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model:ir.model.fields,field_description:payroll_default_salary_rules.field_res_config_settings____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model:ir.model.fields,field_description:payroll_default_salary_rules.field_res_config_settings__categ_net
+msgid "Net Categ."
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model:hr.salary.rule,name:payroll_default_salary_rules.rule_net
+#: model:hr.salary.rule.category,name:payroll_default_salary_rules.NET
+msgid "Net Earnings"
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model:ir.model.fields,field_description:payroll_default_salary_rules.field_res_config_settings__rule_net
+msgid "Net Rule"
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model_terms:ir.ui.view,arch_db:payroll_default_salary_rules.res_config_settings_view_form
+msgid ""
+"Net earnings payslip line. Useful in cases where\n"
+"                                    the employee's net earnings are calculated on a\n"
+"                                    single payslip line. It is always better to use\n"
+"                                    the sum of the Net Earnings category for\n"
+"                                    calculations."
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model_terms:ir.ui.view,arch_db:payroll_default_salary_rules.res_config_settings_view_form
+msgid ""
+"Net earnings. Payslip lines calculating the,\n"
+"                                    total take-home pay of the payslip."
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model:ir.model.fields,field_description:payroll_default_salary_rules.field_res_config_settings__categ_ot
+msgid "OT Categ."
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model:hr.salary.rule.category,name:payroll_default_salary_rules.OVERTM
+msgid "Overtime"
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model_terms:ir.ui.view,arch_db:payroll_default_salary_rules.res_config_settings_view_form
+msgid "Payroll Codes"
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model:hr.salary.rule.category,name:payroll_default_salary_rules.PRLTAX
+msgid "Payroll Taxes EE"
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model:hr.salary.rule.category,name:payroll_default_salary_rules.ERPTAX
+msgid "Payroll Taxes ER"
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model_terms:ir.ui.view,arch_db:payroll_default_salary_rules.res_config_settings_view_form
+msgid ""
+"Payroll tax contributions from the employer. Does\n"
+"                                    not necessarily have an employEE counterpart."
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model_terms:ir.ui.view,arch_db:payroll_default_salary_rules.res_config_settings_view_form
+msgid ""
+"Payroll tax deductions. Deducted from the\n"
+"                                    employee and usually used to fund social programs."
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model_terms:ir.ui.view,arch_db:payroll_default_salary_rules.res_config_settings_view_form
+msgid ""
+"Payslip lines calculating the portion of\n"
+"                                    the employees earnings that are not taxable."
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model_terms:ir.ui.view,arch_db:payroll_default_salary_rules.res_config_settings_view_form
+msgid ""
+"Payslip lines deducted from the employee after\n"
+"                                    taxes and not including employee contributions."
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model_terms:ir.ui.view,arch_db:payroll_default_salary_rules.res_config_settings_view_form
+msgid ""
+"Payslip lines deducted from the employee for\n"
+"                                    the purposes of a current or future benefit.\n"
+"                                    Does not include payroll taxes."
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model_terms:ir.ui.view,arch_db:payroll_default_salary_rules.res_config_settings_view_form
+msgid ""
+"Payslip lines deducted from the employer for\n"
+"                                    the purposes of a current or future benefit to\n"
+"                                    the employee. Does not include payroll taxes."
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model_terms:ir.ui.view,arch_db:payroll_default_salary_rules.res_config_settings_view_form
+msgid ""
+"Payslip lines used for extra payments to\n"
+"                                    the employee, other than basic salary and\n"
+"                                    overtime."
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model_terms:ir.ui.view,arch_db:payroll_default_salary_rules.res_config_settings_view_form
+msgid ""
+"Payslip lines used to build the employee's\n"
+"                                    basic salary."
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model_terms:ir.ui.view,arch_db:payroll_default_salary_rules.res_config_settings_view_form
+msgid ""
+"Payslip lines used to build the employee's\n"
+"                                    overtime payment."
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model:ir.model.fields,field_description:payroll_default_salary_rules.field_res_config_settings__categ_taxexempt
+msgid "Tax Exempt Categ."
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model:hr.salary.rule.category,name:payroll_default_salary_rules.TAXEXT
+msgid "Tax-exempt Earnings"
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model:hr.salary.rule,name:payroll_default_salary_rules.rule_taxable_gross
+msgid "Taxable Earnings"
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model:ir.model.fields,field_description:payroll_default_salary_rules.field_res_config_settings__categ_taxable
+msgid "Taxable Gross Categ."
+msgstr ""
+
+#. module: payroll_default_salary_rules
+#: model:hr.salary.rule.category,name:payroll_default_salary_rules.TAXBLE
+msgid "Taxable Gross Earnings"
+msgstr ""
diff --git a/payroll_default_salary_rules/models/__init__.py b/payroll_default_salary_rules/models/__init__.py
new file mode 100644
index 00000000..f379430a
--- /dev/null
+++ b/payroll_default_salary_rules/models/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import hr_salary_rule_category
+from . import res_config_settings
diff --git a/payroll_default_salary_rules/models/hr_salary_rule_category.py b/payroll_default_salary_rules/models/hr_salary_rule_category.py
new file mode 100644
index 00000000..b6e9fac0
--- /dev/null
+++ b/payroll_default_salary_rules/models/hr_salary_rule_category.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 SalaryRuleCategory(models.Model):
+    _inherit = "hr.salary.rule.category"
+
+    active = fields.Boolean(default=True)
diff --git a/payroll_default_salary_rules/models/res_config_settings.py b/payroll_default_salary_rules/models/res_config_settings.py
new file mode 100644
index 00000000..ab82c775
--- /dev/null
+++ b/payroll_default_salary_rules/models/res_config_settings.py
@@ -0,0 +1,84 @@
+# 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 ResConfigSettings(models.TransientModel):
+    _inherit = "res.config.settings"
+
+    categ_info = fields.Char(
+        string="Informational Categ.",
+        config_parameter="payroll_default_salary_rules.categ_info",
+    )
+
+    categ_ee_contribution = fields.Char(
+        string="Employee Contribution Categ.",
+        config_parameter="payroll_default_salary_rules.categ_ee_contribution",
+    )
+
+    categ_er_contribution = fields.Char(
+        string="Employer Contribution Categ.",
+        config_parameter="payroll_default_salary_rules.categ_er_contribution",
+    )
+
+    categ_basic = fields.Char(
+        string="Basic Categ.",
+        config_parameter="payroll_default_salary_rules.categ_basic",
+    )
+
+    categ_ot = fields.Char(
+        string="OT Categ.", config_parameter="payroll_default_salary_rules.categ_ot"
+    )
+
+    categ_allowance = fields.Char(
+        string="Allowance Categ.",
+        config_parameter="payroll_default_salary_rules.categ_allowance",
+    )
+
+    categ_taxexempt = fields.Char(
+        string="Tax Exempt Categ.",
+        config_parameter="payroll_default_salary_rules.categ_taxexempt",
+    )
+
+    categ_taxable = fields.Char(
+        string="Taxable Gross Categ.",
+        config_parameter="payroll_default_salary_rules.categ_taxable",
+    )
+
+    categ_gross = fields.Char(
+        string="Gross Categ.",
+        config_parameter="payroll_default_salary_rules.categ_gross",
+    )
+
+    categ_payroll_tax_ee = fields.Char(
+        string="EE Payroll Tax Categ.",
+        config_parameter="payroll_default_salary_rules.categ_payroll_tax_ee",
+    )
+
+    categ_payroll_tax_er = fields.Char(
+        string="ER Payroll Tax Categ.",
+        config_parameter="payroll_default_salary_rules.categ_payroll_tax_er",
+    )
+
+    categ_income_tax = fields.Char(
+        string="Income Tax Categ.",
+        config_parameter="payroll_default_salary_rules.categ_income_tax",
+    )
+
+    categ_deduction = fields.Char(
+        string="Deduction Categ.",
+        config_parameter="payroll_default_salary_rules.categ_deduction",
+    )
+
+    categ_net = fields.Char(
+        string="Net Categ.", config_parameter="payroll_default_salary_rules.categ_net"
+    )
+
+    rule_gross = fields.Char(
+        string="Gross Rule", config_parameter="payroll_default_salary_rules.rule_gross"
+    )
+
+    rule_net = fields.Char(
+        string="Net Rule", config_parameter="payroll_default_salary_rules.rule_net"
+    )
diff --git a/payroll_default_salary_rules/readme/CREDITS.rst b/payroll_default_salary_rules/readme/CREDITS.rst
new file mode 100644
index 00000000..d264bc7e
--- /dev/null
+++ b/payroll_default_salary_rules/readme/CREDITS.rst
@@ -0,0 +1 @@
+* Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/payroll_default_salary_rules/readme/DESCRIPTION.rst b/payroll_default_salary_rules/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..63408f3d
--- /dev/null
+++ b/payroll_default_salary_rules/readme/DESCRIPTION.rst
@@ -0,0 +1,7 @@
+This module defines a default set of salary rule and category code settings that can be used by an
+administrator to specify the codes of often used rules and categories. Developers can then rely on
+the codes configured in those settings to develop their modules regardless of the actual codes
+used by the administrator.  Salary rule categories modeled after these settings are made available.
+Additionaly a very basic set of salary rules that are essential to correct payslip calculations
+are included.
+In addition this module allows salary rule categories to be archived.
diff --git a/payroll_default_salary_rules/static/description/icon.png b/payroll_default_salary_rules/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/payroll_default_salary_rules/static/description/icon.png differ
diff --git a/payroll_default_salary_rules/static/description/index.html b/payroll_default_salary_rules/static/description/index.html
new file mode 100644
index 00000000..7ea7ca8c
--- /dev/null
+++ b/payroll_default_salary_rules/static/description/index.html
@@ -0,0 +1,422 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Default Salary Rules and Categories</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="default-salary-rules-and-categories">
+<h1 class="title">Default Salary Rules and Categories</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:e2f70281a747e5f13b5ebe99a6d0d84ee1821fd9134c5f474f11e4a1c84fa4ec
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_default_salary_rules"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<p>This module defines a default set of salary rule and category code settings that can be used by an
+administrator to specify the codes of often used rules and categories. Developers can then rely on
+the codes configured in those settings to develop their modules regardless of the actual codes
+used by the administrator.  Salary rule categories modeled after these settings are made available.
+Additionaly a very basic set of salary rules that are essential to correct payslip calculations
+are included.
+In addition this module allows salary rule categories to be archived.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-4">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_default_salary_rules%0Aversion:%2014.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="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>TREVI Software</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-4">Other credits</a></h2>
+<ul class="simple">
+<li>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_default_salary_rules">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/payroll_default_salary_rules/static/src/img/main_screenshot.png b/payroll_default_salary_rules/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/payroll_default_salary_rules/static/src/img/main_screenshot.png differ
diff --git a/payroll_default_salary_rules/views/hr_salary_rule_category_views.xml b/payroll_default_salary_rules/views/hr_salary_rule_category_views.xml
new file mode 100644
index 00000000..374810a9
--- /dev/null
+++ b/payroll_default_salary_rules/views/hr_salary_rule_category_views.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="hr_salary_rule_category_view_search" model="ir.ui.view">
+        <field
+            name="name"
+        >hr.salary.rule.category.search.inherit.payroll_default_salary_rules</field>
+        <field name="model">hr.salary.rule.category</field>
+        <field name="inherit_id" ref="payroll.hr_salary_rule_category_view_search" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='name']" position="after">
+                <filter
+                    name="archived"
+                    string="Archived"
+                    domain="[('active','=',False)]"
+                />
+            </xpath>
+        </field>
+    </record>
+
+    <record id="hr_salary_rule_category_view_form" model="ir.ui.view">
+        <field
+            name="name"
+        >hr.salary.rule.category.form.inherit.payroll_default_salary_rules</field>
+        <field name="model">hr.salary.rule.category</field>
+        <field name="inherit_id" ref="payroll.hr_salary_rule_category_view_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//label[@for='name']" position="after">
+                <widget
+                    name="web_ribbon"
+                    title="Archived"
+                    bg_color="bg-danger"
+                    attrs="{'invisible': [('active', '=', True)]}"
+                />
+            </xpath>
+            <xpath expr="//field[@name='parent_id']" position="after">
+                <field name="active" widget="boolean_toggle" />
+            </xpath>
+        </field>
+    </record>
+
+    <record id="hr_salary_rule_category_tree" model="ir.ui.view">
+        <field
+            name="name"
+        >hr.salary.rule.category.tree.inherit.payroll_default_salary_rules</field>
+        <field name="model">hr.salary.rule.category</field>
+        <field name="inherit_id" ref="payroll.hr_salary_rule_category_view_tree" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='parent_id']" position="after">
+                <field name="active" widget="boolean_toggle" />
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/payroll_default_salary_rules/views/res_config_settings_views.xml b/payroll_default_salary_rules/views/res_config_settings_views.xml
new file mode 100644
index 00000000..3cfeab04
--- /dev/null
+++ b/payroll_default_salary_rules/views/res_config_settings_views.xml
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field
+            name="name"
+        >res.config.settings.view.form.inherit.salary_codes_default</field>
+        <field name="model">res.config.settings</field>
+        <field name="priority" eval="80" />
+        <field name="inherit_id" ref="payroll.res_config_settings_view_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//div[@data-key='payroll']" position="inside">
+                <h2>Payroll Codes</h2>
+                <div
+                    class="row mt16 o_settings_container"
+                    name="salary_codes_container"
+                >
+                    <div class="col-12 col-lg-6 o_setting_box" id="categ_info">
+                        <div class="o_setting_left_pane" />
+                        <div class="o_setting_right_pane">
+                            <label for="categ_info" />
+                            <field name="categ_info" />
+                            <div class="text-muted">
+                                    Informational payslip lines that may be
+                                    indirectly used in other lines, but don't
+                                    have a direct effect on the payslip.
+                            </div>
+                        </div>
+                    </div>
+                    <div
+                        class="col-12 col-lg-6 o_setting_box"
+                        id="categ_ee_contribution"
+                    >
+                        <div class="o_setting_left_pane" />
+                        <div class="o_setting_right_pane">
+                            <label for="categ_ee_contribution" />
+                            <field name="categ_ee_contribution" />
+                            <div class="text-muted">
+                                    Payslip lines deducted from the employee for
+                                    the purposes of a current or future benefit.
+                                    Does not include payroll taxes.
+                            </div>
+                        </div>
+                    </div>
+                    <div
+                        class="col-12 col-lg-6 o_setting_box"
+                        id="categ_er_contribution"
+                    >
+                        <div class="o_setting_left_pane" />
+                        <div class="o_setting_right_pane">
+                            <label for="categ_er_contribution" />
+                            <field name="categ_er_contribution" />
+                            <div class="text-muted">
+                                    Payslip lines deducted from the employer for
+                                    the purposes of a current or future benefit to
+                                    the employee. Does not include payroll taxes.
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-12 col-lg-6 o_setting_box" id="categ_basic">
+                        <div class="o_setting_left_pane" />
+                        <div class="o_setting_right_pane">
+                            <label for="categ_basic" />
+                            <field name="categ_basic" />
+                            <div class="text-muted">
+                                    Payslip lines used to build the employee's
+                                    basic salary.
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-12 col-lg-6 o_setting_box" id="categ_ot">
+                        <div class="o_setting_left_pane" />
+                        <div class="o_setting_right_pane">
+                            <label for="categ_ot" />
+                            <field name="categ_ot" />
+                            <div class="text-muted">
+                                    Payslip lines used to build the employee's
+                                    overtime payment.
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-12 col-lg-6 o_setting_box" id="categ_allowance">
+                        <div class="o_setting_left_pane" />
+                        <div class="o_setting_right_pane">
+                            <label for="categ_allowance" />
+                            <field name="categ_allowance" />
+                            <div class="text-muted">
+                                    Payslip lines used for extra payments to
+                                    the employee, other than basic salary and
+                                    overtime.
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-12 col-lg-6 o_setting_box" id="categ_deduction">
+                        <div class="o_setting_left_pane" />
+                        <div class="o_setting_right_pane">
+                            <label for="categ_deduction" />
+                            <field name="categ_deduction" />
+                            <div class="text-muted">
+                                    Payslip lines deducted from the employee after
+                                    taxes and not including employee contributions.
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-12 col-lg-6 o_setting_box" id="categ_taxexempt">
+                        <div class="o_setting_left_pane" />
+                        <div class="o_setting_right_pane">
+                            <label for="categ_taxexempt" />
+                            <field name="categ_taxexempt" />
+                            <div class="text-muted">
+                                    Payslip lines calculating the portion of
+                                    the employees earnings that are not taxable.
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-12 col-lg-6 o_setting_box" id="categ_taxable">
+                        <div class="o_setting_left_pane" />
+                        <div class="o_setting_right_pane">
+                            <label for="categ_taxable" />
+                            <field name="categ_taxable" />
+                            <div class="text-muted">
+                                    Gross taxable. Payslip lines calculating the
+                                    portion of the employee's earnings that are
+                                    taxable.
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-12 col-lg-6 o_setting_box" id="categ_gross">
+                        <div class="o_setting_left_pane" />
+                        <div class="o_setting_right_pane">
+                            <label for="categ_gross" />
+                            <field name="categ_gross" />
+                            <div class="text-muted">
+                                    Gross earnings. Payslip lines that calculate the
+                                    employee's total earnings, including tax-exempt
+                                    lines.
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-12 col-lg-6 o_setting_box" id="categ_net">
+                        <div class="o_setting_left_pane" />
+                        <div class="o_setting_right_pane">
+                            <label for="categ_net" />
+                            <field name="categ_net" />
+                            <div class="text-muted">
+                                    Net earnings. Payslip lines calculating the,
+                                    total take-home pay of the payslip.
+                            </div>
+                        </div>
+                    </div>
+                    <div
+                        class="col-12 col-lg-6 o_setting_box"
+                        id="categ_payroll_tax_ee"
+                    >
+                        <div class="o_setting_left_pane" />
+                        <div class="o_setting_right_pane">
+                            <label for="categ_payroll_tax_ee" />
+                            <field name="categ_payroll_tax_ee" />
+                            <div class="text-muted">
+                                    Payroll tax deductions. Deducted from the
+                                    employee and usually used to fund social programs.
+                            </div>
+                        </div>
+                    </div>
+                    <div
+                        class="col-12 col-lg-6 o_setting_box"
+                        id="categ_payroll_tax_er"
+                    >
+                        <div class="o_setting_left_pane" />
+                        <div class="o_setting_right_pane">
+                            <label for="categ_payroll_tax_er" />
+                            <field name="categ_payroll_tax_er" />
+                            <div class="text-muted">
+                                    Payroll tax contributions from the employer. Does
+                                    not necessarily have an employEE counterpart.
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-12 col-lg-6 o_setting_box" id="categ_income_tax">
+                        <div class="o_setting_left_pane" />
+                        <div class="o_setting_right_pane">
+                            <label for="categ_income_tax" />
+                            <field name="categ_income_tax" />
+                            <div class="text-muted">
+                                    Income tax deductions. Deducted from the employee
+                                    and used to fund the general government.
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-12 col-lg-6 o_setting_box" id="rule_gross">
+                        <div class="o_setting_left_pane" />
+                        <div class="o_setting_right_pane">
+                            <label for="rule_gross" />
+                            <field name="rule_gross" />
+                            <div class="text-muted">
+                                    Gross earnings payslip line. For use in cases
+                                    where the employee's gross earnings are
+                                    calculated on a single payslip line. It is always
+                                    better to use the sum of the Gross Earnings
+                                    category for calculations.
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-12 col-lg-6 o_setting_box" id="rule_net">
+                        <div class="o_setting_left_pane" />
+                        <div class="o_setting_right_pane">
+                            <label for="rule_net" />
+                            <field name="rule_net" />
+                            <div class="text-muted">
+                                    Net earnings payslip line. Useful in cases where
+                                    the employee's net earnings are calculated on a
+                                    single payslip line. It is always better to use
+                                    the sum of the Net Earnings category for
+                                    calculations.
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/payroll_operating_unit/README.rst b/payroll_operating_unit/README.rst
new file mode 100644
index 00000000..ed6e81a8
--- /dev/null
+++ b/payroll_operating_unit/README.rst
@@ -0,0 +1,61 @@
+===================================
+DO NOT USE - Payroll Operating Unit
+===================================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:a03e290cf47cbebc2143f37c3ac6069a7f5d91e3226486e096b83653452cbe95
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_operating_unit
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+This module sets the operating unit on a payslip based on the operating of the employee's contract. If the
+employee has multiple contracts in the payslip it will use the first contract.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_operating_unit%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+
+Other credits
+~~~~~~~~~~~~~
+
+* Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_operating_unit>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/payroll_operating_unit/__init__.py b/payroll_operating_unit/__init__.py
new file mode 100644
index 00000000..4e124ccb
--- /dev/null
+++ b/payroll_operating_unit/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
diff --git a/payroll_operating_unit/__manifest__.py b/payroll_operating_unit/__manifest__.py
new file mode 100644
index 00000000..082484e0
--- /dev/null
+++ b/payroll_operating_unit/__manifest__.py
@@ -0,0 +1,26 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "DO NOT USE - Payroll Operating Unit",
+    "summary": "WARNING-this module will be removed.",
+    "version": "15.0.1.0.0",
+    "category": "Payroll",
+    "images": ["static/src/img/main_screenshot.png"],
+    "author": "TREVI Software, Odoo Community Association (OCA)",
+    "license": "AGPL-3",
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "hr_contract_operating_unit",
+        "hr_operating_unit",
+        "operating_unit",
+        "payroll",
+        # XXX - This is to prevent Odoo's App store bot from picking this up
+        "hr_holidays_public",
+    ],
+    "data": [
+        "security/hr_payslip_security.xml",
+        "views/hr_payslip_view.xml",
+    ],
+    "installable": True,
+}
diff --git a/payroll_operating_unit/i18n/payroll_operating_unit.pot b/payroll_operating_unit/i18n/payroll_operating_unit.pot
new file mode 100644
index 00000000..1889fe3d
--- /dev/null
+++ b/payroll_operating_unit/i18n/payroll_operating_unit.pot
@@ -0,0 +1,40 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* payroll_operating_unit
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: payroll_operating_unit
+#: model:ir.model.fields,field_description:payroll_operating_unit.field_hr_payslip__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: payroll_operating_unit
+#: model:ir.model.fields,field_description:payroll_operating_unit.field_hr_payslip__id
+msgid "ID"
+msgstr ""
+
+#. module: payroll_operating_unit
+#: model:ir.model.fields,field_description:payroll_operating_unit.field_hr_payslip____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: payroll_operating_unit
+#: model:ir.model.fields,field_description:payroll_operating_unit.field_hr_payslip__operating_unit_id
+#: model_terms:ir.ui.view,arch_db:payroll_operating_unit.hr_payslip_view_search
+msgid "Operating Unit"
+msgstr ""
+
+#. module: payroll_operating_unit
+#: model:ir.model,name:payroll_operating_unit.model_hr_payslip
+msgid "Payslip"
+msgstr ""
diff --git a/payroll_operating_unit/models/__init__.py b/payroll_operating_unit/models/__init__.py
new file mode 100644
index 00000000..0e7d95d6
--- /dev/null
+++ b/payroll_operating_unit/models/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import hr_payslip
diff --git a/payroll_operating_unit/models/hr_payslip.py b/payroll_operating_unit/models/hr_payslip.py
new file mode 100644
index 00000000..830590c3
--- /dev/null
+++ b/payroll_operating_unit/models/hr_payslip.py
@@ -0,0 +1,31 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import api, fields, models
+
+
+class HrPayslip(models.Model):
+    _inherit = "hr.payslip"
+
+    operating_unit_id = fields.Many2one(
+        "operating.unit",
+        default=lambda s: s.env["res.users"].operating_unit_default_get(s._uid),
+    )
+
+    @api.onchange("contract_id")
+    def onchange_contract(self):
+        for rec in self:
+            ou = False
+            if rec.contract_id and rec.contract_id.operating_unit_id:
+                ou = rec.contract_id.operating_unit_id
+            elif rec.employee_id and rec.employee_id.default_operating_unit_id:
+                ou = rec.employee_id.default_operating_unit_id
+            rec.operating_unit_id = ou
+
+    @api.onchange("employee_id", "date_from", "date_to", "struct_id")
+    def onchange_employee(self):
+
+        res = super().onchange_employee()
+        self.onchange_contract()
+
+        return res
diff --git a/payroll_operating_unit/readme/CREDITS.rst b/payroll_operating_unit/readme/CREDITS.rst
new file mode 100644
index 00000000..d264bc7e
--- /dev/null
+++ b/payroll_operating_unit/readme/CREDITS.rst
@@ -0,0 +1 @@
+* Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/payroll_operating_unit/readme/DESCRIPTION.rst b/payroll_operating_unit/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..3b87c150
--- /dev/null
+++ b/payroll_operating_unit/readme/DESCRIPTION.rst
@@ -0,0 +1,2 @@
+This module sets the operating unit on a payslip based on the operating of the employee's contract. If the
+employee has multiple contracts in the payslip it will use the first contract.
diff --git a/payroll_operating_unit/security/hr_payslip_security.xml b/payroll_operating_unit/security/hr_payslip_security.xml
new file mode 100644
index 00000000..c24b66b3
--- /dev/null
+++ b/payroll_operating_unit/security/hr_payslip_security.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+
+    <record id="ir_rule_hr_payslip_allowed_operating_units" model="ir.rule">
+        <field name="model_id" ref="payroll.model_hr_payslip" />
+        <field
+            name="domain_force"
+        >['|',('operating_unit_id','=',False),('operating_unit_id','in',[ou.id for ou in user.operating_unit_ids])]</field>
+        <field name="name">Payslips from allowed operating units</field>
+        <field name="global" eval="True" />
+        <field eval="0" name="perm_unlink" />
+        <field eval="0" name="perm_write" />
+        <field eval="1" name="perm_read" />
+        <field eval="0" name="perm_create" />
+    </record>
+
+</odoo>
diff --git a/payroll_operating_unit/static/description/icon.png b/payroll_operating_unit/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/payroll_operating_unit/static/description/icon.png differ
diff --git a/payroll_operating_unit/static/description/index.html b/payroll_operating_unit/static/description/index.html
new file mode 100644
index 00000000..6ed0975a
--- /dev/null
+++ b/payroll_operating_unit/static/description/index.html
@@ -0,0 +1,417 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>DO NOT USE - Payroll Operating Unit</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="do-not-use-payroll-operating-unit">
+<h1 class="title">DO NOT USE - Payroll Operating Unit</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:a03e290cf47cbebc2143f37c3ac6069a7f5d91e3226486e096b83653452cbe95
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_operating_unit"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<p>This module sets the operating unit on a payslip based on the operating of the employee’s contract. If the
+employee has multiple contracts in the payslip it will use the first contract.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-4">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_operating_unit%0Aversion:%2014.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="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>TREVI Software</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-4">Other credits</a></h2>
+<ul class="simple">
+<li>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_operating_unit">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/payroll_operating_unit/static/src/img/main_screenshot.png b/payroll_operating_unit/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/payroll_operating_unit/static/src/img/main_screenshot.png differ
diff --git a/payroll_operating_unit/tests/__init__.py b/payroll_operating_unit/tests/__init__.py
new file mode 100644
index 00000000..2b169040
--- /dev/null
+++ b/payroll_operating_unit/tests/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import test_hr_payslip
diff --git a/payroll_operating_unit/tests/test_hr_payslip.py b/payroll_operating_unit/tests/test_hr_payslip.py
new file mode 100644
index 00000000..de7f1675
--- /dev/null
+++ b/payroll_operating_unit/tests/test_hr_payslip.py
@@ -0,0 +1,186 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import date
+
+from odoo.addons.payroll.tests.common import TestPayslipBase
+
+
+class TestPayslip(TestPayslipBase):
+    def setUp(self):
+        super().setUp()
+
+        self.Contract = self.env["hr.contract"]
+        self.OU = self.env["operating.unit"]
+        self.Users = self.env["res.users"]
+
+        # Operating Units
+        self.default_ou = self.env.user.default_operating_unit_id
+        self.ou_main = self.OU.create(
+            {"name": "Main", "code": "M", "partner_id": self.env.company.id}
+        )
+        self.ou_second = self.OU.create(
+            {"name": "Second", "code": "S", "partner_id": self.env.company.id}
+        )
+
+        # Groups
+        self.grp_payroll_mgr = self.env.ref("payroll.group_payroll_manager")
+        self.group_user = self.env.ref("base.group_user")
+
+        # Users
+        self.user1 = self._create_user(
+            "User_1",
+            [self.grp_payroll_mgr, self.group_user],
+            self.env.company,
+            [self.ou_main, self.ou_second],
+        )
+        self.user2 = self._create_user(
+            "User_2",
+            [self.grp_payroll_mgr, self.group_user],
+            self.env.company,
+            [self.ou_second],
+        )
+
+    def _create_user(self, login, groups, company, operating_units):
+        return self.Users.create(
+            {
+                "name": f"Test Payslip {login}",
+                "login": login,
+                "password": "demo",
+                "email": "example@yourcompany.com",
+                "company_id": company.id,
+                "company_ids": [(4, company.id)],
+                "operating_unit_ids": [(4, ou.id) for ou in operating_units],
+                "groups_id": [(6, 0, [group.id for group in groups])],
+            }
+        )
+
+    def test_ou_access(self):
+
+        contracts = self.Contract.search([("employee_id", "=", self.richard_emp.id)])
+        contracts.operating_unit_id = self.ou_main
+        self.apply_contract_cron()
+        richard_payslip = self.Payslip.create({"employee_id": self.richard_emp.id})
+        richard_payslip.onchange_employee()
+
+        self.assertEqual(
+            richard_payslip.operating_unit_id, self.ou_main, "The payslip has OU main"
+        )
+        self.assertIn(
+            self.ou_main,
+            self.user1.operating_unit_ids,
+            "OU main is in user1's allowed OUs",
+        )
+
+        search_user1 = self.Payslip.with_user(self.user1).search(
+            [
+                ("employee_id", "=", self.richard_emp.id),
+                ("operating_unit_id", "=", self.ou_main.id),
+            ]
+        )
+        search_user2 = self.Payslip.with_user(self.user2).search(
+            [
+                ("employee_id", "=", self.richard_emp.id),
+                ("operating_unit_id", "=", self.ou_main.id),
+            ]
+        )
+
+        self.assertEqual(
+            search_user1.ids,
+            richard_payslip.ids,
+            "User 1 has access to OU %s" % self.ou_main.name,
+        )
+        self.assertEqual(
+            search_user2.ids,
+            [],
+            "User 2 does NOT have access to OU %s" % self.ou_main.name,
+        )
+
+    def test_single_contract_default_ou(self):
+
+        self.apply_contract_cron()
+        richard_payslip = self.Payslip.create({"employee_id": self.richard_emp.id})
+
+        self.assertEqual(
+            self.richard_emp.default_operating_unit_id,
+            self.default_ou,
+            "There is default OU on EMPLOYEE",
+        )
+        contracts = self.Contract.search([("employee_id", "=", self.richard_emp.id)])
+        self.assertEqual(
+            contracts[0].operating_unit_id,
+            self.default_ou,
+            "There is default OU on CONTRACT",
+        )
+        self.assertEqual(
+            richard_payslip.operating_unit_id,
+            self.default_ou,
+            "There is default OU on PAYSLIP",
+        )
+
+    def test_single_contract_oucontract(self):
+
+        # Put OU on contract
+        contracts = self.Contract.search([("employee_id", "=", self.richard_emp.id)])
+        contracts.operating_unit_id = self.ou_main
+
+        self.apply_contract_cron()
+        richard_payslip = self.Payslip.create({"employee_id": self.richard_emp.id})
+        richard_payslip.onchange_employee()
+
+        self.assertEqual(
+            richard_payslip.operating_unit_id,
+            self.ou_main,
+            "The OU on the payslip is same as CONTRACT",
+        )
+
+    def test_single_contract_ouemployee(self):
+
+        # Put OU on employee
+        self.richard_emp.default_operating_unit_id = self.ou_main
+
+        contracts = self.Contract.search([("employee_id", "=", self.richard_emp.id)])
+        self.apply_contract_cron()
+        richard_payslip = self.Payslip.create({"employee_id": self.richard_emp.id})
+        contracts.operating_unit_id = False
+        richard_payslip.onchange_contract()
+
+        self.assertFalse(contracts[0].operating_unit_id, "There is no OU on contract")
+        self.assertEqual(
+            richard_payslip.operating_unit_id,
+            self.ou_main,
+            "The OU on the payslip is same as EMPLOYEE",
+        )
+
+    def test_multi_contract(self):
+
+        # Adjust richard's contracts to accomodate two of them
+        contracts = self.Contract.search([("employee_id", "=", self.richard_emp.id)])
+        today = date.today()
+        contracts[0].date_start = date(today.year, today.month, 1)
+        contracts[0].date_end = date(today.year, today.month, 14)
+        c2 = self.Contract.create(
+            {
+                "date_end": False,
+                "date_start": date(today.year, today.month, 15),
+                "name": "Contract #2 for Richard",
+                "wage": 5000.0,
+                "employee_id": self.richard_emp.id,
+                "struct_id": self.developer_pay_structure.id,
+                "kanban_state": "done",
+            }
+        )
+
+        # Set operating units
+        contracts[0].operating_unit_id = self.ou_main
+        c2.operating_unit_id = self.ou_second
+
+        self.apply_contract_cron()
+        richard_payslip = self.Payslip.create({"employee_id": self.richard_emp.id})
+        richard_payslip.onchange_employee()
+
+        self.assertEqual(
+            richard_payslip.operating_unit_id,
+            self.ou_main,
+            "The OU on the payslip is same as 1st CONTRACT",
+        )
diff --git a/payroll_operating_unit/views/hr_payslip_view.xml b/payroll_operating_unit/views/hr_payslip_view.xml
new file mode 100644
index 00000000..d515a2e6
--- /dev/null
+++ b/payroll_operating_unit/views/hr_payslip_view.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="hr_payslip_view_tree" model="ir.ui.view">
+        <field name="name">hr.payslip.tree.operating_unit</field>
+        <field name="model">hr.payslip</field>
+        <field name="inherit_id" ref="payroll.hr_payslip_view_tree" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='company_id']" position="before">
+                <field name="operating_unit_id" />
+            </xpath>
+        </field>
+    </record>
+
+    <record id="view_payslip_form" model="ir.ui.view">
+        <field name="name">hr.payslip.form.operating_unit</field>
+        <field name="model">hr.payslip</field>
+        <field name="inherit_id" ref="payroll.hr_payslip_view_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='contract_id']" position="after">
+                <field name="operating_unit_id" />
+            </xpath>
+        </field>
+    </record>
+
+    <record id="hr_payslip_view_search" model="ir.ui.view">
+        <field name="name">hr.payslip.select.operating_unit</field>
+        <field name="model">hr.payslip</field>
+        <field name="inherit_id" ref="payroll.hr_payslip_view_search" />
+        <field name="arch" type="xml">
+            <xpath expr="//filter[@name='payslip_run_id']" position="after">
+                <filter
+                    string="Operating Unit"
+                    name="operating_unit_id"
+                    context="{'group_by':'operating_unit_id'}"
+                />
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/payroll_operating_unit_access_all/README.rst b/payroll_operating_unit_access_all/README.rst
new file mode 100644
index 00000000..5fd59fba
--- /dev/null
+++ b/payroll_operating_unit_access_all/README.rst
@@ -0,0 +1,60 @@
+========================================
+DO NOT USE Payroll Operating Unit Access
+========================================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:dd9121b233f2eeee5a56431c24b8db54a5f94fb55a03c202dc915d8de5376a95
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_operating_unit_access_all
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+This module creates a user group that allows access to all payslips, regardless of Operating Unit.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_operating_unit_access_all%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+
+Other credits
+~~~~~~~~~~~~~
+
+* Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_operating_unit_access_all>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/payroll_operating_unit_access_all/__init__.py b/payroll_operating_unit_access_all/__init__.py
new file mode 100644
index 00000000..0cfb63e1
--- /dev/null
+++ b/payroll_operating_unit_access_all/__init__.py
@@ -0,0 +1,2 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
diff --git a/payroll_operating_unit_access_all/__manifest__.py b/payroll_operating_unit_access_all/__manifest__.py
new file mode 100644
index 00000000..8ba99269
--- /dev/null
+++ b/payroll_operating_unit_access_all/__manifest__.py
@@ -0,0 +1,23 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "DO NOT USE Payroll Operating Unit Access",
+    "summary": "Access all payslips.",
+    "version": "15.0.1.0.0",
+    "category": "Payroll",
+    "images": ["static/src/img/main_screenshot.png"],
+    "author": "TREVI Software, Odoo Community Association (OCA)",
+    "license": "AGPL-3",
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "base",
+        "payroll_operating_unit",
+        # XXX - This is to prevent Odoo's App store bot from picking this up
+        "hr_holidays_public",
+    ],
+    "data": [
+        "security/hr_payslip_security.xml",
+    ],
+    "installable": True,
+}
diff --git a/payroll_operating_unit_access_all/i18n/payroll_operating_unit_access_all.pot b/payroll_operating_unit_access_all/i18n/payroll_operating_unit_access_all.pot
new file mode 100644
index 00000000..71ac9cf9
--- /dev/null
+++ b/payroll_operating_unit_access_all/i18n/payroll_operating_unit_access_all.pot
@@ -0,0 +1,19 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* payroll_operating_unit_access_all
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: payroll_operating_unit_access_all
+#: model:res.groups,name:payroll_operating_unit_access_all.group_all_ou_payslip
+msgid "Access all OUs' Payslips"
+msgstr ""
diff --git a/payroll_operating_unit_access_all/readme/CREDITS.rst b/payroll_operating_unit_access_all/readme/CREDITS.rst
new file mode 100644
index 00000000..d264bc7e
--- /dev/null
+++ b/payroll_operating_unit_access_all/readme/CREDITS.rst
@@ -0,0 +1 @@
+* Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/payroll_operating_unit_access_all/readme/DESCRIPTION.rst b/payroll_operating_unit_access_all/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..e08e1daa
--- /dev/null
+++ b/payroll_operating_unit_access_all/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+This module creates a user group that allows access to all payslips, regardless of Operating Unit.
diff --git a/payroll_operating_unit_access_all/security/hr_payslip_security.xml b/payroll_operating_unit_access_all/security/hr_payslip_security.xml
new file mode 100644
index 00000000..27505703
--- /dev/null
+++ b/payroll_operating_unit_access_all/security/hr_payslip_security.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+
+    <record id="group_all_ou_payslip" model="res.groups">
+        <field name="name">Access all OUs' Payslips</field>
+        <field name="category_id" ref="operating_unit.module_operating_units" />
+    </record>
+
+    <function model="ir.rule" name="write">
+        <value
+            eval="[ref('payroll_operating_unit.ir_rule_hr_payslip_allowed_operating_units')]"
+        />
+        <value
+            eval="{'domain_force': &quot;['|','|',(1, '=', 1) if user.has_group('payroll_operating_unit_access_all.group_all_ou_payslip') else (0, '=', 1),('operating_unit_id','=',False),('operating_unit_id','in', user.operating_unit_ids.ids)]&quot;}"
+        />
+    </function>
+
+</odoo>
diff --git a/payroll_operating_unit_access_all/static/description/icon.png b/payroll_operating_unit_access_all/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/payroll_operating_unit_access_all/static/description/icon.png differ
diff --git a/payroll_operating_unit_access_all/static/description/index.html b/payroll_operating_unit_access_all/static/description/index.html
new file mode 100644
index 00000000..289a77f5
--- /dev/null
+++ b/payroll_operating_unit_access_all/static/description/index.html
@@ -0,0 +1,416 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>DO NOT USE Payroll Operating Unit Access</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="do-not-use-payroll-operating-unit-access">
+<h1 class="title">DO NOT USE Payroll Operating Unit Access</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:dd9121b233f2eeee5a56431c24b8db54a5f94fb55a03c202dc915d8de5376a95
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_operating_unit_access_all"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<p>This module creates a user group that allows access to all payslips, regardless of Operating Unit.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-4">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_operating_unit_access_all%0Aversion:%2014.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="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>TREVI Software</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-4">Other credits</a></h2>
+<ul class="simple">
+<li>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_operating_unit_access_all">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/payroll_operating_unit_access_all/static/src/img/main_screenshot.png b/payroll_operating_unit_access_all/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/payroll_operating_unit_access_all/static/src/img/main_screenshot.png differ
diff --git a/payroll_operating_unit_access_all/tests/__init__.py b/payroll_operating_unit_access_all/tests/__init__.py
new file mode 100644
index 00000000..2b169040
--- /dev/null
+++ b/payroll_operating_unit_access_all/tests/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import test_hr_payslip
diff --git a/payroll_operating_unit_access_all/tests/test_hr_payslip.py b/payroll_operating_unit_access_all/tests/test_hr_payslip.py
new file mode 100644
index 00000000..b4f52dff
--- /dev/null
+++ b/payroll_operating_unit_access_all/tests/test_hr_payslip.py
@@ -0,0 +1,52 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo.addons.payroll_operating_unit.tests.test_hr_payslip import TestPayslip
+
+
+class TestPayslipAccess(TestPayslip):
+    def setUp(self):
+        super().setUp()
+
+        # Groups
+        self.grp_access_all = self.env.ref(
+            "payroll_operating_unit_access_all.group_all_ou_payslip"
+        )
+
+        # Users
+        self.user3 = self._create_user(
+            "User_3",
+            [self.grp_access_all, self.grp_payroll_mgr, self.group_user],
+            self.env.company,
+            [self.ou_second],
+        )
+
+    def test_ou_all_access(self):
+
+        contracts = self.Contract.search([("employee_id", "=", self.richard_emp.id)])
+        contracts.operating_unit_id = self.ou_main
+        self.apply_contract_cron()
+        richard_payslip = self.Payslip.create({"employee_id": self.richard_emp.id})
+        richard_payslip.onchange_employee()
+
+        self.assertEqual(
+            richard_payslip.operating_unit_id, self.ou_main, "The payslip has OU main"
+        )
+        self.assertNotIn(
+            self.ou_main,
+            self.user3.operating_unit_ids,
+            "OU main is NOT in user3's allowed OUs",
+        )
+
+        search_user3 = self.Payslip.with_user(self.user3).search(
+            [
+                ("employee_id", "=", self.richard_emp.id),
+                ("operating_unit_id", "=", self.ou_main.id),
+            ]
+        )
+
+        self.assertEqual(
+            search_user3.ids,
+            richard_payslip.ids,
+            "User 3 has access to OU %s" % self.ou_main.name,
+        )
diff --git a/payroll_payslip_amendment/README.rst b/payroll_payslip_amendment/README.rst
new file mode 100644
index 00000000..4e32b3ae
--- /dev/null
+++ b/payroll_payslip_amendment/README.rst
@@ -0,0 +1,61 @@
+==================
+Pay Slip Amendment
+==================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:b3266c53c03609a8d877c0e60d877aced1669fa09684c34f8c66ff23e3583642
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_payslip_amendment
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+This module allows the Payroll Officer to make changes to an individual payslip by using Payslip Inputs.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_payslip_amendment%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+* Michael Telahun Makonnen
+
+Other credits
+~~~~~~~~~~~~~
+
+* Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_payslip_amendment>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/payroll_payslip_amendment/__init__.py b/payroll_payslip_amendment/__init__.py
new file mode 100644
index 00000000..86f3c8b1
--- /dev/null
+++ b/payroll_payslip_amendment/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
diff --git a/payroll_payslip_amendment/__manifest__.py b/payroll_payslip_amendment/__manifest__.py
new file mode 100644
index 00000000..b37056bc
--- /dev/null
+++ b/payroll_payslip_amendment/__manifest__.py
@@ -0,0 +1,23 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Pay Slip Amendment",
+    "summary": "Add amendments to current and future pay slips",
+    "version": "15.0.1.0.0",
+    "category": "Payroll",
+    "images": ["static/src/img/main_screenshot.png"],
+    "license": "AGPL-3",
+    "author": "TREVI Software, Michael Telahun Makonnen",
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "hr",
+        "payroll",
+    ],
+    "data": [
+        "security/ir.model.access.csv",
+        "views/hr_payslip_amendment_view.xml",
+    ],
+    "installable": True,
+}
diff --git a/payroll_payslip_amendment/i18n/payroll_payslip_amendment.pot b/payroll_payslip_amendment/i18n/payroll_payslip_amendment.pot
new file mode 100644
index 00000000..94d6cc78
--- /dev/null
+++ b/payroll_payslip_amendment/i18n/payroll_payslip_amendment.pot
@@ -0,0 +1,264 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* payroll_payslip_amendment
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: payroll_payslip_amendment
+#: code:addons/payroll_payslip_amendment/models/hr_payslip_amendment.py:0
+#, python-format
+msgid "A Pay Slip Amendment that has been confirmed cannot be deleted!"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model.fields,field_description:payroll_payslip_amendment.field_hr_payslip_amendment__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model.fields,field_description:payroll_payslip_amendment.field_hr_payslip_amendment__amount
+msgid "Amount"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model.fields,field_description:payroll_payslip_amendment.field_hr_payslip_amendment__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model_terms:ir.ui.view,arch_db:payroll_payslip_amendment.view_payslip_amendment_form
+msgid "Cancel"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model.fields.selection,name:payroll_payslip_amendment.selection__hr_payslip_amendment__state__cancel
+msgid "Cancelled"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model_terms:ir.ui.view,arch_db:payroll_payslip_amendment.view_payslip_amendment_form
+msgid "Confirm"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model.fields.selection,name:payroll_payslip_amendment.selection__hr_payslip_amendment__state__validate
+msgid "Confirmed"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model.fields,field_description:payroll_payslip_amendment.field_hr_payslip_amendment__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model.fields,field_description:payroll_payslip_amendment.field_hr_payslip_amendment__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model.fields,field_description:payroll_payslip_amendment.field_hr_payslip_amendment__date
+msgid "Date"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model.fields,field_description:payroll_payslip_amendment.field_hr_payslip__display_name
+#: model:ir.model.fields,field_description:payroll_payslip_amendment.field_hr_payslip_amendment__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model.fields.selection,name:payroll_payslip_amendment.selection__hr_payslip_amendment__state__done
+msgid "Done"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model.fields.selection,name:payroll_payslip_amendment.selection__hr_payslip_amendment__state__draft
+msgid "Draft"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model.fields,field_description:payroll_payslip_amendment.field_hr_payslip_amendment__employee_id
+msgid "Employee"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model_terms:ir.ui.view,arch_db:payroll_payslip_amendment.view_payslip_amendment_form
+msgid "Explain the reason for the amendment..."
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model.fields,field_description:payroll_payslip_amendment.field_hr_payslip_amendment__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model.fields,field_description:payroll_payslip_amendment.field_hr_payslip_amendment__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model.fields,field_description:payroll_payslip_amendment.field_hr_payslip_amendment__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model.fields,field_description:payroll_payslip_amendment.field_hr_payslip__id
+#: model:ir.model.fields,field_description:payroll_payslip_amendment.field_hr_payslip_amendment__id
+msgid "ID"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model.fields,help:payroll_payslip_amendment.field_hr_payslip_amendment__message_needaction
+#: model:ir.model.fields,help:payroll_payslip_amendment.field_hr_payslip_amendment__message_unread
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model.fields,help:payroll_payslip_amendment.field_hr_payslip_amendment__message_has_error
+#: model:ir.model.fields,help:payroll_payslip_amendment.field_hr_payslip_amendment__message_has_sms_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model.fields,field_description:payroll_payslip_amendment.field_hr_payslip_amendment__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model.fields,field_description:payroll_payslip_amendment.field_hr_payslip____last_update
+#: model:ir.model.fields,field_description:payroll_payslip_amendment.field_hr_payslip_amendment____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model.fields,field_description:payroll_payslip_amendment.field_hr_payslip_amendment__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model.fields,field_description:payroll_payslip_amendment.field_hr_payslip_amendment__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model.fields,field_description:payroll_payslip_amendment.field_hr_payslip_amendment__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model.fields,field_description:payroll_payslip_amendment.field_hr_payslip_amendment__note
+msgid "Memo"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model.fields,field_description:payroll_payslip_amendment.field_hr_payslip_amendment__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model.fields,field_description:payroll_payslip_amendment.field_hr_payslip_amendment__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model_terms:ir.ui.view,arch_db:payroll_payslip_amendment.view_payslip_amendment_form
+msgid "Note"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model.fields,field_description:payroll_payslip_amendment.field_hr_payslip_amendment__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model.fields,field_description:payroll_payslip_amendment.field_hr_payslip_amendment__message_has_error_counter
+msgid "Number of errors"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model.fields,help:payroll_payslip_amendment.field_hr_payslip_amendment__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model.fields,help:payroll_payslip_amendment.field_hr_payslip_amendment__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model.fields,help:payroll_payslip_amendment.field_hr_payslip_amendment__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model,name:payroll_payslip_amendment.model_hr_payslip_amendment
+#: model_terms:ir.ui.view,arch_db:payroll_payslip_amendment.view_payslip_amendment_form
+msgid "Pay Slip Amendment"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.actions.act_window,name:payroll_payslip_amendment.action_payslip_amendment
+#: model:ir.ui.menu,name:payroll_payslip_amendment.menu_payslip_amendment
+#: model_terms:ir.ui.view,arch_db:payroll_payslip_amendment.view_payslip_amendment_tree
+msgid "Pay Slip Amendments"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model,name:payroll_payslip_amendment.model_hr_payslip
+msgid "Payslip"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model.fields,field_description:payroll_payslip_amendment.field_hr_payslip_amendment__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model.fields,field_description:payroll_payslip_amendment.field_hr_payslip_amendment__input_id
+msgid "Salary Rule Input"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model_terms:ir.ui.view,arch_db:payroll_payslip_amendment.view_payslip_amendment_form
+msgid "Set to Draft"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model.fields,field_description:payroll_payslip_amendment.field_hr_payslip_amendment__state
+msgid "State"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model.fields,help:payroll_payslip_amendment.field_hr_payslip_amendment__amount
+msgid ""
+"The meaning of this field is dependent on the salary rule that uses it."
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model.fields,field_description:payroll_payslip_amendment.field_hr_payslip_amendment__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model.fields,field_description:payroll_payslip_amendment.field_hr_payslip_amendment__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model.fields,field_description:payroll_payslip_amendment.field_hr_payslip_amendment__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: payroll_payslip_amendment
+#: model:ir.model.fields,help:payroll_payslip_amendment.field_hr_payslip_amendment__website_message_ids
+msgid "Website communication history"
+msgstr ""
diff --git a/payroll_payslip_amendment/models/__init__.py b/payroll_payslip_amendment/models/__init__.py
new file mode 100644
index 00000000..e27fabd7
--- /dev/null
+++ b/payroll_payslip_amendment/models/__init__.py
@@ -0,0 +1,6 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import hr_payslip
+from . import hr_payslip_amendment
diff --git a/payroll_payslip_amendment/models/hr_payslip.py b/payroll_payslip_amendment/models/hr_payslip.py
new file mode 100644
index 00000000..bd138ab9
--- /dev/null
+++ b/payroll_payslip_amendment/models/hr_payslip.py
@@ -0,0 +1,50 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import api, models
+
+
+class HrPayslip(models.Model):
+    _inherit = "hr.payslip"
+
+    @api.model
+    def get_inputs(self, contracts, date_from, date_to):
+
+        res = super(HrPayslip, self).get_inputs(contracts, date_from, date_to)
+
+        psa_ids = self.env["hr.payslip.amendment"].search(
+            [
+                ("employee_id", "=", contracts[0].employee_id.id),
+                ("state", "not in", ["draft, cancel, done"]),
+                ("date", ">=", date_from),
+                ("date", "<=", date_to),
+            ]
+        )
+        for line in res:
+
+            # Pay Slip Amendment modifications
+            for psa in psa_ids.filtered(
+                lambda self: self.input_id.code == line["code"]
+            ):
+
+                # count the number of times this input rule appears (this
+                # is dependent on no. of contracts in pay period), and
+                # distribute the total amount equally among them.
+                #
+                rule_count = 0
+                _input_contract_ids = []
+                for _l2 in res:
+                    if _l2["code"] == psa.input_id.code:
+                        rule_count += 1
+                        if _l2["contract_id"] not in _input_contract_ids:
+                            _input_contract_ids.append(_l2["contract_id"])
+                if line.get("amount", "x") == "x":
+                    line["amount"] = 0
+                if line.get("amount", False):
+                    line["amount"] += psa.amount / float(rule_count)
+                else:
+                    line.update({"amount": psa.amount / float(rule_count)})
+                psa.do_done()
+
+        return res
diff --git a/payroll_payslip_amendment/models/hr_payslip_amendment.py b/payroll_payslip_amendment/models/hr_payslip_amendment.py
new file mode 100644
index 00000000..40def5a2
--- /dev/null
+++ b/payroll_payslip_amendment/models/hr_payslip_amendment.py
@@ -0,0 +1,90 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import date
+
+from odoo import _, exceptions, fields, models
+
+
+class HrPayslipAmendment(models.Model):
+
+    _name = "hr.payslip.amendment"
+    _inherit = ["mail.thread"]
+    _description = "Pay Slip Amendment"
+
+    date = fields.Date(
+        default=lambda s: date.today(),
+        required=True,
+        readonly=True,
+        states={"draft": [("readonly", False)]},
+    )
+    input_id = fields.Many2one(
+        string="Salary Rule Input",
+        comodel_name="hr.rule.input",
+        required=True,
+        readonly=True,
+        states={"draft": [("readonly", False)]},
+    )
+    employee_id = fields.Many2one(
+        string="Employee",
+        comodel_name="hr.employee",
+        required=True,
+        readonly=True,
+        states={"draft": [("readonly", False)]},
+    )
+    amount = fields.Float(
+        digits="Payroll",
+        required=True,
+        readonly=True,
+        states={"draft": [("readonly", False)], "validate": [("readonly", False)]},
+        help="The meaning of this field is dependent on the salary rule that uses it.",
+    )
+    state = fields.Selection(
+        selection=[
+            ("draft", "Draft"),
+            ("validate", "Confirmed"),
+            ("cancel", "Cancelled"),
+            ("done", "Done"),
+        ],
+        default="draft",
+        copy="False",
+        required=True,
+        readonly=True,
+        tracking=True,
+    )
+    note = fields.Text(string="Memo")
+
+    def name_get(self):
+
+        res = []
+        for rec in self:
+            res.append((rec.id, "%s (%s)" % (rec.employee_id.name, rec.input_id.code)))
+
+        return res
+
+    def unlink(self):
+
+        for psa in self:
+            if psa.state in ["validate", "done"]:
+                raise exceptions.UserError(
+                    _("A Pay Slip Amendment that has been confirmed cannot be deleted!")
+                )
+
+        return super(HrPayslipAmendment, self).unlink()
+
+    def do_validate(self):
+        rset = self.filtered(lambda rec: rec.state == "draft")
+        rset.state = "validate"
+
+    def do_done(self):
+        rset = self.filtered(lambda rec: rec.state == "validate")
+        rset.state = "done"
+
+    def do_cancel(self):
+        rset = self.filtered(lambda rec: rec.state == "validate")
+        rset.state = "cancel"
+
+    def do_reset(self):
+        rset = self.filtered(lambda rec: rec.state == "cancel")
+        rset.state = "draft"
diff --git a/payroll_payslip_amendment/readme/CREDITS.rst b/payroll_payslip_amendment/readme/CREDITS.rst
new file mode 100644
index 00000000..d264bc7e
--- /dev/null
+++ b/payroll_payslip_amendment/readme/CREDITS.rst
@@ -0,0 +1 @@
+* Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/payroll_payslip_amendment/readme/DESCRIPTION.rst b/payroll_payslip_amendment/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..11d221a0
--- /dev/null
+++ b/payroll_payslip_amendment/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+This module allows the Payroll Officer to make changes to an individual payslip by using Payslip Inputs.
diff --git a/payroll_payslip_amendment/security/ir.model.access.csv b/payroll_payslip_amendment/security/ir.model.access.csv
new file mode 100644
index 00000000..42238088
--- /dev/null
+++ b/payroll_payslip_amendment/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_payslip_amendment_officer,hr.payslip.amendment,model_hr_payslip_amendment,payroll.group_payroll_user,1,1,1,1
diff --git a/payroll_payslip_amendment/static/description/icon.png b/payroll_payslip_amendment/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/payroll_payslip_amendment/static/description/icon.png differ
diff --git a/payroll_payslip_amendment/static/description/index.html b/payroll_payslip_amendment/static/description/index.html
new file mode 100644
index 00000000..2903c386
--- /dev/null
+++ b/payroll_payslip_amendment/static/description/index.html
@@ -0,0 +1,417 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Pay Slip Amendment</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="pay-slip-amendment">
+<h1 class="title">Pay Slip Amendment</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:b3266c53c03609a8d877c0e60d877aced1669fa09684c34f8c66ff23e3583642
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_payslip_amendment"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<p>This module allows the Payroll Officer to make changes to an individual payslip by using Payslip Inputs.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-4">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_payslip_amendment%0Aversion:%2014.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="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>TREVI Software</li>
+<li>Michael Telahun Makonnen</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-4">Other credits</a></h2>
+<ul class="simple">
+<li>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_payslip_amendment">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/payroll_payslip_amendment/static/src/img/main_screenshot.png b/payroll_payslip_amendment/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/payroll_payslip_amendment/static/src/img/main_screenshot.png differ
diff --git a/payroll_payslip_amendment/tests/__init__.py b/payroll_payslip_amendment/tests/__init__.py
new file mode 100644
index 00000000..7d08c705
--- /dev/null
+++ b/payroll_payslip_amendment/tests/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import test_payslip_amendment
diff --git a/payroll_payslip_amendment/tests/test_payslip_amendment.py b/payroll_payslip_amendment/tests/test_payslip_amendment.py
new file mode 100644
index 00000000..11b358b0
--- /dev/null
+++ b/payroll_payslip_amendment/tests/test_payslip_amendment.py
@@ -0,0 +1,331 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import date
+
+from odoo import fields
+from odoo.exceptions import UserError
+from odoo.tests import common
+
+
+class TestPayslipAmendment(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super(TestPayslipAmendment, cls).setUpClass()
+
+        cls.Payslip = cls.env["hr.payslip"]
+        cls.Amendment = cls.env["hr.payslip.amendment"]
+
+        cls.eeSally = cls.env["hr.employee"].create({"name": "Sally"})
+
+        cls.rule_commision = cls.env["hr.salary.rule"].create(
+            {
+                "name": "Commission",
+                "code": "COMM",
+                "category_id": cls.env.ref("payroll.ALW").id,
+                "sequence": 17,
+                "amount_select": "code",
+                "amount_python_compute": "result = inputs.SALECOM.amount",
+            }
+        )
+        cls.input_commision = cls.env["hr.rule.input"].create(
+            {
+                "name": "Sales Commission Input",
+                "code": "SALECOM",
+                "input_id": cls.rule_commision.id,
+            }
+        )
+
+        cls.pay_struct = cls.env.ref("payroll.structure_base")
+        cls.pay_struct.write({"rule_ids": [(4, cls.rule_commision.id)]})
+
+    def create_contract(
+        self, eid, state, kanban_state, start=None, end=None, trial_end=None
+    ):
+        if start is None:
+            start = date.today()
+        return self.env["hr.contract"].create(
+            {
+                "name": "Contract",
+                "employee_id": eid,
+                "state": state,
+                "kanban_state": kanban_state,
+                "wage": 1,
+                "date_start": start,
+                "trial_date_end": trial_end,
+                "date_end": end,
+                "struct_id": self.pay_struct.id,
+            }
+        )
+
+    def apply_contract_cron(self):
+        self.env.ref(
+            "hr_contract.ir_cron_data_contract_update_state"
+        ).method_direct_trigger()
+
+    def test_default_date(self):
+        psa = self.Amendment.create(
+            {
+                "employee_id": self.eeSally.id,
+                "input_id": self.input_commision.id,
+                "amount": 1,
+            }
+        )
+        self.assertEqual(
+            psa.date,
+            date.today(),
+            "New payslip amendment has a default date of: today()",
+        )
+
+    def test_unlink(self):
+        psa = self.Amendment.create(
+            {
+                "employee_id": self.eeSally.id,
+                "input_id": self.input_commision.id,
+                "amount": 1,
+                "date": date.today(),
+            }
+        )
+        self.assertEqual(
+            psa.state, "draft", "New payslip amendment is in 'draft' state"
+        )
+
+        psa.do_validate()
+        with self.assertRaises(UserError):
+            psa.unlink()
+
+        psa.do_cancel()
+        try:
+            psa.unlink()
+        except Exception:
+            self.fail("Unexpected error when deleting a payslip amendment")
+
+    def test_unlink_done(self):
+        psa = self.Amendment.create(
+            {
+                "employee_id": self.eeSally.id,
+                "input_id": self.input_commision.id,
+                "amount": 1,
+                "date": date.today(),
+            }
+        )
+        self.assertEqual(
+            psa.state, "draft", "New payslip amendment is in 'draft' state"
+        )
+
+        psa.do_validate()
+        psa.do_done()
+        with self.assertRaises(UserError):
+            psa.unlink()
+
+    def test_name(self):
+        psa = self.Amendment.create(
+            {
+                "employee_id": self.eeSally.id,
+                "input_id": self.input_commision.id,
+                "amount": 1,
+                "date": date.today(),
+            }
+        )
+        self.assertEqual(
+            psa.name_get()[0][1],
+            "Sally (SALECOM)",
+            "Payslip amendment name is composed of employee name and Input code",
+        )
+
+    def test_state_change(self):
+        psa = self.Amendment.create(
+            {
+                "employee_id": self.eeSally.id,
+                "input_id": self.input_commision.id,
+                "amount": 1,
+                "date": date.today(),
+            }
+        )
+        self.assertEqual(
+            psa.state, "draft", "New payslip amendment is in 'draft' state"
+        )
+
+        psa.do_cancel()
+        self.assertEqual(
+            psa.state, "draft", "Change state from 'draft' -> 'cancel' should FAIL!"
+        )
+
+        psa.do_done()
+        self.assertEqual(
+            psa.state, "draft", "Change state from 'draft' -> 'done' should FAIL!"
+        )
+
+        psa.do_validate()
+        self.assertEqual(
+            psa.state, "validate", "Chage state from 'draft' -> 'validate'"
+        )
+
+        psa.do_reset()
+        self.assertEqual(
+            psa.state,
+            "validate",
+            "Change state from 'validate' -> 'draft' should FAIL!",
+        )
+
+        psa.do_cancel()
+        self.assertEqual(psa.state, "cancel", "Chage state from 'validate' -> 'cancel'")
+
+        psa.do_reset()
+        self.assertEqual(psa.state, "draft", "Chage state from 'cancel' -> 'draft'")
+
+    def test_state_change_from_done(self):
+        psa = self.Amendment.create(
+            {
+                "employee_id": self.eeSally.id,
+                "input_id": self.input_commision.id,
+                "amount": 1,
+                "date": date.today(),
+            }
+        )
+        self.assertEqual(
+            psa.state, "draft", "New payslip amendment is in 'draft' state"
+        )
+
+        psa.do_validate()
+        psa.do_done()
+
+        psa.do_reset()
+        self.assertEqual(
+            psa.state, "done", "Chage state from 'done' -> 'draft' should FAIL!"
+        )
+
+        psa.do_cancel()
+        self.assertEqual(
+            psa.state, "done", "Change state from 'done' -> 'cancel' should FAIL!"
+        )
+
+    def test_done_correct_date(self):
+        dstart = date(2021, 1, 1)
+        dmiddle = date(2021, 1, 15)
+        dend = date(2021, 1, 31)
+        psa = self.Amendment.create(
+            {
+                "employee_id": self.eeSally.id,
+                "input_id": self.input_commision.id,
+                "amount": 100,
+                "date": dmiddle,
+            }
+        )
+        psa.do_validate()
+        cc = self.create_contract(self.eeSally.id, "draft", "done", start=dstart)
+        self.apply_contract_cron()
+        slip = self.Payslip.create(
+            {
+                "name": "A Payslip",
+                "employee_id": self.eeSally.id,
+                "date_from": dstart,
+                "date_to": dend,
+            }
+        )
+        slip.onchange_employee()
+
+        self.assertIn(self.rule_commision, cc.struct_id.rule_ids)
+
+        input_lines = slip.input_line_ids.filtered(lambda self: self.code == "SALECOM")
+        self.assertEqual(
+            len(input_lines), 1, "There must be a payslip input line for SALECOM"
+        )
+
+        _res = fields.Float.compare(input_lines[0].amount, 100.00, precision_digits=2)
+        self.assertEqual(
+            _res, 0, "The Input amount should be equal to the payslip amendment"
+        )
+        self.assertEqual(
+            psa.state, "done", "The payslip amendment must be in 'done' state"
+        )
+
+    def test_date_out_of_bounds(self):
+        dstart = date(2021, 1, 1)
+        dpsa = date(2021, 2, 1)
+        dend = date(2021, 1, 31)
+        psa = self.Amendment.create(
+            {
+                "employee_id": self.eeSally.id,
+                "input_id": self.input_commision.id,
+                "amount": 100,
+                "date": dpsa,
+            }
+        )
+        psa.do_validate()
+        cc = self.create_contract(self.eeSally.id, "draft", "done", start=dstart)
+        self.apply_contract_cron()
+        slip = self.Payslip.create(
+            {
+                "name": "A Payslip",
+                "employee_id": self.eeSally.id,
+                "date_from": dstart,
+                "date_to": dend,
+            }
+        )
+        slip.onchange_employee()
+
+        self.assertIn(self.rule_commision, cc.struct_id.rule_ids)
+
+        input_lines = slip.input_line_ids.filtered(lambda self: self.code == "SALECOM")
+        self.assertEqual(
+            len(input_lines), 1, "There must be a payslip input line for SALECOM"
+        )
+
+        _res = fields.Float.compare(input_lines[0].amount, 0.00, precision_digits=2)
+        self.assertEqual(_res, 0, "The Input amount should 0")
+        self.assertEqual(
+            psa.state, "validate", "The payslip amendment must be in 'validate' state"
+        )
+
+    def test_done_multiple_amendments(self):
+        dpsa1 = date(2021, 1, 15)
+        dpsa2 = date(2021, 1, 31)
+        psa1 = self.Amendment.create(
+            {
+                "employee_id": self.eeSally.id,
+                "input_id": self.input_commision.id,
+                "amount": 100,
+                "date": dpsa1,
+            }
+        )
+        psa1.do_validate()
+        psa2 = self.Amendment.create(
+            {
+                "employee_id": self.eeSally.id,
+                "input_id": self.input_commision.id,
+                "amount": 100,
+                "date": dpsa2,
+            }
+        )
+        psa2.do_validate()
+        self.assertEqual(psa1.state, "validate", "Amendment 1 is in state: 'validate'")
+        self.assertEqual(psa2.state, "validate", "Amendment 2 is in state: 'validate'")
+        dstart = date(2021, 1, 1)
+        dend = date(2021, 1, 31)
+        self.create_contract(self.eeSally.id, "draft", "done", start=dstart)
+        self.apply_contract_cron()
+        slip = self.Payslip.create(
+            {
+                "name": "A Payslip",
+                "employee_id": self.eeSally.id,
+                "date_from": dstart,
+                "date_to": dend,
+            }
+        )
+        slip.onchange_employee()
+
+        input_lines = slip.input_line_ids.filtered(lambda self: self.code == "SALECOM")
+        _res = fields.Float.compare(input_lines[0].amount, 200.00, precision_digits=2)
+        self.assertEqual(
+            _res,
+            0,
+            "The Input amount should be equal to the sum of the amendments 200.00",
+        )
+        self.assertEqual(
+            psa1.state, "done", "The payslip amendment (1) must be in 'done' state"
+        )
+        self.assertEqual(
+            psa2.state, "done", "The payslip amendment (2) must be in 'done' state"
+        )
diff --git a/payroll_payslip_amendment/views/hr_payslip_amendment_view.xml b/payroll_payslip_amendment/views/hr_payslip_amendment_view.xml
new file mode 100644
index 00000000..6713787c
--- /dev/null
+++ b/payroll_payslip_amendment/views/hr_payslip_amendment_view.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+
+        <!-- Pay Slip Amendment -->
+
+        <record id="view_payslip_amendment_tree" model="ir.ui.view">
+            <field name="name">hr.payslip.amendment.tree</field>
+            <field name="model">hr.payslip.amendment</field>
+            <field name="arch" type="xml">
+                <tree string="Pay Slip Amendments">
+                    <field name="employee_id" />
+                    <field name="input_id" />
+                    <field name="date" />
+                    <field name="amount" />
+                    <field name="state" />
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_payslip_amendment_form" model="ir.ui.view">
+            <field name="name">hr.payslip.amendment.form</field>
+            <field name="model">hr.payslip.amendment</field>
+            <field name="arch" type="xml">
+                <form string="Pay Slip Amendment">
+                    <header>
+                        <button
+                            name="do_validate"
+                            type="object"
+                            states="draft"
+                            class="oe_highlight"
+                            string="Confirm"
+                        />
+                        <button
+                            name="do_cancel"
+                            type="object"
+                            states="draft,validate"
+                            class="oe_highlight"
+                            string="Cancel"
+                        />
+                        <button
+                            name="do_reset"
+                            type="object"
+                            states="cancel"
+                            class="oe_highlight"
+                            string="Set to Draft"
+                        />
+                        <field name="state" widget="statusbar" />
+                    </header>
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="employee_id" />
+                                <field name="input_id" widget="selection" />
+                                <field name="amount" />
+                            </group>
+                            <group>
+                                <field name="date" />
+                            </group>
+                            <newline />
+                            <group string="Note">
+                                <field
+                                    name="note"
+                                    nolabel="1"
+                                    placeholder="Explain the reason for the amendment..."
+                                />
+                            </group>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+        <record id="action_payslip_amendment" model="ir.actions.act_window">
+            <field name="name">Pay Slip Amendments</field>
+            <field name="res_model">hr.payslip.amendment</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem
+            action="action_payslip_amendment"
+            id="menu_payslip_amendment"
+            parent="payroll.payroll_menu_root"
+            groups="payroll.group_payroll_user"
+            sequence="50"
+        />
+
+    </data>
+</odoo>
diff --git a/payroll_payslip_amendment_contract_status/README.rst b/payroll_payslip_amendment_contract_status/README.rst
new file mode 100644
index 00000000..91679f14
--- /dev/null
+++ b/payroll_payslip_amendment_contract_status/README.rst
@@ -0,0 +1,55 @@
+=====================================
+Payslip Amendment with Contract State
+=====================================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:13c4ce5da93d9cafa324a4309c4e6269baebf443ed5a5a3469d469fb2c83c57f
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_payslip_amendment_contract_status
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+This module links Payslip Amendments and Employee contract states to take into account multiple consecutive contracts within the payslip start and end dates.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_payslip_amendment_contract_status%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_payslip_amendment_contract_status>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/payroll_payslip_amendment_contract_status/__init__.py b/payroll_payslip_amendment_contract_status/__init__.py
new file mode 100644
index 00000000..0cfb63e1
--- /dev/null
+++ b/payroll_payslip_amendment_contract_status/__init__.py
@@ -0,0 +1,2 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
diff --git a/payroll_payslip_amendment_contract_status/__manifest__.py b/payroll_payslip_amendment_contract_status/__manifest__.py
new file mode 100644
index 00000000..170c1480
--- /dev/null
+++ b/payroll_payslip_amendment_contract_status/__manifest__.py
@@ -0,0 +1,19 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Payslip Amendment with Contract State",
+    "summary": "Link payslip amendments with the employee contract state.",
+    "version": "15.0.1.0.0",
+    "category": "Payroll",
+    "images": ["static/src/img/main_screenshot.png"],
+    "license": "AGPL-3",
+    "author": "TREVI Software",
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "hr_contract_status",
+        "payroll_payslip_amendment",
+    ],
+    "data": [],
+    "installable": True,
+}
diff --git a/payroll_payslip_amendment_contract_status/i18n/payroll_payslip_amendment_contract_status.pot b/payroll_payslip_amendment_contract_status/i18n/payroll_payslip_amendment_contract_status.pot
new file mode 100644
index 00000000..4d8b20f9
--- /dev/null
+++ b/payroll_payslip_amendment_contract_status/i18n/payroll_payslip_amendment_contract_status.pot
@@ -0,0 +1,13 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
diff --git a/payroll_payslip_amendment_contract_status/readme/DESCRIPTION.rst b/payroll_payslip_amendment_contract_status/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..806eb45f
--- /dev/null
+++ b/payroll_payslip_amendment_contract_status/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+This module links Payslip Amendments and Employee contract states to take into account multiple consecutive contracts within the payslip start and end dates.
diff --git a/payroll_payslip_amendment_contract_status/static/description/icon.png b/payroll_payslip_amendment_contract_status/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/payroll_payslip_amendment_contract_status/static/description/icon.png differ
diff --git a/payroll_payslip_amendment_contract_status/static/description/index.html b/payroll_payslip_amendment_contract_status/static/description/index.html
new file mode 100644
index 00000000..a3f63a28
--- /dev/null
+++ b/payroll_payslip_amendment_contract_status/static/description/index.html
@@ -0,0 +1,409 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Payslip Amendment with Contract State</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="payslip-amendment-with-contract-state">
+<h1 class="title">Payslip Amendment with Contract State</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:13c4ce5da93d9cafa324a4309c4e6269baebf443ed5a5a3469d469fb2c83c57f
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_payslip_amendment_contract_status"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<p>This module links Payslip Amendments and Employee contract states to take into account multiple consecutive contracts within the payslip start and end dates.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-4">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_payslip_amendment_contract_status%0Aversion:%2014.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="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>TREVI Software</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-4">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_payslip_amendment_contract_status">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/payroll_payslip_amendment_contract_status/static/src/img/main_screenshot.png b/payroll_payslip_amendment_contract_status/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/payroll_payslip_amendment_contract_status/static/src/img/main_screenshot.png differ
diff --git a/payroll_payslip_amendment_contract_status/tests/__init__.py b/payroll_payslip_amendment_contract_status/tests/__init__.py
new file mode 100644
index 00000000..a1d40677
--- /dev/null
+++ b/payroll_payslip_amendment_contract_status/tests/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import test_payslip_amendment
diff --git a/payroll_payslip_amendment_contract_status/tests/test_payslip_amendment.py b/payroll_payslip_amendment_contract_status/tests/test_payslip_amendment.py
new file mode 100644
index 00000000..4bde1eef
--- /dev/null
+++ b/payroll_payslip_amendment_contract_status/tests/test_payslip_amendment.py
@@ -0,0 +1,122 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import date
+
+from dateutil.relativedelta import relativedelta
+
+from odoo import fields
+from odoo.tests import common
+
+
+class TestPayslipAmendment(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super(TestPayslipAmendment, cls).setUpClass()
+
+        cls.Payslip = cls.env["hr.payslip"]
+        cls.Amendment = cls.env["hr.payslip.amendment"]
+
+        cls.eeSally = cls.env["hr.employee"].create({"name": "Sally"})
+
+        cls.rule_commision = cls.env["hr.salary.rule"].create(
+            {
+                "name": "Commission",
+                "code": "COMM",
+                "category_id": cls.env.ref("payroll.ALW").id,
+                "sequence": 17,
+                "amount_select": "code",
+                "amount_python_compute": "result = inputs.SALECOM.amount",
+            }
+        )
+        cls.input_commision = cls.env["hr.rule.input"].create(
+            {
+                "name": "Sales Commission Input",
+                "code": "SALECOM",
+                "input_id": cls.rule_commision.id,
+            }
+        )
+
+        cls.pay_struct = cls.env.ref("payroll.structure_base")
+        cls.pay_struct.write({"rule_ids": [(4, cls.rule_commision.id)]})
+
+    def create_contract(
+        self, eid, state, kanban_state, start=None, end=None, trial_end=None
+    ):
+        if start is None:
+            start = date.today()
+        return self.env["hr.contract"].create(
+            {
+                "name": "Contract",
+                "employee_id": eid,
+                "state": state,
+                "kanban_state": kanban_state,
+                "wage": 1,
+                "date_start": start,
+                "trial_date_end": trial_end,
+                "date_end": end,
+                "struct_id": self.pay_struct.id,
+            }
+        )
+
+    def apply_contract_cron(self):
+        self.env.ref(
+            "hr_contract.ir_cron_data_contract_update_state"
+        ).method_direct_trigger()
+
+    def test_done_2_contracts(self):
+
+        # Setup test
+        #
+        dstart = date(2021, 1, 1)
+        dend = date(2021, 1, 31)
+        dpsa = date(2021, 1, 1)
+        cc1 = self.create_contract(
+            self.eeSally.id, "close", "normal", dstart, dstart + relativedelta(days=10)
+        )
+        cc2 = self.create_contract(
+            self.eeSally.id, "draft", "done", dstart + relativedelta(days=11)
+        )
+        self.apply_contract_cron()
+        self.assertIn(self.rule_commision, cc1.struct_id.rule_ids)
+        self.assertIn(self.rule_commision, cc2.struct_id.rule_ids)
+        psa = self.Amendment.create(
+            {
+                "employee_id": self.eeSally.id,
+                "input_id": self.input_commision.id,
+                "amount": 50,
+                "date": dpsa,
+            }
+        )
+        psa.do_validate()
+
+        # Create payslip
+        slip = self.Payslip.create(
+            {
+                "name": "A Payslip",
+                "employee_id": self.eeSally.id,
+                "date_from": dstart,
+                "date_to": dend,
+            }
+        )
+        slip.onchange_employee()
+
+        input_lines = slip.input_line_ids.filtered(lambda self: self.code == "SALECOM")
+        self.assertEqual(
+            len(input_lines), 2, "There must be TWO payslip input lines for SALECOM"
+        )
+
+        _res1 = fields.Float.compare(input_lines[0].amount, 25.0, precision_digits=2)
+        _res2 = fields.Float.compare(input_lines[1].amount, 25.0, precision_digits=2)
+        self.assertEqual(
+            _res1, 0, "The Input amount should be equal to HALF the payslip amendment"
+        )
+        self.assertEqual(
+            fields.Float.compare(_res1, _res2, precision_digits=2),
+            0,
+            "The Input amounts should be equal to each other",
+        )
+        self.assertEqual(
+            psa.state, "done", "The payslip amendment must be in 'done' state"
+        )
diff --git a/payroll_payslip_dictionary/README.rst b/payroll_payslip_dictionary/README.rst
new file mode 100644
index 00000000..aa8c70d2
--- /dev/null
+++ b/payroll_payslip_dictionary/README.rst
@@ -0,0 +1,93 @@
+==================
+Payslip Dictionary
+==================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:20ded69761833b21ecbe206ce938e3849b2466ec14c15d624f683988c7adafcf
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_payslip_dictionary
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+This module provides additional values that can be used in salary rules. These values are
+available to salary rules in two objects called "payroll" and "current_contract". The values under
+"payroll" are calculated once during payslip processing. The values under "current_contract" are
+calculated just before each contract in the payslip is processed.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Usage
+=====
+
+The new values provided by this module are:
+* payroll.max_weekly_hours - the maximum number of weekly work hours
+* payroll.max_working_days - the maximum number of working days in the period
+* payroll.max_working_hours - the maximum number of working days in the period
+* payroll.seniority - the length of employment calculated in months
+* payroll.contracts.cummulative_ppf - the sum of the payroll period factors of all the contracts
+* current_contract.ppf - the payroll period factor for the contract being processed
+* current_contract.daily_wage - the wage on the contract being processed converted to a daily wage
+* current_contract.hourly_wage - the wage on the contract being processed converted to an hourly wage
+
+The payroll period factor is a decimal denoting the validity period of the contract between the
+start and end dates of the payslip. A factor of 1 means the contract covers the entire
+period of the payslip. A value less than one denotes the percentage of the payslip duration
+covered by the contract. In this case if the payslip is for the period from April 1 to April 30
+and the employee's contract ends on April 15 then the payroll period factor will be 0.5. The
+cummulative_ppf is the sum of all the indvidual contracts' ppf.
+
+Changelog
+=========
+
+14.0.1.1.0 (2022-08-17)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* [FIX] Some functionality from this repo was incorporated into OCA/Payroll. As a result
+  accomodate changes in the dictionary naming scheme.
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_payslip_dictionary%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+* Michael Telahun Makonnen
+
+Other credits
+~~~~~~~~~~~~~
+
+* Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_payslip_dictionary>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/payroll_payslip_dictionary/__init__.py b/payroll_payslip_dictionary/__init__.py
new file mode 100644
index 00000000..86f3c8b1
--- /dev/null
+++ b/payroll_payslip_dictionary/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
diff --git a/payroll_payslip_dictionary/__manifest__.py b/payroll_payslip_dictionary/__manifest__.py
new file mode 100644
index 00000000..ca1ff51f
--- /dev/null
+++ b/payroll_payslip_dictionary/__manifest__.py
@@ -0,0 +1,26 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Payslip Dictionary",
+    "summary": "Dictionary of values that can be used in payslip calculations",
+    "version": "15.0.1.0.0",
+    "category": "Payroll",
+    "images": ["static/src/img/main_screenshot.png"],
+    "author": "TREVI Software, Michael Telahun Makonnen",
+    "license": "AGPL-3",
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "hr_contract",
+        "hr_employee_seniority_months",
+        "payroll",
+        "payroll_default_salary_rules",
+    ],
+    "data": [
+        "data/payroll_payslip_dictionary.xml",
+        "views/res_config_settings_views.xml",
+    ],
+    "demo": ["demo/payroll_demo.xml"],
+    "installable": True,
+}
diff --git a/payroll_payslip_dictionary/data/payroll_payslip_dictionary.xml b/payroll_payslip_dictionary/data/payroll_payslip_dictionary.xml
new file mode 100644
index 00000000..5ddb6061
--- /dev/null
+++ b/payroll_payslip_dictionary/data/payroll_payslip_dictionary.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data noupdate="1">
+
+        <function
+            model="ir.config_parameter"
+            name="set_param"
+            eval="('payroll_payslip_dictionary.working_days_calculation', 'resource_calendar')"
+        />
+
+    </data>
+</odoo>
diff --git a/payroll_payslip_dictionary/demo/payroll_demo.xml b/payroll_payslip_dictionary/demo/payroll_demo.xml
new file mode 100644
index 00000000..587c0359
--- /dev/null
+++ b/payroll_payslip_dictionary/demo/payroll_demo.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <data>
+        <function
+            model="ir.config_parameter"
+            name="set_param"
+            eval="('payroll_payslip_dictionary.daily_max_regular_hours', 8)"
+        />
+        <function
+            model="ir.config_parameter"
+            name="set_param"
+            eval="('payroll_payslip_dictionary.weekly_max_regular_hours', 48)"
+        />
+        <function
+            model="ir.config_parameter"
+            name="set_param"
+            eval="('payroll_payslip_dictionary.monthly_max_working_days', 30)"
+        />
+        <function
+            model="ir.config_parameter"
+            name="set_param"
+            eval="('payroll_payslip_dictionary.work_days_code_max', 'WORK100')"
+        />
+        <function
+            model="ir.config_parameter"
+            name="set_param"
+            eval="('payroll_payslip_dictionary.payroll_code_net', 'NET')"
+        />
+    </data>
+
+</odoo>
diff --git a/payroll_payslip_dictionary/i18n/payroll_payslip_dictionary.pot b/payroll_payslip_dictionary/i18n/payroll_payslip_dictionary.pot
new file mode 100644
index 00000000..0174f1da
--- /dev/null
+++ b/payroll_payslip_dictionary/i18n/payroll_payslip_dictionary.pot
@@ -0,0 +1,129 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* payroll_payslip_dictionary
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: payroll_payslip_dictionary
+#: model:ir.model.fields.selection,name:payroll_payslip_dictionary.selection__res_config_settings__working_days_calculation__calendar
+msgid "Calendar month"
+msgstr ""
+
+#. module: payroll_payslip_dictionary
+#: model:ir.model,name:payroll_payslip_dictionary.model_res_config_settings
+msgid "Config Settings"
+msgstr ""
+
+#. module: payroll_payslip_dictionary
+#: model:ir.model.fields,field_description:payroll_payslip_dictionary.field_res_config_settings__daily_max_regular_hours
+msgid "Daily Max Regular Hours"
+msgstr ""
+
+#. module: payroll_payslip_dictionary
+#: model_terms:ir.ui.view,arch_db:payroll_payslip_dictionary.res_config_settings_view_form
+msgid "Default Values"
+msgstr ""
+
+#. module: payroll_payslip_dictionary
+#: model:ir.model.fields.selection,name:payroll_payslip_dictionary.selection__res_config_settings__working_days_calculation__defaults
+msgid "Defaults"
+msgstr ""
+
+#. module: payroll_payslip_dictionary
+#: model:ir.model.fields,field_description:payroll_payslip_dictionary.field_hr_payslip__display_name
+#: model:ir.model.fields,field_description:payroll_payslip_dictionary.field_res_config_settings__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: payroll_payslip_dictionary
+#: model_terms:ir.ui.view,arch_db:payroll_payslip_dictionary.res_config_settings_view_form
+msgid ""
+"How this field is set will affect the calculated value of salaried "
+"employees' hourly pay."
+msgstr ""
+
+#. module: payroll_payslip_dictionary
+#: model:ir.model.fields,help:payroll_payslip_dictionary.field_res_config_settings__working_days_calculation
+msgid ""
+"How to calculate the working days in a payslip.\n"
+"        Calendar - based on calendar month.\n"
+"        Resource calendar - based on the contract's resource calendar.\n"
+"        Defaults - Use the default values defined here.\n"
+"        "
+msgstr ""
+
+#. module: payroll_payslip_dictionary
+#: model:ir.model.fields,field_description:payroll_payslip_dictionary.field_hr_payslip__id
+#: model:ir.model.fields,field_description:payroll_payslip_dictionary.field_res_config_settings__id
+msgid "ID"
+msgstr ""
+
+#. module: payroll_payslip_dictionary
+#: model_terms:ir.ui.view,arch_db:payroll_payslip_dictionary.res_config_settings_view_form
+msgid ""
+"In the 'worked_days' dictionary, the code used for maximum possible working "
+"days."
+msgstr ""
+
+#. module: payroll_payslip_dictionary
+#: model:ir.model.fields,field_description:payroll_payslip_dictionary.field_hr_payslip____last_update
+#: model:ir.model.fields,field_description:payroll_payslip_dictionary.field_res_config_settings____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: payroll_payslip_dictionary
+#: model_terms:ir.ui.view,arch_db:payroll_payslip_dictionary.res_config_settings_view_form
+msgid ""
+"Maximum possible number of regular working days an employee may work during "
+"a pay period."
+msgstr ""
+
+#. module: payroll_payslip_dictionary
+#: model_terms:ir.ui.view,arch_db:payroll_payslip_dictionary.res_config_settings_view_form
+msgid ""
+"Maximum possible regular working hours an employee may work during the week."
+msgstr ""
+
+#. module: payroll_payslip_dictionary
+#: model:ir.model.fields,field_description:payroll_payslip_dictionary.field_res_config_settings__monthly_max_working_days
+msgid "Monthly Max Working Days"
+msgstr ""
+
+#. module: payroll_payslip_dictionary
+#: model:ir.model,name:payroll_payslip_dictionary.model_hr_payslip
+msgid "Payslip"
+msgstr ""
+
+#. module: payroll_payslip_dictionary
+#: model:ir.model.fields.selection,name:payroll_payslip_dictionary.selection__res_config_settings__working_days_calculation__resource_calendar
+msgid "Resource calendar"
+msgstr ""
+
+#. module: payroll_payslip_dictionary
+#: model:ir.model.fields,field_description:payroll_payslip_dictionary.field_res_config_settings__weekly_max_regular_hours
+msgid "Weekly Max Regular Hours"
+msgstr ""
+
+#. module: payroll_payslip_dictionary
+#: model:ir.model.fields,field_description:payroll_payslip_dictionary.field_res_config_settings__work_days_code_max
+msgid "Work Days Code Max"
+msgstr ""
+
+#. module: payroll_payslip_dictionary
+#: model_terms:ir.ui.view,arch_db:payroll_payslip_dictionary.res_config_settings_view_form
+msgid "Worked Days Codes"
+msgstr ""
+
+#. module: payroll_payslip_dictionary
+#: model:ir.model.fields,field_description:payroll_payslip_dictionary.field_res_config_settings__working_days_calculation
+msgid "Working Days Calculation"
+msgstr ""
diff --git a/payroll_payslip_dictionary/models/__init__.py b/payroll_payslip_dictionary/models/__init__.py
new file mode 100644
index 00000000..e06588f9
--- /dev/null
+++ b/payroll_payslip_dictionary/models/__init__.py
@@ -0,0 +1,6 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import hr_payslip
+from . import res_config_settings
diff --git a/payroll_payslip_dictionary/models/hr_payslip.py b/payroll_payslip_dictionary/models/hr_payslip.py
new file mode 100644
index 00000000..7383db47
--- /dev/null
+++ b/payroll_payslip_dictionary/models/hr_payslip.py
@@ -0,0 +1,354 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from calendar import monthrange
+from datetime import timedelta
+
+from odoo import SUPERUSER_ID, api, models
+
+from odoo.addons.payroll.models.hr_payslip import BaseBrowsableObject
+
+
+class HrPayslip(models.Model):
+
+    _inherit = "hr.payslip"
+
+    @api.model
+    def _get_working_defaults(self):
+        """
+        This method returns the default working hours and days.
+        @return: returns a tuple containing:
+            * regular working hours in a day
+            * working hours per week
+            * number of working days per month
+        """
+
+        IrConfig = self.env["ir.config_parameter"].with_user(SUPERUSER_ID)
+        daily_max_regular_hours = int(
+            IrConfig.get_param("payroll_payslip_dictionary.daily_max_regular_hours")
+        )
+        weekly_max_regular_hours = int(
+            IrConfig.get_param("payroll_payslip_dictionary.weekly_max_regular_hours")
+        )
+        monthly_max_working_days = int(
+            IrConfig.get_param("payroll_payslip_dictionary.monthly_max_working_days")
+        )
+        return (
+            daily_max_regular_hours,
+            weekly_max_regular_hours,
+            monthly_max_working_days,
+        )
+
+    def _get_working_calendar(self, contract):
+
+        return self._get_working_calendar_from_dates(
+            contract, self.date_from, self.date_to
+        )
+
+    def _get_working_calendar_from_dates(self, contract, dStart, dEnd):
+        """
+        This method calculates working hours and days according to dStart and dEnd.
+        @return: returns a tuple containing:
+            * regular working hours in a day
+            * working hours per week
+            * number of working days per month
+        """
+
+        business_days = []
+        weekly_hours = 0
+        daily_hours = (
+            contract.resource_calendar_id.hours_per_day
+            if contract.resource_calendar_id
+            else 8
+        )
+        for att in contract.resource_calendar_id.attendance_ids:
+            weekly_hours += abs(att.hour_to - att.hour_from)
+            if int(att.dayofweek) not in business_days:
+                business_days.append(int(att.dayofweek))
+
+        # XXX - Edge case, please fix if it affects you
+        if contract.resource_calendar_id.two_weeks_calendar:
+            weekly_hours = weekly_hours / 2
+
+        # generate dates in period
+        dates = [dStart + timedelta(idx) for idx in range((dEnd - dStart).days + 1)]
+        # sum up the working days
+        total_days = sum(1 for day in dates if day.weekday() in business_days)
+
+        return (daily_hours, weekly_hours, total_days)
+
+    def _get_end_date(self, contract):
+        """
+        @return: returns False or the end date of the contract if it falls before
+        the end date of the period or the end date of the period otherwise.
+        """
+
+        dcEnd = False
+        if contract.date_end:
+            if contract.date_end <= self.date_to:
+                dcEnd = contract.date_end
+            else:
+                dcEnd = self.date_to
+
+        return dcEnd
+
+    def _ppf_get_contract_max_days(
+        self,
+        contract,
+        wd_calculation,
+        total_days,
+        dContractStart,
+        dContractEnd,
+        dPeriodStart,
+        dPeriodEnd,
+    ):
+        """
+        @return: returns a tuple containing:
+            * the maximum possible working days in this contract
+            * the maximum possible working days for other contracts in this period
+        """
+
+        if wd_calculation == "resource_calendar":
+            contract_days = self._get_working_calendar_from_dates(
+                contract, dContractStart, dContractEnd
+            )[2]
+        else:
+            period_days = (dPeriodEnd - dPeriodStart).days + 1
+            contract_days_ratio = (
+                (dContractEnd - dContractStart).days + 1
+            ) / period_days
+            contract_days = round(total_days * contract_days_ratio)
+        other_max_days = total_days - contract_days
+
+        return (contract_days, other_max_days)
+
+    def _partial_payroll_factor(self, contract, contracts):
+
+        self.ensure_one()
+
+        dcEnd = self._get_end_date(contract)
+
+        # both start and end of contract are out of the bounds of the payslip
+        if contract.date_start <= self.date_from and (
+            not dcEnd or dcEnd >= self.date_to
+        ):
+            return 1
+
+        # One or both start and end of contract are within the bounds of the payslip
+        #
+        dcTempStart = self.date_from
+        dcTempEnd = self.date_to
+        if contract.date_start > self.date_from:
+            dcTempStart = contract.date_start
+        if dcEnd and dcEnd < self.date_to:
+            dcTempEnd = dcEnd
+
+        # Get number of working days in pay period
+        #
+        IrConfig = self.env["ir.config_parameter"].with_user(SUPERUSER_ID)
+        wd_calculation = IrConfig.get_param(
+            "payroll_payslip_dictionary.working_days_calculation"
+        )
+        if wd_calculation == "resource_calendar" and contract.resource_calendar_id:
+            total_days = self._get_working_calendar(contract)[2]
+        elif wd_calculation == "calendar":
+            total_days = monthrange(self.date_from.year, self.date_from.month)[1]
+        else:
+            total_days = self._get_working_defaults()[2]
+
+        # Get maximum number of working days in the contract
+        contract_days, other_days = self._ppf_get_contract_max_days(
+            contract,
+            wd_calculation,
+            total_days,
+            dcTempStart,
+            dcTempEnd,
+            self.date_from,
+            self.date_to,
+        )
+        contracts_total = contract_days + other_days
+
+        # Adjust total days in month based on actual work days. This might
+        # differ from total_days calculated above if, for example, the maximum
+        # working days in multiple contracts add up less than the defaults.
+        #
+        if len(contracts) > 1 and contracts_total < total_days:
+            total_days = contracts_total
+
+        # Adjust the contract days to the calculation that gives the most days
+        # within the bounds of the total possible days.
+        #
+        if contract_days > total_days:
+            contract_days = total_days
+
+        return float(contract_days) / float(total_days)
+
+    def get_dictionary(self, contracts):
+        """
+        @return: returns a dictionary containing:
+            * max_weekly_hours  - the number of weekly working hours
+            * max_working_days  - the number of working days in the period
+            * max_working_hours - the number of working hours in the period
+            * seniority - the number of months of employment
+            * PREVPS
+                exists  - 0 or 1 if the employee had a payslip in the previous period
+                net     - 0 or Net amount received by employee in previous period
+            * CONTRACTS
+                qty     - the number of contracts for this employee in this period
+                cummulative_ppf - sum of PPF of the employee's contracts in this
+                                  period
+        """
+
+        payroll_dict = {
+            "max_weekly_hours": 0,
+            "max_working_days": 0,
+            "max_working_hours": 0,
+            "seniority": 0,
+            "PREVPS": BaseBrowsableObject(
+                {
+                    "exists": 0,
+                    "net": 0,
+                }
+            ),
+        }
+        if len(contracts) == 0:
+            return payroll_dict
+        contract = contracts[0]
+
+        # Calculate maximum values
+        max_weekly_hours = 0
+        max_working_days = 0
+        IrConfig = self.env["ir.config_parameter"].with_user(SUPERUSER_ID)
+        wd_calculation = IrConfig.get_param(
+            "payroll_payslip_dictionary.working_days_calculation"
+        )
+        if wd_calculation == "resource_calendar" and contract.resource_calendar_id:
+            daily_hrs, max_weekly_hours, max_working_days = self._get_working_calendar(
+                contract
+            )
+        elif wd_calculation == "calendar":
+            daily_hrs, max_weekly_hours, max_working_days = self._get_working_defaults()
+            max_working_days = monthrange(self.date_from.year, self.date_from.month)[1]
+        else:
+            daily_hrs, max_weekly_hours, max_working_days = self._get_working_defaults()
+        payroll_dict["max_weekly_hours"] = max_weekly_hours
+        payroll_dict["max_working_days"] = max_working_days
+        payroll_dict["max_working_hours"] = max_working_days * daily_hrs
+
+        # Calculate seniority
+        if self.employee_id:
+            payroll_dict["seniority"] = self.employee_id.get_months_service_to_date(
+                self.date_to
+            )
+
+        # Calculate net amount of previous payslip
+        ps_ids = self.env["hr.payslip"].search(
+            [("employee_id", "=", self.employee_id.id), ("state", "=", "done")],
+            order="date_from desc",
+            limit=1,
+        )
+
+        if len(ps_ids) > 0:
+            # Get payroll code of Net salary rule
+            code_net = IrConfig.get_param("payroll_default_salary_rules.rule_net")
+
+            ps = ps_ids[0]
+            payroll_dict["PREVPS"].exists = 1
+            total = 0
+            for line in ps.line_ids:
+                if line.salary_rule_id.code == code_net:
+                    total += line.total
+            payroll_dict["PREVPS"].net = total
+
+        return payroll_dict
+
+    def get_contract_dictionary(self, contract, contracts):
+        """
+        @return: returns a dictionary containing:
+            * ppf - payroll period factor: the percentage of the pay period
+                    for the contract. A value of 1 means the contract covers
+                    the entire payroll period.
+            * hourly_wage - the wage on the contract converted to an hourly rate
+            * daily_wage  - the wage on the contract converted to a daily rate
+        """
+
+        self.ensure_one()
+        IrConfig = self.env["ir.config_parameter"].with_user(SUPERUSER_ID)
+        res = {"ppf": 0, "hourly_wage": 0.0, "daily_wage": 0.0}
+
+        # Calculate percentage of pay period in which contract lies
+        if contract:
+            payroll_decimal_places = 2
+            decimal_places = 4
+            payroll_ref = self.with_user(SUPERUSER_ID).env.ref(
+                "payroll.decimal_payroll"
+            )
+            if payroll_ref:
+                payroll_decimal_places = payroll_ref.digits
+            payroll_rate_ref = self.with_user(SUPERUSER_ID).env.ref(
+                "payroll.decimal_payroll_rate"
+            )
+            if payroll_rate_ref:
+                decimal_places = payroll_rate_ref.digits
+            res["ppf"] = round(
+                self._partial_payroll_factor(contract, contracts),
+                decimal_places,
+            )
+
+            # Calculate hourly and daily rates
+            daily_hrs = 0
+            total_days = 0
+            wd_calculation = IrConfig.get_param(
+                "payroll_payslip_dictionary.working_days_calculation"
+            )
+            if wd_calculation == "resource_calendar" and contract.resource_calendar_id:
+                daily_hrs, _weekly_hrs, total_days = self._get_working_calendar(
+                    contract
+                )
+            elif wd_calculation == "calendar":
+                daily_hrs, _weekly_hrs, total_days = self._get_working_defaults()
+                total_days = monthrange(self.date_from.year, self.date_from.month)[1]
+            else:
+                daily_hrs, _weekly_hrs, total_days = self._get_working_defaults()
+            res["daily_wage"] = round(
+                contract.wage / total_days, payroll_decimal_places
+            )
+            res["hourly_wage"] = round(
+                contract.wage / total_days / daily_hrs, payroll_decimal_places
+            )
+
+        return res
+
+    def get_current_contract_dict(self, contract, contracts):
+        """Refer in salary rules as:
+        * current_contract.ppf
+        * current_contract.daily_wage
+        * current_contract.hourly_wage
+        """
+        res = super().get_current_contract_dict(contract, contracts)
+        res.update(self.get_contract_dictionary(contract, contracts))
+        return res
+
+    def _init_payroll_dict_contracts(self):
+        res = super()._init_payroll_dict_contracts()
+        res.update({"cummulative_ppf": 0})
+        return res
+
+    def get_payroll_dict(self, contracts):
+        """Refer in salary rules as:
+        * payroll.contracts.cummulative_ppf
+        * payroll.max_weekly_hours
+        * payroll.max_working_days
+        * payroll.max_working_hours
+        * payroll.seniority
+        * payroll.PREVPS.exists
+        * payroll.PREVPS.net
+        """
+        res = super().get_payroll_dict(contracts)
+        res.update(self.get_dictionary(contracts))
+        ppf_total = 0
+        for c in contracts:
+            ppf_total += self._partial_payroll_factor(c, contracts)
+        res["contracts"].cummulative_ppf = ppf_total > 1 and 1 or ppf_total
+        return res
diff --git a/payroll_payslip_dictionary/models/res_config_settings.py b/payroll_payslip_dictionary/models/res_config_settings.py
new file mode 100644
index 00000000..835a2691
--- /dev/null
+++ b/payroll_payslip_dictionary/models/res_config_settings.py
@@ -0,0 +1,35 @@
+# 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 ResConfigSettings(models.TransientModel):
+
+    _inherit = "res.config.settings"
+
+    work_days_code_max = fields.Char(
+        config_parameter="payroll_payslip_dictionary.work_days_code_max"
+    )
+    working_days_calculation = fields.Selection(
+        selection=[
+            ("calendar", "Calendar month"),
+            ("resource_calendar", "Resource calendar"),
+            ("defaults", "Defaults"),
+        ],
+        help="""How to calculate the working days in a payslip.
+        Calendar - based on calendar month.
+        Resource calendar - based on the contract's resource calendar.
+        Defaults - Use the default values defined here.
+        """,
+        config_parameter="payroll_payslip_dictionary.working_days_calculation",
+    )
+    daily_max_regular_hours = fields.Integer(
+        config_parameter="payroll_payslip_dictionary.daily_max_regular_hours"
+    )
+    weekly_max_regular_hours = fields.Integer(
+        config_parameter="payroll_payslip_dictionary.weekly_max_regular_hours"
+    )
+    monthly_max_working_days = fields.Integer(
+        config_parameter="payroll_payslip_dictionary.monthly_max_working_days"
+    )
diff --git a/payroll_payslip_dictionary/readme/CREDITS.rst b/payroll_payslip_dictionary/readme/CREDITS.rst
new file mode 100644
index 00000000..d264bc7e
--- /dev/null
+++ b/payroll_payslip_dictionary/readme/CREDITS.rst
@@ -0,0 +1 @@
+* Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/payroll_payslip_dictionary/readme/DESCRIPTION.rst b/payroll_payslip_dictionary/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..369066cf
--- /dev/null
+++ b/payroll_payslip_dictionary/readme/DESCRIPTION.rst
@@ -0,0 +1,4 @@
+This module provides additional values that can be used in salary rules. These values are
+available to salary rules in two objects called "payroll" and "current_contract". The values under
+"payroll" are calculated once during payslip processing. The values under "current_contract" are
+calculated just before each contract in the payslip is processed.
diff --git a/payroll_payslip_dictionary/readme/HISTORY.rst b/payroll_payslip_dictionary/readme/HISTORY.rst
new file mode 100644
index 00000000..0cce287d
--- /dev/null
+++ b/payroll_payslip_dictionary/readme/HISTORY.rst
@@ -0,0 +1,5 @@
+14.0.1.1.0 (2022-08-17)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* [FIX] Some functionality from this repo was incorporated into OCA/Payroll. As a result
+  accomodate changes in the dictionary naming scheme.
diff --git a/payroll_payslip_dictionary/readme/USAGE.rst b/payroll_payslip_dictionary/readme/USAGE.rst
new file mode 100644
index 00000000..6640061f
--- /dev/null
+++ b/payroll_payslip_dictionary/readme/USAGE.rst
@@ -0,0 +1,16 @@
+The new values provided by this module are:
+* payroll.max_weekly_hours - the maximum number of weekly work hours
+* payroll.max_working_days - the maximum number of working days in the period
+* payroll.max_working_hours - the maximum number of working days in the period
+* payroll.seniority - the length of employment calculated in months
+* payroll.contracts.cummulative_ppf - the sum of the payroll period factors of all the contracts
+* current_contract.ppf - the payroll period factor for the contract being processed
+* current_contract.daily_wage - the wage on the contract being processed converted to a daily wage
+* current_contract.hourly_wage - the wage on the contract being processed converted to an hourly wage
+
+The payroll period factor is a decimal denoting the validity period of the contract between the
+start and end dates of the payslip. A factor of 1 means the contract covers the entire
+period of the payslip. A value less than one denotes the percentage of the payslip duration
+covered by the contract. In this case if the payslip is for the period from April 1 to April 30
+and the employee's contract ends on April 15 then the payroll period factor will be 0.5. The
+cummulative_ppf is the sum of all the indvidual contracts' ppf.
diff --git a/payroll_payslip_dictionary/static/description/icon.png b/payroll_payslip_dictionary/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/payroll_payslip_dictionary/static/description/icon.png differ
diff --git a/payroll_payslip_dictionary/static/description/index.html b/payroll_payslip_dictionary/static/description/index.html
new file mode 100644
index 00000000..e99e33ed
--- /dev/null
+++ b/payroll_payslip_dictionary/static/description/index.html
@@ -0,0 +1,453 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Payslip Dictionary</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="payslip-dictionary">
+<h1 class="title">Payslip Dictionary</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:20ded69761833b21ecbe206ce938e3849b2466ec14c15d624f683988c7adafcf
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_payslip_dictionary"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<p>This module provides additional values that can be used in salary rules. These values are
+available to salary rules in two objects called “payroll” and “current_contract”. The values under
+“payroll” are calculated once during payslip processing. The values under “current_contract” are
+calculated just before each contract in the payslip is processed.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#usage" id="toc-entry-1">Usage</a></li>
+<li><a class="reference internal" href="#changelog" id="toc-entry-2">Changelog</a><ul>
+<li><a class="reference internal" href="#section-1" id="toc-entry-3">14.0.1.1.0 (2022-08-17)</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-4">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-5">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-6">Authors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-7">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-8">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="usage">
+<h1><a class="toc-backref" href="#toc-entry-1">Usage</a></h1>
+<p>The new values provided by this module are:
+* payroll.max_weekly_hours - the maximum number of weekly work hours
+* payroll.max_working_days - the maximum number of working days in the period
+* payroll.max_working_hours - the maximum number of working days in the period
+* payroll.seniority - the length of employment calculated in months
+* payroll.contracts.cummulative_ppf - the sum of the payroll period factors of all the contracts
+* current_contract.ppf - the payroll period factor for the contract being processed
+* current_contract.daily_wage - the wage on the contract being processed converted to a daily wage
+* current_contract.hourly_wage - the wage on the contract being processed converted to an hourly wage</p>
+<p>The payroll period factor is a decimal denoting the validity period of the contract between the
+start and end dates of the payslip. A factor of 1 means the contract covers the entire
+period of the payslip. A value less than one denotes the percentage of the payslip duration
+covered by the contract. In this case if the payslip is for the period from April 1 to April 30
+and the employee’s contract ends on April 15 then the payroll period factor will be 0.5. The
+cummulative_ppf is the sum of all the indvidual contracts’ ppf.</p>
+</div>
+<div class="section" id="changelog">
+<h1><a class="toc-backref" href="#toc-entry-2">Changelog</a></h1>
+<div class="section" id="section-1">
+<h2><a class="toc-backref" href="#toc-entry-3">14.0.1.1.0 (2022-08-17)</a></h2>
+<ul class="simple">
+<li>[FIX] Some functionality from this repo was incorporated into OCA/Payroll. As a result
+accomodate changes in the dictionary naming scheme.</li>
+</ul>
+</div>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-4">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_payslip_dictionary%0Aversion:%2014.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="#toc-entry-5">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-6">Authors</a></h2>
+<ul class="simple">
+<li>TREVI Software</li>
+<li>Michael Telahun Makonnen</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-7">Other credits</a></h2>
+<ul class="simple">
+<li>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-8">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_payslip_dictionary">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/payroll_payslip_dictionary/static/src/img/main_screenshot.png b/payroll_payslip_dictionary/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/payroll_payslip_dictionary/static/src/img/main_screenshot.png differ
diff --git a/payroll_payslip_dictionary/tests/__init__.py b/payroll_payslip_dictionary/tests/__init__.py
new file mode 100644
index 00000000..3792d118
--- /dev/null
+++ b/payroll_payslip_dictionary/tests/__init__.py
@@ -0,0 +1,7 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import test_hr_payslip_wd_calc_defaults
+from . import test_hr_payslip_wd_calc_calendar
+from . import test_hr_payslip_wd_calc_resource_calendar
+from . import test_hr_payslip_dictionary
diff --git a/payroll_payslip_dictionary/tests/test_common.py b/payroll_payslip_dictionary/tests/test_common.py
new file mode 100644
index 00000000..f2bd21c5
--- /dev/null
+++ b/payroll_payslip_dictionary/tests/test_common.py
@@ -0,0 +1,91 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+
+from odoo.addons.payroll.tests.common import TestPayslipBase
+
+
+class TestHrPayslip(TestPayslipBase):
+    def setUp(self):
+        super().setUp()
+
+        self.resource_calendar_std = self.env.ref("resource.resource_calendar_std")
+
+        # I modify the 'BASIC' salary rule to take into
+        # consideration the Payroll Period Factor
+        self.rule_basic.amount_python_compute = (
+            "result = contract.wage * current_contract.ppf"
+        )
+
+        # I create a simple salary structure
+        self.basic_pay_structure = self.PayrollStructure.create(
+            {
+                "name": "Salary Structure Basic",
+                "code": "BC",
+                "company_id": self.ref("base.main_company"),
+                "rule_ids": [
+                    (4, self.rule_basic.id),
+                    (4, self.rule_gross.id),
+                    (4, self.rule_net.id),
+                ],
+            }
+        )
+        self.test_rule = self.SalaryRule.create(
+            {
+                "name": "Test rule",
+                "code": "TEST",
+                "category_id": self.categ_alw.id,
+                "sequence": 5,
+                "amount_select": "code",
+                "amount_python_compute": "result=contract.wage",
+            }
+        )
+        self.basic_pay_structure.write({"rule_ids": [(4, self.test_rule.id)]})
+
+        # I create a new employee "Sally"
+        self.alice_emp = self.env["hr.employee"].create(
+            {
+                "name": "Sally",
+                "gender": "female",
+                "birthday": "1984-05-01",
+                "country_id": self.ref("base.be"),
+                "department_id": self.dept_rd.id,
+            }
+        )
+
+        self.month_days = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
+
+    def leap_year(self, y):
+        if y % 400 == 0:
+            return True
+        if y % 100 == 0:
+            return False
+        if y % 4 == 0:
+            return True
+        else:
+            return False
+
+    def create_contract(self, start, end, employee, wage, name=False):
+        return self.Contract.create(
+            {
+                "date_start": start,
+                "date_end": end,
+                "name": name if name else f"Contract for {employee.name}",
+                "wage": wage,
+                "employee_id": employee.id,
+                "struct_id": self.basic_pay_structure.id,
+                "kanban_state": "done",
+                "resource_calendar_id": self.resource_calendar_std.id,
+            }
+        )
+
+    def create_payslip(self, start, end, employee):
+
+        return self.Payslip.create(
+            {
+                "name": f"Payslip of {employee.name}",
+                "employee_id": employee.id,
+                "date_from": start,
+                "date_to": end,
+            }
+        )
diff --git a/payroll_payslip_dictionary/tests/test_hr_payslip_dictionary.py b/payroll_payslip_dictionary/tests/test_hr_payslip_dictionary.py
new file mode 100644
index 00000000..7950568e
--- /dev/null
+++ b/payroll_payslip_dictionary/tests/test_hr_payslip_dictionary.py
@@ -0,0 +1,379 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import date
+
+from dateutil.relativedelta import relativedelta
+
+from odoo import fields
+
+from . import test_common
+
+
+class TestHrPayslip(test_common.TestHrPayslip):
+    def setUp(self):
+        super().setUp()
+
+        self.env["ir.config_parameter"].set_param(
+            "payroll_payslip_dictionary.daily_max_regular_hours", "8"
+        )
+        self.env["ir.config_parameter"].set_param(
+            "payroll_payslip_dictionary.weekly_max_regular_hours", "48"
+        )
+        self.env["ir.config_parameter"].set_param(
+            "payroll_payslip_dictionary.monthly_max_working_days", "30"
+        )
+        self.env["ir.config_parameter"].set_param(
+            "payroll_payslip_dictionary.working_days_calculation", "defaults"
+        )
+
+    def tearDown(self):
+        super().tearDown()
+
+        self.env["ir.config_parameter"].set_param(
+            "payroll_payslip_dictionary.daily_max_regular_hours", "8"
+        )
+        self.env["ir.config_parameter"].set_param(
+            "payroll_payslip_dictionary.weekly_max_regular_hours", "48"
+        )
+        self.env["ir.config_parameter"].set_param(
+            "payroll_payslip_dictionary.monthly_max_working_days", "30"
+        )
+        self.env["ir.config_parameter"].set_param(
+            "payroll_payslip_dictionary.working_days_calculation", "defaults"
+        )
+
+    def test_seniority(self):
+
+        # I set the test rule to detect seniority in dictionary
+        self.test_rule.amount_python_compute = "result = payroll.seniority"
+
+        # I create a contract for "Richard"
+        contract_start = date(2022, 1, 1)
+        start = date(2022, 4, 1)
+        end = date(2022, 4, 30)
+        self.create_contract(contract_start, False, self.alice_emp, 5000.0)
+
+        self.apply_contract_cron()
+
+        # I create an employee Payslip and process it
+        alice_payslip = self.create_payslip(start, end, self.alice_emp)
+        alice_payslip.compute_sheet()
+
+        # Calculate seniority manually
+        delta = abs(relativedelta(contract_start, end))
+        m = 3  # April
+        days_in_month = self.month_days[m]
+        months = round(
+            float(delta.years * 12 + delta.months) + float(delta.days / days_in_month),
+            2,
+        )
+
+        line = alice_payslip.line_ids.filtered(lambda l: l.code == "TEST")
+        self.assertEqual(len(line), 1, "I found the Test line")
+        self.assertEqual(
+            line[0].amount,
+            months,
+            "The calculated dictionary value 'seniority' is 4 months",
+        )
+
+    def test_dictionary_max_hrs(self):
+
+        # I set the test rule to detect seniority in dictionary
+        self.test_rule.amount_python_compute = "result = payroll.max_working_hours"
+
+        # I create a contract for "Richard"
+        contract_start = date(2022, 1, 1)
+        start = date(2022, 4, 1)
+        end = date(2022, 4, 30)
+        self.create_contract(
+            contract_start, start + relativedelta(days=14), self.alice_emp, 5000.0
+        )
+
+        # I create a second contract for "Richard"
+        self.create_contract(
+            start + relativedelta(days=15), False, self.alice_emp, 5000.0
+        )
+
+        self.apply_contract_cron()
+
+        # I create an employee Payslip and process it
+        alice_payslip = self.create_payslip(start, end, self.alice_emp)
+        alice_payslip.compute_sheet()
+
+        line = alice_payslip.line_ids.filtered(lambda l: l.code == "TEST")
+        self.assertEqual(len(line), 2, "I found the Test lines")
+        self.assertEqual(
+            line[0].amount,
+            240.0,
+            "The calculated dictionary value 'max_working_hours' is 240",
+        )
+
+    def test_dictionary_max_days(self):
+
+        # I set the test rule to detect seniority in dictionary
+        self.test_rule.amount_python_compute = "result = payroll.max_working_days"
+
+        # I create a contract for "Richard"
+        contract_start = date(2022, 1, 1)
+        start = date(2022, 4, 1)
+        end = date(2022, 4, 30)
+        self.create_contract(
+            contract_start, start + relativedelta(days=14), self.alice_emp, 5000.0
+        )
+
+        # I create a second contract for "Richard"
+        self.create_contract(
+            start + relativedelta(days=15), False, self.alice_emp, 5000.0
+        )
+
+        self.apply_contract_cron()
+
+        # I create an employee Payslip and process it
+        alice_payslip = self.create_payslip(start, end, self.alice_emp)
+        alice_payslip.compute_sheet()
+
+        line = alice_payslip.line_ids.filtered(lambda l: l.code == "TEST")
+        self.assertEqual(len(line), 2, "I found the Test lines")
+        self.assertEqual(
+            line[0].amount,
+            30.0,
+            "The calculated dictionary value 'max_working_days' is 30",
+        )
+
+    def test_dictionary_weekly_hrs(self):
+
+        # I set the test rule to detect seniority in dictionary
+        self.test_rule.amount_python_compute = "result = payroll.max_weekly_hours"
+
+        # I create a contract for "Richard"
+        contract_start = date(2022, 1, 1)
+        start = date(2022, 4, 1)
+        end = date(2022, 4, 30)
+        self.create_contract(
+            contract_start, start + relativedelta(days=14), self.alice_emp, 5000.0
+        )
+
+        # I create a second contract for "Richard"
+        self.create_contract(
+            start + relativedelta(days=15), False, self.alice_emp, 5000.0
+        )
+
+        self.apply_contract_cron()
+
+        # I create an employee Payslip and process it
+        alice_payslip = self.create_payslip(start, end, self.alice_emp)
+        alice_payslip.compute_sheet()
+
+        line = alice_payslip.line_ids.filtered(lambda l: l.code == "TEST")
+        self.assertEqual(len(line), 2, "I found the Test lines")
+        self.assertEqual(
+            line[0].amount,
+            48.0,
+            "The calculated dictionary value 'max_weekly_hours' is 48",
+        )
+
+    def test_contract_qty(self):
+
+        # I set the test rule to detect seniority in dictionary
+        self.test_rule.amount_python_compute = "result = payroll.contracts.count"
+
+        # I create a contract for "Richard"
+        contract_start = date(2022, 1, 1)
+        start = date(2022, 4, 1)
+        end = date(2022, 4, 30)
+        self.create_contract(
+            contract_start, start + relativedelta(days=14), self.alice_emp, 5000.0
+        )
+
+        # I create a second contract for "Richard"
+        self.create_contract(
+            start + relativedelta(days=15), False, self.alice_emp, 5000.0
+        )
+
+        self.apply_contract_cron()
+
+        # I create an employee Payslip and process it
+        alice_payslip = self.create_payslip(start, end, self.alice_emp)
+        alice_payslip.compute_sheet()
+
+        line = alice_payslip.line_ids.filtered(lambda l: l.code == "TEST")
+        self.assertEqual(len(line), 2, "I found the Test lines")
+        self.assertEqual(
+            line[0].amount,
+            2.0,
+            "The calculated dictionary value 'payroll.contracts.qty' is 2",
+        )
+
+    def test_contract_cummulative_ppf(self):
+
+        # I set the test rule to detect seniority in dictionary
+        self.test_rule.amount_python_compute = (
+            "result = payroll.contracts.cummulative_ppf"
+        )
+
+        # I create a contract for "Richard"
+        contract_start = date(2022, 1, 1)
+        start = date(2022, 4, 1)
+        end = date(2022, 4, 30)
+        self.create_contract(
+            contract_start, start + relativedelta(days=14), self.alice_emp, 5000.0
+        )
+
+        # I create a second contract for "Richard"
+        self.create_contract(
+            start + relativedelta(days=15), False, self.alice_emp, 5000.0
+        )
+
+        self.apply_contract_cron()
+
+        # I create an employee Payslip and process it
+        alice_payslip = self.create_payslip(start, end, self.alice_emp)
+        alice_payslip.compute_sheet()
+
+        line = alice_payslip.line_ids.filtered(lambda l: l.code == "TEST")
+        self.assertEqual(len(line), 2, "I found the Test lines")
+        self.assertEqual(
+            line[0].amount,
+            1.0,
+            "The calculated dictionary value 'payroll.contracts.cumulative_ppf' is 1",
+        )
+
+    def test_contract_cummulative_ppf_half(self):
+
+        # I set the test rule to detect seniority in dictionary
+        self.test_rule.amount_python_compute = (
+            "result = payroll.contracts.cummulative_ppf"
+        )
+
+        # I create a contract for "Richard"
+        start = date(2022, 4, 1)
+        end = date(2022, 4, 30)
+        self.create_contract(
+            start, start + relativedelta(days=14), self.alice_emp, 5000.0
+        )
+
+        self.apply_contract_cron()
+
+        # I create an employee Payslip and process it
+        alice_payslip = self.create_payslip(start, end, self.alice_emp)
+        alice_payslip.compute_sheet()
+
+        line = alice_payslip.line_ids.filtered(lambda l: l.code == "TEST")
+        self.assertEqual(len(line), 1, "I found the Test line")
+        self.assertEqual(
+            line[0].amount,
+            0.5,
+            "The calculated dictionary value 'payroll.contracts.cumulative_ppf' is 0.5",
+        )
+
+    def test_contract_hourly_wage(self):
+
+        # I set the test rule to detect seniority in dictionary
+        self.test_rule.amount_python_compute = "result = current_contract.hourly_wage"
+
+        # I create a contract for "Richard"
+        start = date(2022, 4, 1)
+        end = date(2022, 4, 30)
+        self.create_contract(
+            start, start + relativedelta(days=14), self.alice_emp, 5000.0
+        )
+
+        self.apply_contract_cron()
+
+        # I create an employee Payslip and process it
+        alice_payslip = self.create_payslip(start, end, self.alice_emp)
+        alice_payslip.compute_sheet()
+
+        line = alice_payslip.line_ids.filtered(lambda l: l.code == "TEST")
+        self.assertEqual(len(line), 1, "I found the Test line")
+        res = fields.Float.compare(20.83, line[0].amount, precision_digits=2)
+        self.assertEqual(
+            res,
+            0,
+            "The calculated dictionary value 'current_contract.hourly_wage' is 20.83",
+        )
+
+    def test_contract_daily_wage(self):
+
+        # I set the test rule to detect seniority in dictionary
+        self.test_rule.amount_python_compute = "result = current_contract.daily_wage"
+
+        # I create a contract for "Richard"
+        start = date(2022, 4, 1)
+        end = date(2022, 4, 30)
+        self.create_contract(
+            start, start + relativedelta(days=14), self.alice_emp, 5000.0
+        )
+
+        self.apply_contract_cron()
+
+        # I create an employee Payslip and process it
+        alice_payslip = self.create_payslip(start, end, self.alice_emp)
+        alice_payslip.compute_sheet()
+
+        line = alice_payslip.line_ids.filtered(lambda l: l.code == "TEST")
+        self.assertEqual(len(line), 1, "I found the Test line")
+        res = fields.Float.compare(166.67, line[0].amount, precision_digits=2)
+        self.assertEqual(
+            res,
+            0,
+            "The calculated dictionary value 'current_contract.daily_wage' is 166.67",
+        )
+
+    def test_contract_prevps(self):
+
+        # I set the test rule to detect previous payslip in dictionary
+        self.test_rule.amount_python_compute = "result = payroll.PREVPS.exists"
+
+        # I set a second test rule that I will use to check previous payslip amount
+        test_rule02 = self.SalaryRule.create(
+            {
+                "name": "Test rule 2",
+                "code": "TEST2",
+                "category_id": self.categ_alw.id,
+                "sequence": 5,
+                "amount_select": "code",
+                "amount_python_compute": "result = payroll.PREVPS.net",
+            }
+        )
+        self.basic_pay_structure.write({"rule_ids": [(4, test_rule02.id)]})
+
+        contract_start = date(2022, 1, 1)
+        start1 = date(2022, 3, 1)
+        end1 = date(2022, 3, 31)
+        start2 = date(2022, 4, 1)
+        end2 = date(2022, 4, 30)
+        self.create_contract(contract_start, False, self.alice_emp, 5000.0)
+
+        self.apply_contract_cron()
+
+        # I create a Payslip for March, process it and set it to 'done'
+        alice_payslip01 = self.create_payslip(start1, end1, self.alice_emp)
+        alice_payslip01.compute_sheet()
+        alice_payslip01.action_payslip_done()
+
+        self.assertEqual(alice_payslip01.state, "done", "The first payslip is closed")
+        line = alice_payslip01.line_ids.filtered(lambda l: l.code == "TEST")
+        self.assertEqual(len(line), 1, "I found the Test line")
+        self.assertEqual(line[0].amount, 0.0, "A previous payslip does NOT exist")
+        net_line = alice_payslip01.line_ids.filtered(lambda l: l.code == "NET")
+        self.assertEqual(
+            net_line[0].amount, 5000.0, "Found the first payslip NET amount"
+        )
+
+        # I create a Payslip for April and process it
+        alice_payslip02 = self.create_payslip(start2, end2, self.alice_emp)
+        alice_payslip02.compute_sheet()
+
+        line = alice_payslip02.line_ids.filtered(lambda l: l.code == "TEST")
+        self.assertEqual(len(line), 1, "I found the Test line")
+        self.assertEqual(line[0].amount, 1.0, "A previous payslip exists")
+
+        line = alice_payslip02.line_ids.filtered(lambda l: l.code == "TEST2")
+        self.assertEqual(len(line), 1, "I found the Test line")
+        self.assertEqual(
+            line[0].amount,
+            5000.0,
+            "The NET salary for the previous payslip was 5000.00",
+        )
diff --git a/payroll_payslip_dictionary/tests/test_hr_payslip_wd_calc_calendar.py b/payroll_payslip_dictionary/tests/test_hr_payslip_wd_calc_calendar.py
new file mode 100644
index 00000000..62a205ae
--- /dev/null
+++ b/payroll_payslip_dictionary/tests/test_hr_payslip_wd_calc_calendar.py
@@ -0,0 +1,255 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import date
+
+from dateutil.relativedelta import relativedelta
+
+from . import test_common
+
+
+class TestHrPayslip(test_common.TestHrPayslip):
+    def setUp(self):
+        super().setUp()
+
+        self.env["ir.config_parameter"].set_param(
+            "payroll_payslip_dictionary.daily_max_regular_hours", "8"
+        )
+        self.env["ir.config_parameter"].set_param(
+            "payroll_payslip_dictionary.weekly_max_regular_hours", "48"
+        )
+        self.env["ir.config_parameter"].set_param(
+            "payroll_payslip_dictionary.monthly_max_working_days", "30"
+        )
+        self.env["ir.config_parameter"].set_param(
+            "payroll_payslip_dictionary.working_days_calculation", "calendar"
+        )
+
+    def tearDown(self):
+        super().tearDown()
+
+        self.env["ir.config_parameter"].set_param(
+            "payroll_payslip_dictionary.daily_max_regular_hours", "8"
+        )
+        self.env["ir.config_parameter"].set_param(
+            "payroll_payslip_dictionary.weekly_max_regular_hours", "48"
+        )
+        self.env["ir.config_parameter"].set_param(
+            "payroll_payslip_dictionary.working_days_calculation", "30"
+        )
+        self.env["ir.config_parameter"].set_param(
+            "payroll_payslip_dictionary.working_days_calculation", "calendar"
+        )
+
+    def test_contract_ppf_no_end_date(self):
+
+        # I create a contract for "Richard"
+        start = date(2022, 4, 1)
+        end = date(2022, 4, 30)
+        self.create_contract(
+            start - relativedelta(years=1), False, self.alice_emp, 5000.0
+        )
+
+        self.apply_contract_cron()
+
+        # I create an employee Payslip and process it
+        alice_payslip = self.create_payslip(start, end, self.alice_emp)
+        alice_payslip.compute_sheet()
+
+        line = alice_payslip.line_ids.filtered(lambda l: l.code == "BASIC")
+        self.assertTrue(len(line) == 1, "I found the BASIC salary line")
+        self.assertEqual(
+            line[0].amount,
+            5000.00,
+            "The calculated amount is EQUAL to the employee's monthly wage",
+        )
+
+    def test_contract_ppf_exact_end_date30(self):
+
+        # I create a contract for "Richard"
+        start = date(2022, 4, 1)
+        end = date(2022, 4, 30)
+        self.create_contract(start, end, self.alice_emp, 5000.0)
+
+        self.apply_contract_cron()
+
+        # I create an employee Payslip and process it
+        alice_payslip = self.create_payslip(start, end, self.alice_emp)
+        alice_payslip.compute_sheet()
+
+        line = alice_payslip.line_ids.filtered(lambda l: l.code == "BASIC")
+        self.assertTrue(len(line) == 1, "I found the BASIC salary line")
+        self.assertEqual(
+            line[0].amount,
+            5000.00,
+            "The calculated amount is EQUAL to the employee's salary",
+        )
+
+    def test_contract_ppf_exact_end_date31(self):
+
+        # I create a contract for "Richard"
+        start = date(2022, 3, 1)
+        end = date(2022, 3, 31)
+        self.create_contract(start, end, self.alice_emp, 5000.0)
+
+        self.apply_contract_cron()
+
+        # I create an employee Payslip and process it
+        alice_payslip = self.create_payslip(start, end, self.alice_emp)
+        alice_payslip.compute_sheet()
+
+        line = alice_payslip.line_ids.filtered(lambda l: l.code == "BASIC")
+        self.assertTrue(len(line) == 1, "I found the BASIC salary line")
+        self.assertEqual(
+            line[0].amount,
+            5000.00,
+            "The calculated amount is EQUAL to the employee's salary",
+        )
+
+    def test_contract_ppf_half(self):
+
+        # I create a contract for "Richard"
+        start = date(2022, 4, 1)
+        end = date(2022, 4, 30)
+        self.create_contract(
+            start, start + relativedelta(days=14), self.alice_emp, 5000.0
+        )
+
+        self.apply_contract_cron()
+
+        # I create an employee Payslip and process it
+        alice_payslip = self.create_payslip(start, end, self.alice_emp)
+        alice_payslip.compute_sheet()
+
+        line = alice_payslip.line_ids.filtered(lambda l: l.code == "BASIC")
+        self.assertTrue(len(line) == 1, "I found the BASIC salary line")
+        self.assertEqual(
+            line[0].amount,
+            2500.00,
+            "The calculated amount is half the employee's monthly wage",
+        )
+
+    def test_contract_ppf_2contracts(self):
+
+        # I create a contract for "Richard"
+        start = date(2022, 4, 1)
+        end = date(2022, 4, 30)
+        self.create_contract(
+            start, start + relativedelta(days=14), self.alice_emp, 5000.0
+        )
+
+        # I create a second contract for "Richard"
+        start2 = date(2022, 4, 16)
+        self.create_contract(
+            start2, False, self.alice_emp, 10000.0, "2nd Contract for Richard"
+        )
+
+        self.apply_contract_cron()
+
+        # I create an employee Payslip and process it
+        alice_payslip = self.create_payslip(start, end, self.alice_emp)
+        alice_payslip.compute_sheet()
+
+        lines = alice_payslip.line_ids.filtered(lambda l: l.code == "BASIC")
+        self.assertTrue(len(lines) == 2, "I found the BASIC salary lines")
+
+        sum_amounts = sum([line.amount for line in lines])
+        self.assertEqual(
+            sum_amounts,
+            7500.00,
+            "The calculated amount is half of first wage + half of second wage",
+        )
+
+    def test_contract_ppf_days_less_than_payroll_days(self):
+
+        # I create a contract for "Richard" of 10 days
+        pay_start = date(2022, 4, 1)
+        pay_end = date(2022, 4, 30)
+        c1_start = date(2022, 3, 30)
+        c1_end = date(2022, 4, 10)
+        self.create_contract(c1_start, c1_end, self.alice_emp, 5000.0)
+
+        # I create a second contract for "Richard" of another 10 days
+        c2_start = date(2022, 4, 11)
+        c2_end = date(2022, 4, 20)
+        self.create_contract(
+            c2_start, c2_end, self.alice_emp, 15000.0, "2nd Contract for Richard"
+        )
+
+        self.apply_contract_cron()
+
+        # I create an employee Payslip and process it
+        alice_payslip = self.create_payslip(pay_start, pay_end, self.alice_emp)
+        alice_payslip.compute_sheet()
+
+        lines = alice_payslip.line_ids.filtered(lambda l: l.code == "BASIC")
+        self.assertTrue(len(lines) == 2, "I found the BASIC salary lines")
+
+        sum_amounts = sum([line.amount for line in lines])
+        self.assertEqual(
+            sum_amounts,
+            6666.00,
+            "The calculated amount is 0.3333 first wage + 0.3333 of second wage",
+        )
+
+    def test_contract_ppf_days_less_than_payroll_days31(self):
+
+        # I create a contract for "Richard" of 10 days
+        pay_start = date(2022, 3, 1)
+        pay_end = date(2022, 3, 31)
+        c1_start = date(2022, 1, 30)
+        c1_end = date(2022, 3, 10)
+        self.create_contract(c1_start, c1_end, self.alice_emp, 5000.0)
+
+        # I create a second contract for "Richard" of another 10 days
+        c2_start = date(2022, 3, 11)
+        c2_end = date(2022, 3, 20)
+        self.create_contract(
+            c2_start, c2_end, self.alice_emp, 15000.0, "2nd Contract for Richard"
+        )
+
+        self.apply_contract_cron()
+
+        # I create an employee Payslip and process it
+        alice_payslip = self.create_payslip(pay_start, pay_end, self.alice_emp)
+        alice_payslip.compute_sheet()
+
+        lines = alice_payslip.line_ids.filtered(lambda l: l.code == "BASIC")
+        self.assertTrue(len(lines) == 2, "I found the BASIC salary lines")
+
+        sum_amounts = sum([line.amount for line in lines])
+        self.assertEqual(
+            sum_amounts,
+            6452.00,
+            "The calculated amount is 0.3226 first wage + 0.3226 of second wage",
+        )
+
+    def test_contract_ppf_february(self):
+
+        # I create a contract for "Richard"
+        start = date(2022, 2, 1)
+        end = date(2022, 2, 15)
+        month_end = date(2022, 2, 28)
+        self.create_contract(start, end, self.alice_emp, 5000.0)
+
+        # I create a second contract for "Richard"
+        start2 = date(2022, 2, 16)
+        self.create_contract(
+            start2, month_end, self.alice_emp, 10000.0, "2nd Contract for Richard"
+        )
+
+        self.apply_contract_cron()
+
+        # I create an employee Payslip and process it
+        alice_payslip = self.create_payslip(start, month_end, self.alice_emp)
+        alice_payslip.compute_sheet()
+
+        lines = alice_payslip.line_ids.filtered(lambda l: l.code == "BASIC")
+        self.assertTrue(len(lines) == 2, "I found the BASIC salary lines")
+
+        sum_amounts = sum([line.amount for line in lines])
+        self.assertEqual(
+            sum_amounts,
+            7321.50,
+            "The calculated amount is 0.5357 x first wage + 0.4643 * second wage",
+        )
diff --git a/payroll_payslip_dictionary/tests/test_hr_payslip_wd_calc_defaults.py b/payroll_payslip_dictionary/tests/test_hr_payslip_wd_calc_defaults.py
new file mode 100644
index 00000000..fb9975c4
--- /dev/null
+++ b/payroll_payslip_dictionary/tests/test_hr_payslip_wd_calc_defaults.py
@@ -0,0 +1,206 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import date
+
+from dateutil.relativedelta import relativedelta
+
+from . import test_common
+
+
+class TestHrPayslip(test_common.TestHrPayslip):
+    def setUp(self):
+        super().setUp()
+
+        self.env["ir.config_parameter"].set_param(
+            "payroll_payslip_dictionary.daily_max_regular_hours", "8"
+        )
+        self.env["ir.config_parameter"].set_param(
+            "payroll_payslip_dictionary.weekly_max_regular_hours", "48"
+        )
+        self.env["ir.config_parameter"].set_param(
+            "payroll_payslip_dictionary.monthly_max_working_days", "30"
+        )
+        self.env["ir.config_parameter"].set_param(
+            "payroll_payslip_dictionary.working_days_calculation", "defaults"
+        )
+
+    def tearDown(self):
+        super().tearDown()
+
+        self.env["ir.config_parameter"].set_param(
+            "payroll_payslip_dictionary.daily_max_regular_hours", "8"
+        )
+        self.env["ir.config_parameter"].set_param(
+            "payroll_payslip_dictionary.weekly_max_regular_hours", "48"
+        )
+        self.env["ir.config_parameter"].set_param(
+            "payroll_payslip_dictionary.monthly_max_working_days", "30"
+        )
+        self.env["ir.config_parameter"].set_param(
+            "payroll_payslip_dictionary.working_days_calculation", "defaults"
+        )
+
+    def test_contract_ppf_no_end_date(self):
+
+        # I create a contract for "Richard"
+        start = date(2022, 4, 1)
+        end = date(2022, 4, 30)
+        self.create_contract(
+            start - relativedelta(years=1), False, self.alice_emp, 5000.0
+        )
+
+        self.apply_contract_cron()
+
+        # I create an employee Payslip and process it
+        alice_payslip = self.create_payslip(start, end, self.alice_emp)
+        alice_payslip.compute_sheet()
+
+        line = alice_payslip.line_ids.filtered(lambda l: l.code == "BASIC")
+        self.assertTrue(len(line) == 1, "I found the BASIC salary line")
+        self.assertEqual(
+            line[0].amount,
+            5000.00,
+            "The calculated amount is EQUAL to the employee's monthly wage",
+        )
+
+    def test_contract_ppf_exact_end_date(self):
+
+        # I create a contract for "Richard"
+        start = date(2022, 4, 1)
+        end = date(2022, 4, 30)
+        self.create_contract(start, end, self.alice_emp, 5000.0)
+
+        self.apply_contract_cron()
+
+        # I create an employee Payslip and process it
+        alice_payslip = self.create_payslip(start, end, self.alice_emp)
+        alice_payslip.compute_sheet()
+
+        line = alice_payslip.line_ids.filtered(lambda l: l.code == "BASIC")
+        self.assertTrue(len(line) == 1, "I found the BASIC salary line")
+        self.assertEqual(
+            line[0].amount,
+            5000.00,
+            "The calculated amount is EQUAL to the employee's salary",
+        )
+
+    def test_contract_ppf_half(self):
+
+        # I create a contract for "Richard"
+        start = date(2022, 4, 1)
+        end = date(2022, 4, 30)
+        self.create_contract(
+            start, start + relativedelta(days=14), self.alice_emp, 5000.0
+        )
+
+        self.apply_contract_cron()
+
+        # I create an employee Payslip and process it
+        alice_payslip = self.create_payslip(start, end, self.alice_emp)
+        alice_payslip.compute_sheet()
+
+        line = alice_payslip.line_ids.filtered(lambda l: l.code == "BASIC")
+        self.assertTrue(len(line) == 1, "I found the BASIC salary line")
+        self.assertEqual(
+            line[0].amount,
+            2500.00,
+            "The calculated amount is half the employee's monthly wage",
+        )
+
+    def test_contract_ppf_2contracts(self):
+
+        # I create a contract for "Richard"
+        start = date(2022, 4, 1)
+        end = date(2022, 4, 30)
+        self.create_contract(
+            start, start + relativedelta(days=14), self.alice_emp, 5000.0
+        )
+
+        # I create a second contract for "Richard"
+        start2 = date(2022, 4, 16)
+        self.create_contract(
+            start2,
+            start2 + relativedelta(days=14),
+            self.alice_emp,
+            10000.0,
+            "2nd Contract for Richard",
+        )
+
+        self.apply_contract_cron()
+
+        # I create an employee Payslip and process it
+        alice_payslip = self.create_payslip(start, end, self.alice_emp)
+        alice_payslip.compute_sheet()
+
+        lines = alice_payslip.line_ids.filtered(lambda l: l.code == "BASIC")
+        self.assertTrue(len(lines) == 2, "I found the BASIC salary lines")
+
+        sum_amounts = sum([line.amount for line in lines])
+        self.assertEqual(
+            sum_amounts,
+            7500.00,
+            "The calculated amount is half of first wage + half of second wage",
+        )
+
+    def test_contract_ppf_days_less_than_default_days(self):
+
+        # I create a contract for "Richard" of 10 days
+        pay_start = date(2022, 4, 1)
+        pay_end = date(2022, 4, 30)
+        c1_start = date(2022, 3, 30)
+        c1_end = date(2022, 4, 10)
+        self.create_contract(c1_start, c1_end, self.alice_emp, 5000.0)
+
+        # I create a second contract for "Richard" of another 10 days
+        c2_start = date(2022, 4, 11)
+        c2_end = date(2022, 4, 20)
+        self.create_contract(
+            c2_start, c2_end, self.alice_emp, 15000.0, "2nd Contract for Richard"
+        )
+
+        self.apply_contract_cron()
+
+        # I create an employee Payslip and process it
+        alice_payslip = self.create_payslip(pay_start, pay_end, self.alice_emp)
+        alice_payslip.compute_sheet()
+
+        lines = alice_payslip.line_ids.filtered(lambda l: l.code == "BASIC")
+        self.assertTrue(len(lines) == 2, "I found the BASIC salary lines")
+
+        sum_amounts = sum([line.amount for line in lines])
+        self.assertEqual(
+            sum_amounts,
+            6666.00,
+            "The calculated amount is 0.3333 first wage + 0.3333 of second wage",
+        )
+
+    def test_contract_ppf_february(self):
+
+        # I create a contract for "Richard"
+        start = date(2022, 2, 1)
+        end = date(2022, 2, 15)
+        month_end = date(2022, 2, 28)
+        self.create_contract(start, end, self.alice_emp, 5000.0)
+
+        # I create a second contract for "Richard"
+        start2 = date(2022, 2, 16)
+        self.create_contract(
+            start2, month_end, self.alice_emp, 10000.0, "2nd Contract for Richard"
+        )
+
+        self.apply_contract_cron()
+
+        # I create an employee Payslip and process it
+        alice_payslip = self.create_payslip(start, month_end, self.alice_emp)
+        alice_payslip.compute_sheet()
+
+        lines = alice_payslip.line_ids.filtered(lambda l: l.code == "BASIC")
+        self.assertTrue(len(lines) == 2, "I found the BASIC salary lines")
+
+        sum_amounts = sum([line.amount for line in lines])
+        self.assertEqual(
+            sum_amounts,
+            7333.50,
+            "The calculated amount is 0.5333 x first wage + 0.4667 * second wage",
+        )
diff --git a/payroll_payslip_dictionary/tests/test_hr_payslip_wd_calc_resource_calendar.py b/payroll_payslip_dictionary/tests/test_hr_payslip_wd_calc_resource_calendar.py
new file mode 100644
index 00000000..976bc990
--- /dev/null
+++ b/payroll_payslip_dictionary/tests/test_hr_payslip_wd_calc_resource_calendar.py
@@ -0,0 +1,262 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import date
+
+from dateutil.relativedelta import relativedelta
+
+from . import test_common
+
+
+class TestHrPayslip(test_common.TestHrPayslip):
+    def setUp(self):
+        super().setUp()
+
+        self.env["ir.config_parameter"].set_param(
+            "payroll_payslip_dictionary.daily_max_regular_hours", "8"
+        )
+        self.env["ir.config_parameter"].set_param(
+            "payroll_payslip_dictionary.weekly_max_regular_hours", "48"
+        )
+        self.env["ir.config_parameter"].set_param(
+            "payroll_payslip_dictionary.monthly_max_working_days", "30"
+        )
+        self.env["ir.config_parameter"].set_param(
+            "payroll_payslip_dictionary.working_days_calculation", "resource_calendar"
+        )
+
+    def tearDown(self):
+        super().tearDown()
+
+        self.env["ir.config_parameter"].set_param(
+            "payroll_payslip_dictionary.daily_max_regular_hours", "8"
+        )
+        self.env["ir.config_parameter"].set_param(
+            "payroll_payslip_dictionary.weekly_max_regular_hours", "48"
+        )
+        self.env["ir.config_parameter"].set_param(
+            "payroll_payslip_dictionary.monthly_max_working_days", "30"
+        )
+        self.env["ir.config_parameter"].set_param(
+            "payroll_payslip_dictionary.working_days_calculation", "resource_calendar"
+        )
+
+    def test_contract_ppf_no_end_date(self):
+
+        start = date(2022, 4, 1)
+        end = date(2022, 4, 30)
+        self.create_contract(
+            start - relativedelta(years=1), False, self.alice_emp, 5000.0
+        )
+
+        self.apply_contract_cron()
+
+        # I create an employee Payslip and process it
+        alice_payslip = self.create_payslip(start, end, self.alice_emp)
+        alice_payslip.onchange_employee()
+        alice_payslip.compute_sheet()
+
+        line = alice_payslip.line_ids.filtered(lambda l: l.code == "BASIC")
+        self.assertTrue(len(line) == 1, "I found the BASIC salary line")
+        self.assertEqual(
+            line[0].amount,
+            5000.00,
+            "The calculated amount is EQUAL to the employee's monthly wage",
+        )
+
+    def test_contract_ppf_exact_end_date30(self):
+
+        start = date(2022, 4, 1)
+        end = date(2022, 4, 30)
+        self.create_contract(start, end, self.alice_emp, 5000.0)
+
+        self.apply_contract_cron()
+
+        # I create an employee Payslip and process it
+        alice_payslip = self.create_payslip(start, end, self.alice_emp)
+        alice_payslip.compute_sheet()
+
+        line = alice_payslip.line_ids.filtered(lambda l: l.code == "BASIC")
+        self.assertTrue(len(line) == 1, "I found the BASIC salary line")
+        self.assertEqual(
+            line[0].amount,
+            5000.00,
+            "The calculated amount is EQUAL to the employee's salary",
+        )
+
+    def test_contract_ppf_exact_end_date31(self):
+
+        start = date(2022, 3, 1)
+        end = date(2022, 3, 31)
+        self.create_contract(start, end, self.alice_emp, 5000.0)
+
+        self.apply_contract_cron()
+
+        # I create an employee Payslip and process it
+        alice_payslip = self.create_payslip(start, end, self.alice_emp)
+        alice_payslip.compute_sheet()
+
+        line = alice_payslip.line_ids.filtered(lambda l: l.code == "BASIC")
+        self.assertTrue(len(line) == 1, "I found the BASIC salary line")
+        self.assertEqual(
+            line[0].amount,
+            5000.00,
+            "The calculated amount is EQUAL to the employee's salary",
+        )
+
+    def test_contract_ppf_half(self):
+
+        start = date(2022, 4, 1)
+        end = date(2022, 4, 30)
+        self.create_contract(
+            start, start + relativedelta(days=14), self.alice_emp, 5000.0
+        )
+
+        self.apply_contract_cron()
+
+        # I create an employee Payslip and process it
+        alice_payslip = self.create_payslip(start, end, self.alice_emp)
+        alice_payslip.compute_sheet()
+
+        line = alice_payslip.line_ids.filtered(lambda l: l.code == "BASIC")
+        self.assertTrue(len(line) == 1, "I found the BASIC salary line")
+        self.assertEqual(
+            line[0].amount,
+            2619.00,
+            "The calculated amount is 0.5238 the employee's monthly wage",
+        )
+
+    def test_contract_ppf_2contracts(self):
+
+        start = date(2022, 4, 1)
+        end = date(2022, 4, 30)
+        self.create_contract(
+            start, start + relativedelta(days=14), self.alice_emp, 5000.0
+        )
+
+        # I create a second contract for "Richard"
+        start2 = date(2022, 4, 16)
+        self.create_contract(
+            start2, False, self.alice_emp, 10000.0, "2nd Contract for Richard"
+        )
+
+        self.apply_contract_cron()
+
+        # I create an employee Payslip and process it
+        alice_payslip = self.create_payslip(start, end, self.alice_emp)
+        alice_payslip.compute_sheet()
+
+        lines = alice_payslip.line_ids.filtered(lambda l: l.code == "BASIC")
+        self.assertTrue(len(lines) == 2, "I found the BASIC salary lines")
+
+        sum_amounts = sum([line.amount for line in lines])
+        self.assertEqual(
+            sum_amounts,
+            7381.00,
+            "The calculated amount is 0.5238 * first wage + 0.4762 * second wage",
+        )
+
+    def test_contract_ppf_days_less_than_payroll_days(self):
+
+        # I create a contract for "Richard" of 10 days (in the period)
+        pay_start = date(2022, 4, 1)
+        pay_end = date(2022, 4, 30)
+        c1_start = date(2022, 3, 30)
+        c1_end = date(2022, 4, 10)
+        self.create_contract(c1_start, c1_end, self.alice_emp, 5000.0)
+
+        # I create a second contract for "Richard" of another 10 days
+        c2_start = date(2022, 4, 11)
+        c2_end = date(2022, 4, 20)
+        self.create_contract(
+            c2_start, c2_end, self.alice_emp, 15000.0, "2nd Contract for Richard"
+        )
+
+        self.apply_contract_cron()
+
+        # I create an employee Payslip and process it
+        alice_payslip = self.create_payslip(pay_start, pay_end, self.alice_emp)
+        alice_payslip.compute_sheet()
+
+        lines = alice_payslip.line_ids.filtered(lambda l: l.code == "BASIC")
+        self.assertTrue(len(lines) == 2, "I found the BASIC salary lines")
+
+        sum_amounts = sum([line.amount for line in lines])
+        self.assertEqual(
+            sum_amounts,
+            7143.50,
+            "The calculated amount is 0.2857 first wage + 0.3810 of second wage",
+        )
+
+    def test_contract_ppf_february(self):
+
+        # I create a contract for "Richard"
+        start = date(2022, 2, 1)
+        end = date(2022, 2, 15)
+        month_end = date(2022, 2, 28)
+        self.create_contract(start, end, self.alice_emp, 5000.0)
+
+        # I create a second contract for "Richard"
+        start2 = date(2022, 2, 16)
+        self.create_contract(
+            start2, month_end, self.alice_emp, 10000.0, "2nd Contract for Richard"
+        )
+
+        self.apply_contract_cron()
+
+        # I create an employee Payslip and process it
+        alice_payslip = self.create_payslip(start, month_end, self.alice_emp)
+        alice_payslip.compute_sheet()
+
+        lines = alice_payslip.line_ids.filtered(lambda l: l.code == "BASIC")
+        self.assertTrue(len(lines) == 2, "I found the BASIC salary lines")
+
+        sum_amounts = sum([line.amount for line in lines])
+        self.assertEqual(
+            sum_amounts,
+            7250.00,
+            "The calculated amount is 0.55 x first wage + 0.45 * second wage",
+        )
+
+    def test_contract_ppf_march(self):
+
+        # I create a contract for "Richard" with 11 working days
+        start = date(2022, 3, 1)
+        end = date(2022, 3, 15)
+        month_end = date(2022, 3, 31)
+        cc = self.create_contract(start, end, self.alice_emp, 5000.0)
+        self.assertEqual(
+            cc.resource_calendar_id,
+            self.resource_calendar_std,
+            "There is a resource calendar attached to the contract",
+        )
+
+        # I create a second contract for "Richard" with 12 working days
+        start2 = date(2022, 3, 16)
+        self.create_contract(
+            start2, month_end, self.alice_emp, 10000.0, "2nd Contract for Richard"
+        )
+
+        self.apply_contract_cron()
+
+        # For 5 days/week I change the monthly workding days to 20 and salary conversion
+        self.env["ir.config_parameter"].set_param(
+            "payroll_payslip_dictionary.monthly_max_working_days", "20"
+        )
+        self.env["ir.config_parameter"].set_param(
+            "payroll_payslip_dictionary.salary_hourly_conversion", "working_days"
+        )
+
+        # I create an employee Payslip with 23 working days and process it
+        alice_payslip = self.create_payslip(start, month_end, self.alice_emp)
+        alice_payslip.compute_sheet()
+
+        lines = alice_payslip.line_ids.filtered(lambda l: l.code == "BASIC")
+        self.assertEqual(len(lines), 2, "I found the BASIC salary lines")
+
+        sum_amounts = sum([line.amount for line in lines])
+        self.assertEqual(
+            sum_amounts,
+            7608.50,
+            "The calculated amount is 0.4783 x first wage + 0.5217 * second wage",
+        )
diff --git a/payroll_payslip_dictionary/views/res_config_settings_views.xml b/payroll_payslip_dictionary/views/res_config_settings_views.xml
new file mode 100644
index 00000000..a0a5e702
--- /dev/null
+++ b/payroll_payslip_dictionary/views/res_config_settings_views.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field
+            name="name"
+        >res.config.settings.view.form.inherit.payroll_payslip_dictionary</field>
+        <field name="model">res.config.settings</field>
+        <field name="priority" eval="80" />
+        <field name="inherit_id" ref="payroll.res_config_settings_view_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//div[@data-key='payroll']" position="inside">
+                <h2>Default Values</h2>
+                <div
+                    class="row mt16 o_settings_container"
+                    name="working_days_calculation_setting_container"
+                >
+                    <div
+                        class="col-12 col-lg-6 o_setting_box"
+                        id="working_days_calculation"
+                    >
+                        <div class="o_setting_left_pane" />
+                        <div class="o_setting_right_pane">
+                            <label for="working_days_calculation" />
+                            <field name="working_days_calculation" />
+                            <div class="text-muted">
+                                    How this field is set will affect the calculated value of salaried employees' hourly pay.
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div
+                    class="row mt16 o_settings_container"
+                    name="weekly_max_regular_hours_dictionary_setting_container"
+                >
+                    <div
+                        class="col-12 col-lg-6 o_setting_box"
+                        id="weekly_max_regular_hours"
+                    >
+                        <div class="o_setting_left_pane" />
+                        <div class="o_setting_right_pane">
+                            <label for="weekly_max_regular_hours" />
+                            <field name="weekly_max_regular_hours" />
+                            <div class="text-muted">
+                                    Maximum possible regular working hours an employee may work during the week.
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div
+                    class="row mt16 o_settings_container"
+                    name="max_working_days_dictionary_setting_container"
+                >
+                    <div
+                        class="col-12 col-lg-6 o_setting_box"
+                        id="monthly_max_working_days"
+                    >
+                        <div class="o_setting_left_pane" />
+                        <div class="o_setting_right_pane">
+                            <label for="monthly_max_working_days" />
+                            <field name="monthly_max_working_days" />
+                            <div class="text-muted">
+                                    Maximum possible number of regular working days an employee may work during a pay period.
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <h2>Worked Days Codes</h2>
+                <div
+                    class="row mt16 o_settings_container"
+                    name="max_dictionary_setting_container"
+                >
+                    <div class="col-12 col-lg-6 o_setting_box" id="work_days_code_max">
+                        <div class="o_setting_left_pane" />
+                        <div class="o_setting_right_pane">
+                            <label for="work_days_code_max" />
+                            <field name="work_days_code_max" />
+                            <div class="text-muted">
+                                    In the 'worked_days' dictionary, the code used for maximum possible working days.
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/payroll_payslip_hr_leave_type/README.rst b/payroll_payslip_hr_leave_type/README.rst
new file mode 100644
index 00000000..c04d9583
--- /dev/null
+++ b/payroll_payslip_hr_leave_type/README.rst
@@ -0,0 +1,60 @@
+======================
+Payslip Time-off codes
+======================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:9d8e47cd9d526b7201bbfe0b0bdb139ca0b5b246b96d253b53a9fbd788e4d728
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_payslip_hr_leave_type
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+This module modifies the payslip worked days calculation in payslips to use leave type codes, instead of names.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_payslip_hr_leave_type%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+
+Other credits
+~~~~~~~~~~~~~
+
+* Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_payslip_hr_leave_type>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/payroll_payslip_hr_leave_type/__init__.py b/payroll_payslip_hr_leave_type/__init__.py
new file mode 100644
index 00000000..4e124ccb
--- /dev/null
+++ b/payroll_payslip_hr_leave_type/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
diff --git a/payroll_payslip_hr_leave_type/__manifest__.py b/payroll_payslip_hr_leave_type/__manifest__.py
new file mode 100644
index 00000000..9eb12955
--- /dev/null
+++ b/payroll_payslip_hr_leave_type/__manifest__.py
@@ -0,0 +1,19 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Payslip Time-off codes",
+    "summary": "Use time-off codes (instead of names) in payslip rules",
+    "version": "15.0.1.0.0",
+    "category": "Payroll",
+    "images": ["static/src/img/main_screenshot.png"],
+    "author": "TREVI Software",
+    "license": "AGPL-3",
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "hr_leave_type_unique",
+        "payroll",
+    ],
+    "data": [],
+    "installable": True,
+}
diff --git a/payroll_payslip_hr_leave_type/i18n/payroll_payslip_hr_leave_type.pot b/payroll_payslip_hr_leave_type/i18n/payroll_payslip_hr_leave_type.pot
new file mode 100644
index 00000000..da6d1e55
--- /dev/null
+++ b/payroll_payslip_hr_leave_type/i18n/payroll_payslip_hr_leave_type.pot
@@ -0,0 +1,34 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* payroll_payslip_hr_leave_type
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: payroll_payslip_hr_leave_type
+#: model:ir.model.fields,field_description:payroll_payslip_hr_leave_type.field_hr_payslip__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: payroll_payslip_hr_leave_type
+#: model:ir.model.fields,field_description:payroll_payslip_hr_leave_type.field_hr_payslip__id
+msgid "ID"
+msgstr ""
+
+#. module: payroll_payslip_hr_leave_type
+#: model:ir.model.fields,field_description:payroll_payslip_hr_leave_type.field_hr_payslip____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: payroll_payslip_hr_leave_type
+#: model:ir.model,name:payroll_payslip_hr_leave_type.model_hr_payslip
+msgid "Payslip"
+msgstr ""
diff --git a/payroll_payslip_hr_leave_type/models/__init__.py b/payroll_payslip_hr_leave_type/models/__init__.py
new file mode 100644
index 00000000..0e7d95d6
--- /dev/null
+++ b/payroll_payslip_hr_leave_type/models/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import hr_payslip
diff --git a/payroll_payslip_hr_leave_type/models/hr_payslip.py b/payroll_payslip_hr_leave_type/models/hr_payslip.py
new file mode 100644
index 00000000..b488de6b
--- /dev/null
+++ b/payroll_payslip_hr_leave_type/models/hr_payslip.py
@@ -0,0 +1,33 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import api, models
+
+
+class HrPayslip(models.Model):
+
+    _inherit = "hr.payslip"
+
+    @api.model
+    def get_worked_day_lines(self, contracts, date_from, date_to):
+        """
+        @param contracts: Browse record of contracts
+        @return: returns a list of dict containing the input that should be
+        applied for the given contract between date_from and date_to
+        """
+
+        res = super().get_worked_day_lines(contracts, date_from, date_to)
+
+        leave_types = self.env["hr.leave.type"].search([])
+        leave_names = leave_types.mapped("name")
+
+        # Change worked_days record codes from leave names to leave codes
+        for r in res:
+            if r["code"] == "WORK100":
+                continue
+            elif r["code"] in leave_names:
+                lv_list = leave_types.filtered(lambda lvt: lvt.name == r["code"])
+                if len(lv_list) > 0:
+                    r["code"] = lv_list[0].code
+
+        return res
diff --git a/payroll_payslip_hr_leave_type/readme/CREDITS.rst b/payroll_payslip_hr_leave_type/readme/CREDITS.rst
new file mode 100644
index 00000000..d264bc7e
--- /dev/null
+++ b/payroll_payslip_hr_leave_type/readme/CREDITS.rst
@@ -0,0 +1 @@
+* Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/payroll_payslip_hr_leave_type/readme/DESCRIPTION.rst b/payroll_payslip_hr_leave_type/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..d2551a7f
--- /dev/null
+++ b/payroll_payslip_hr_leave_type/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+This module modifies the payslip worked days calculation in payslips to use leave type codes, instead of names.
diff --git a/payroll_payslip_hr_leave_type/static/description/icon.png b/payroll_payslip_hr_leave_type/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/payroll_payslip_hr_leave_type/static/description/icon.png differ
diff --git a/payroll_payslip_hr_leave_type/static/description/index.html b/payroll_payslip_hr_leave_type/static/description/index.html
new file mode 100644
index 00000000..836a826c
--- /dev/null
+++ b/payroll_payslip_hr_leave_type/static/description/index.html
@@ -0,0 +1,416 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Payslip Time-off codes</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="payslip-time-off-codes">
+<h1 class="title">Payslip Time-off codes</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:9d8e47cd9d526b7201bbfe0b0bdb139ca0b5b246b96d253b53a9fbd788e4d728
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_payslip_hr_leave_type"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<p>This module modifies the payslip worked days calculation in payslips to use leave type codes, instead of names.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-4">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_payslip_hr_leave_type%0Aversion:%2014.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="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>TREVI Software</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-4">Other credits</a></h2>
+<ul class="simple">
+<li>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_payslip_hr_leave_type">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/payroll_payslip_hr_leave_type/static/src/img/main_screenshot.png b/payroll_payslip_hr_leave_type/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/payroll_payslip_hr_leave_type/static/src/img/main_screenshot.png differ
diff --git a/payroll_payslip_hr_leave_type/tests/__init__.py b/payroll_payslip_hr_leave_type/tests/__init__.py
new file mode 100644
index 00000000..2b169040
--- /dev/null
+++ b/payroll_payslip_hr_leave_type/tests/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import test_hr_payslip
diff --git a/payroll_payslip_hr_leave_type/tests/test_hr_payslip.py b/payroll_payslip_hr_leave_type/tests/test_hr_payslip.py
new file mode 100644
index 00000000..348e7362
--- /dev/null
+++ b/payroll_payslip_hr_leave_type/tests/test_hr_payslip.py
@@ -0,0 +1,120 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import datetime, time
+
+from dateutil.relativedelta import relativedelta
+
+from odoo.addons.payroll.tests.common import TestPayslipBase
+
+
+class TestHrPayslip(TestPayslipBase):
+    def setUp(self):
+        super().setUp()
+
+        self.Contract = self.env["hr.contract"]
+        self.HrPayslip = self.env["hr.payslip"]
+        self.Rule = self.env["hr.salary.rule"]
+        self.Requests = self.env["hr.leave"]
+        self.HolidaysStatus = self.env["hr.leave.type"]
+
+        # create holiday type
+        self.holiday_type = self.HolidaysStatus.create(
+            {
+                "name": "TestLeaveType",
+                "code": "TESTLV",
+                "allocation_type": "no",
+                "leave_validation_type": "no_validation",
+            }
+        )
+
+        self.basic_rule = self.env.ref("payroll.hr_rule_basic")
+        self.basic_rule.amount_python_compute = "result = contract.wage"
+        self.mock_rule = self.Rule.create(
+            {
+                "name": "Leave Salary Rule",
+                "code": "TESTLV",
+                "sequence": 5,
+                "category_id": self.ref("payroll.ALW"),
+                "condition_select": "python",
+                "condition_python": "result = 0",
+                "amount_select": "code",
+                "amount_python_compute": "result = 1000.0",
+            }
+        )
+        self.developer_pay_structure.write(
+            {"parent_id": self.ref("payroll.structure_base")}
+        )
+        self.developer_pay_structure.write({"rule_ids": [(4, self.mock_rule.id)]})
+
+        self.resource_calendar_std = self.env.ref("resource.resource_calendar_std")
+        contracts = self.Contract.search([("employee_id", "=", self.richard_emp.id)])
+        contracts[0].resource_calendar_id = self.resource_calendar_std
+        contracts[0].kanban_state = "done"
+        contracts[0].date_start = datetime(2022, 1, 1)
+
+    def test_holiday_type_code(self):
+
+        self.mock_rule.condition_python = "result = worked_days.LVCODE"
+        self.mock_rule.amount_python_compute = (
+            "result = worked_days.LVCODE.number_of_days"
+        )
+
+        self.apply_contract_cron()
+        self.assertEqual(
+            self.richard_emp.contract_id.state, "trial", "Contract is in 'trial' state"
+        )
+
+        # Set system parameter
+        self.env["ir.config_parameter"].sudo().set_param(
+            "payroll.leaves_positive", True
+        )
+
+        # Create a leave request
+        lv_from = datetime.combine(datetime.today(), time.min)
+        lv_to = datetime.combine(datetime.today(), time.max)
+        while lv_from.date().weekday() in [5, 6]:
+            lv_from -= relativedelta(days=1)
+        while lv_to.date().weekday() in [5, 6]:
+            lv_to -= relativedelta(days=1)
+        leave = self.Requests.create(
+            {
+                "name": "Hol11",
+                "employee_id": self.richard_emp.id,
+                "holiday_status_id": self.holiday_type.id,
+                "date_from": lv_from,
+                "date_to": lv_to,
+                "number_of_days": 1,
+            }
+        )
+        self.assertEqual(
+            leave.state, "validate", "newly created leave request is in validate state"
+        )
+
+        # I create an employee Payslip and process it
+        richard_payslip = self.env["hr.payslip"].create(
+            {"name": "Payslip of Richard", "employee_id": self.richard_emp.id}
+        )
+        richard_payslip.onchange_employee()
+        richard_payslip.compute_sheet()
+
+        worked_days_line = richard_payslip.worked_days_line_ids.filtered(
+            lambda l: l.code == "TESTLV"
+        )
+        self.assertEqual(
+            len(worked_days_line), 1, "There is a worked_days_line for the leave"
+        )
+        self.assertEqual(
+            worked_days_line.number_of_days,
+            1.0,
+            "The number of days for the leave is the same as the holiday request",
+        )
+        self.assertEqual(
+            len(
+                richard_payslip.worked_days_line_ids.filtered(
+                    lambda l: l.code == "WORK100"
+                )
+            ),
+            1,
+            "The 'WORK100' worked days line is still there",
+        )
diff --git a/payroll_payslip_patch/README.rst b/payroll_payslip_patch/README.rst
new file mode 100644
index 00000000..2fa84871
--- /dev/null
+++ b/payroll_payslip_patch/README.rst
@@ -0,0 +1,72 @@
+=============
+Payslip Patch
+=============
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:e4cddc0c64fb1c49b6e26f1eb65c6ed6c675e3c20265fee9b5189da07cc0cb30
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_payslip_patch
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+**THIS MODULE'S FUNCTIONALITY HAS BEEN MERGED INTO OCA/Payroll. DO NOT USE**
+
+This module patches the payslip processing source code in the Payroll module to enable additional functionality
+during payslip processing. It is a technical module that is used by other modules.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Changelog
+=========
+
+14.0.2.0.0 (2022-08-17)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* The functionality in this module has been merged into OCA/Payroll. This module is no longer necessary.
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_payslip_patch%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+* Michael Telahun Makonnen
+
+Other credits
+~~~~~~~~~~~~~
+
+* Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_payslip_patch>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/payroll_payslip_patch/__init__.py b/payroll_payslip_patch/__init__.py
new file mode 100644
index 00000000..4e124ccb
--- /dev/null
+++ b/payroll_payslip_patch/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
diff --git a/payroll_payslip_patch/__manifest__.py b/payroll_payslip_patch/__manifest__.py
new file mode 100644
index 00000000..ab8fc7f8
--- /dev/null
+++ b/payroll_payslip_patch/__manifest__.py
@@ -0,0 +1,18 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Payslip Patch",
+    "summary": "Miscellaneous source code patches to payslip handling",
+    "version": "15.0.1.0.0",
+    "category": "Payroll",
+    "images": ["static/src/img/main_screenshot.png"],
+    "author": "TREVI Software, Michael Telahun Makonnen",
+    "license": "AGPL-3",
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "payroll",
+    ],
+    "data": [],
+    "installable": True,
+}
diff --git a/payroll_payslip_patch/i18n/payroll_payslip_patch.pot b/payroll_payslip_patch/i18n/payroll_payslip_patch.pot
new file mode 100644
index 00000000..4d8b20f9
--- /dev/null
+++ b/payroll_payslip_patch/i18n/payroll_payslip_patch.pot
@@ -0,0 +1,13 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
diff --git a/payroll_payslip_patch/models/__init__.py b/payroll_payslip_patch/models/__init__.py
new file mode 100644
index 00000000..0cfb63e1
--- /dev/null
+++ b/payroll_payslip_patch/models/__init__.py
@@ -0,0 +1,2 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
diff --git a/payroll_payslip_patch/readme/CREDITS.rst b/payroll_payslip_patch/readme/CREDITS.rst
new file mode 100644
index 00000000..d264bc7e
--- /dev/null
+++ b/payroll_payslip_patch/readme/CREDITS.rst
@@ -0,0 +1 @@
+* Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/payroll_payslip_patch/readme/DESCRIPTION.rst b/payroll_payslip_patch/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..1691f0ed
--- /dev/null
+++ b/payroll_payslip_patch/readme/DESCRIPTION.rst
@@ -0,0 +1,4 @@
+**THIS MODULE'S FUNCTIONALITY HAS BEEN MERGED INTO OCA/Payroll. DO NOT USE**
+
+This module patches the payslip processing source code in the Payroll module to enable additional functionality
+during payslip processing. It is a technical module that is used by other modules.
diff --git a/payroll_payslip_patch/readme/HISTORY.rst b/payroll_payslip_patch/readme/HISTORY.rst
new file mode 100644
index 00000000..91b71639
--- /dev/null
+++ b/payroll_payslip_patch/readme/HISTORY.rst
@@ -0,0 +1,4 @@
+14.0.2.0.0 (2022-08-17)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* The functionality in this module has been merged into OCA/Payroll. This module is no longer necessary.
diff --git a/payroll_payslip_patch/static/description/icon.png b/payroll_payslip_patch/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/payroll_payslip_patch/static/description/icon.png differ
diff --git a/payroll_payslip_patch/static/description/index.html b/payroll_payslip_patch/static/description/index.html
new file mode 100644
index 00000000..70c26ea8
--- /dev/null
+++ b/payroll_payslip_patch/static/description/index.html
@@ -0,0 +1,432 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Payslip Patch</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="payslip-patch">
+<h1 class="title">Payslip Patch</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:e4cddc0c64fb1c49b6e26f1eb65c6ed6c675e3c20265fee9b5189da07cc0cb30
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_payslip_patch"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<p><strong>THIS MODULE’S FUNCTIONALITY HAS BEEN MERGED INTO OCA/Payroll. DO NOT USE</strong></p>
+<p>This module patches the payslip processing source code in the Payroll module to enable additional functionality
+during payslip processing. It is a technical module that is used by other 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="toc-entry-1">Changelog</a><ul>
+<li><a class="reference internal" href="#section-1" id="toc-entry-2">14.0.2.0.0 (2022-08-17)</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-3">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-4">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-5">Authors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-6">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-7">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="changelog">
+<h1><a class="toc-backref" href="#toc-entry-1">Changelog</a></h1>
+<div class="section" id="section-1">
+<h2><a class="toc-backref" href="#toc-entry-2">14.0.2.0.0 (2022-08-17)</a></h2>
+<ul class="simple">
+<li>The functionality in this module has been merged into OCA/Payroll. This module is no longer necessary.</li>
+</ul>
+</div>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_payslip_patch%0Aversion:%2014.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="#toc-entry-4">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-5">Authors</a></h2>
+<ul class="simple">
+<li>TREVI Software</li>
+<li>Michael Telahun Makonnen</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-6">Other credits</a></h2>
+<ul class="simple">
+<li>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_payslip_patch">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/payroll_payslip_patch/static/src/img/main_screenshot.png b/payroll_payslip_patch/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/payroll_payslip_patch/static/src/img/main_screenshot.png differ
diff --git a/payroll_payslip_patch/tests/__init__.py b/payroll_payslip_patch/tests/__init__.py
new file mode 100644
index 00000000..ae3640a7
--- /dev/null
+++ b/payroll_payslip_patch/tests/__init__.py
@@ -0,0 +1,6 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+# Disable for the moment since the patching of methods seems to be
+# causing problems in tests in payroll_payslip_dictionary
+# from . import test_hr_payslip_patch
diff --git a/payroll_payslip_patch/tests/test_hr_payslip_patch.py b/payroll_payslip_patch/tests/test_hr_payslip_patch.py
new file mode 100644
index 00000000..ee210261
--- /dev/null
+++ b/payroll_payslip_patch/tests/test_hr_payslip_patch.py
@@ -0,0 +1,99 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo.addons.payroll.tests.common import TestPayslipBase
+
+
+def get_localdict_mock(*args, **kwargs):
+    return {"mock": True}
+
+
+def get_contractdict_mock(*args, **kwargs):
+    return {"my_mock_value": True}
+
+
+class TestPayslip(TestPayslipBase):
+    def setUp(self):
+        super().setUp()
+
+        self.Contract = self.env["hr.contract"]
+        self.HrPayslip = self.env["hr.payslip"]
+        self.Rule = self.env["hr.salary.rule"]
+
+        self.mock_rule = self.Rule.create(
+            {
+                "name": "Mock Salary Rule",
+                "code": "MOCK",
+                "sequence": 5,
+                "category_id": self.ref("payroll.ALW"),
+                "amount_select": "code",
+                "amount_python_compute": "result = (dictionaries.mock is True) and 1.0 or 0.0",
+            }
+        )
+        self.developer_pay_structure.write(
+            {"parent_id": self.ref("payroll.structure_base")}
+        )
+        self.developer_pay_structure.write({"rule_ids": [(4, self.mock_rule.id)]})
+
+        contracts = self.Contract.search([("employee_id", "=", self.richard_emp.id)])
+        contracts[0].kanban_state = "done"
+
+    def apply_contract_cron(self):
+        self.env.ref(
+            "hr_contract.ir_cron_data_contract_update_state"
+        ).method_direct_trigger()
+
+    def test_localdict(self):
+
+        self.apply_contract_cron()
+
+        # I create an employee Payslip
+        richard_payslip = self.env["hr.payslip"].create(
+            {"name": "Payslip of Richard", "employee_id": self.richard_emp.id}
+        )
+
+        # I patch the get_localdict() method to return my own dictionary
+        richard_payslip._patch_method("get_localdict", get_localdict_mock)
+        richard_payslip.compute_sheet()
+
+        mock_payslip_line = False
+        for line in richard_payslip.line_ids:
+            if line.code == "MOCK":
+                mock_payslip_line = line
+        self.assertTrue(mock_payslip_line, "The mock payslip rule was processed")
+        self.assertEqual(
+            mock_payslip_line.amount, 1.0, "The mock payslip rule was evaluated"
+        )
+
+        richard_payslip._revert_method("get_localdict")
+
+    def test_contractdict(self):
+
+        self.apply_contract_cron()
+        self.mock_rule.amount_python_compute = (
+            "result = (current_contract.my_mock_value is True) and 1.0 or 0.0"
+        )
+
+        # I create an employee Payslip
+        richard_payslip = self.env["hr.payslip"].create(
+            {"name": "Payslip of Richard", "employee_id": self.richard_emp.id}
+        )
+
+        # I patch the get_localdict() method to return my own dictionary
+        richard_payslip._patch_method("get_contractdict", get_contractdict_mock)
+        richard_payslip.compute_sheet()
+
+        mock_payslip_line = False
+        for line in richard_payslip.line_ids:
+            if line.code == "MOCK":
+                mock_payslip_line = line
+        self.assertTrue(
+            mock_payslip_line, "The mock payslip contract rule was processed"
+        )
+        self.assertEqual(
+            mock_payslip_line.amount,
+            1.0,
+            "The mock payslip contract rule was evaluated",
+        )
+
+        richard_payslip._revert_method("get_contractdict")
diff --git a/payroll_payslip_report/README.rst b/payroll_payslip_report/README.rst
new file mode 100644
index 00000000..41f1426d
--- /dev/null
+++ b/payroll_payslip_report/README.rst
@@ -0,0 +1,65 @@
+==============
+Payslip Report
+==============
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:360f0cde2936adef4a861812c616ccb7797b91cf4dc3b593c2903bb21d4243d7
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_payslip_report
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+This module provides a report to analyze payslips.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Known issues / Roadmap
+======================
+
+Changes to the "Include Category Codes" setting in Payroll Settings will not take effect until the module is upgraded.
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_payslip_report%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+
+Other credits
+~~~~~~~~~~~~~
+
+Cybrosys Technologies (<https://www.cybrosys.com>)
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_payslip_report>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/payroll_payslip_report/__init__.py b/payroll_payslip_report/__init__.py
new file mode 100644
index 00000000..dd5d227f
--- /dev/null
+++ b/payroll_payslip_report/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
+from . import report
diff --git a/payroll_payslip_report/__manifest__.py b/payroll_payslip_report/__manifest__.py
new file mode 100644
index 00000000..9ce48627
--- /dev/null
+++ b/payroll_payslip_report/__manifest__.py
@@ -0,0 +1,25 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Payslip Report",
+    "summary": "Comprehensive payslip report by department.",
+    "category": "Payroll",
+    "version": "15.0.1.0.0",
+    "author": "TREVI Software",
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "images": ["static/src/img/main_screenshot.png"],
+    "license": "AGPL-3",
+    "depends": [
+        "payroll",
+        "payroll_default_salary_rules",
+    ],
+    "data": [
+        "security/ir.model.access.csv",
+        "data/payslip_report_data.xml",
+        "report/hr_payslip_report.xml",
+        "views/res_config_settings_views.xml",
+    ],
+    "installable": True,
+    "application": False,
+}
diff --git a/payroll_payslip_report/data/payslip_report_data.xml b/payroll_payslip_report/data/payslip_report_data.xml
new file mode 100644
index 00000000..0f8a9120
--- /dev/null
+++ b/payroll_payslip_report/data/payslip_report_data.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data noupdate="1">
+        <function
+            model="ir.config_parameter"
+            name="set_param"
+            eval="('payroll_payslip_report.include_category_codes', 'BASIC,OVERTM,ALLWNC,ERPTAX,ERCONT')"
+        />
+
+    </data>
+</odoo>
diff --git a/payroll_payslip_report/i18n/payroll_payslip_report.pot b/payroll_payslip_report/i18n/payroll_payslip_report.pot
new file mode 100644
index 00000000..8e6c3acd
--- /dev/null
+++ b/payroll_payslip_report/i18n/payroll_payslip_report.pot
@@ -0,0 +1,200 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* payroll_payslip_report
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: payroll_payslip_report
+#: model:ir.model.fields,field_description:payroll_payslip_report.field_hr_payslip_report_view__rule_amount
+msgid "Amount"
+msgstr ""
+
+#. module: payroll_payslip_report
+#: model:ir.ui.menu,name:payroll_payslip_report.menu_hr_payslip_category_view_report
+msgid "Analysis by Category"
+msgstr ""
+
+#. module: payroll_payslip_report
+#: model:ir.ui.menu,name:payroll_payslip_report.menu_hr_payslip_view_report
+msgid "Analysis by Department"
+msgstr ""
+
+#. module: payroll_payslip_report
+#: model_terms:ir.ui.view,arch_db:payroll_payslip_report.res_config_settings_view_form
+msgid ""
+"Comma-separated list of codes of salary rule\n"
+"                                categories to include in the payslip analysis reports."
+msgstr ""
+
+#. module: payroll_payslip_report
+#: model:ir.model.fields,field_description:payroll_payslip_report.field_hr_payslip_report_view__company_id
+#: model_terms:ir.ui.view,arch_db:payroll_payslip_report.hr_payroll_report_view_search
+msgid "Company"
+msgstr ""
+
+#. module: payroll_payslip_report
+#: model:ir.model,name:payroll_payslip_report.model_res_config_settings
+msgid "Config Settings"
+msgstr ""
+
+#. module: payroll_payslip_report
+#: model_terms:ir.ui.view,arch_db:payroll_payslip_report.hr_payroll_report_view_search
+msgid "Date From"
+msgstr ""
+
+#. module: payroll_payslip_report
+#: model:ir.model.fields,field_description:payroll_payslip_report.field_hr_payslip_report_view__department_id
+#: model_terms:ir.ui.view,arch_db:payroll_payslip_report.hr_payroll_report_view_search
+msgid "Department"
+msgstr ""
+
+#. module: payroll_payslip_report
+#: model:ir.model.fields,field_description:payroll_payslip_report.field_hr_payslip_report_view__display_name
+#: model:ir.model.fields,field_description:payroll_payslip_report.field_res_config_settings__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: payroll_payslip_report
+#: model:ir.model.fields.selection,name:payroll_payslip_report.selection__hr_payslip_report_view__state__done
+#: model_terms:ir.ui.view,arch_db:payroll_payslip_report.hr_payroll_report_view_search
+msgid "Done"
+msgstr ""
+
+#. module: payroll_payslip_report
+#: model:ir.model.fields.selection,name:payroll_payslip_report.selection__hr_payslip_report_view__state__draft
+#: model_terms:ir.ui.view,arch_db:payroll_payslip_report.hr_payroll_report_view_search
+msgid "Draft"
+msgstr ""
+
+#. module: payroll_payslip_report
+#: model:ir.model.fields,field_description:payroll_payslip_report.field_hr_payslip_report_view__name
+#: model_terms:ir.ui.view,arch_db:payroll_payslip_report.hr_payroll_report_view_search
+msgid "Employee"
+msgstr ""
+
+#. module: payroll_payslip_report
+#: model:ir.model.fields,field_description:payroll_payslip_report.field_hr_payslip_report_view__date_from
+msgid "From"
+msgstr ""
+
+#. module: payroll_payslip_report
+#: model_terms:ir.ui.view,arch_db:payroll_payslip_report.hr_payroll_report_view_search
+msgid "Group By"
+msgstr ""
+
+#. module: payroll_payslip_report
+#: model:ir.model.fields,field_description:payroll_payslip_report.field_hr_payslip_report_view__id
+#: model:ir.model.fields,field_description:payroll_payslip_report.field_res_config_settings__id
+msgid "ID"
+msgstr ""
+
+#. module: payroll_payslip_report
+#: model:ir.model.fields,field_description:payroll_payslip_report.field_res_config_settings__include_category_codes
+msgid "Include Category Codes"
+msgstr ""
+
+#. module: payroll_payslip_report
+#: model_terms:ir.ui.view,arch_db:payroll_payslip_report.hr_payroll_report_view_search
+msgid "Job"
+msgstr ""
+
+#. module: payroll_payslip_report
+#: model:ir.model.fields,field_description:payroll_payslip_report.field_hr_payslip_report_view__job_id
+msgid "Job Title"
+msgstr ""
+
+#. module: payroll_payslip_report
+#: model:ir.model.fields,field_description:payroll_payslip_report.field_hr_payslip_report_view____last_update
+#: model:ir.model.fields,field_description:payroll_payslip_report.field_res_config_settings____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: payroll_payslip_report
+#: model_terms:ir.ui.view,arch_db:payroll_payslip_report.hr_payroll_report_view_search
+msgid "My Department"
+msgstr ""
+
+#. module: payroll_payslip_report
+#: model:ir.actions.act_window,name:payroll_payslip_report.action_hr_payslip_category_view_report
+msgid "Payroll Analysis"
+msgstr ""
+
+#. module: payroll_payslip_report
+#: model:ir.actions.act_window,name:payroll_payslip_report.action_hr_payslip_view_report
+#: model_terms:ir.ui.view,arch_db:payroll_payslip_report.hr_payroll_report_view_search
+msgid "Payslip Analysis"
+msgstr ""
+
+#. module: payroll_payslip_report
+#: model:ir.model,name:payroll_payslip_report.model_hr_payslip_report_view
+msgid "Payslip Analysis View"
+msgstr ""
+
+#. module: payroll_payslip_report
+#: model_terms:ir.ui.view,arch_db:payroll_payslip_report.hr_payroll_report_category_view_graph
+#: model_terms:ir.ui.view,arch_db:payroll_payslip_report.hr_payroll_report_category_view_pivot
+msgid "Payslip Analysis by Category"
+msgstr ""
+
+#. module: payroll_payslip_report
+#: model_terms:ir.ui.view,arch_db:payroll_payslip_report.hr_payroll_report_view_graph
+#: model_terms:ir.ui.view,arch_db:payroll_payslip_report.hr_payroll_report_view_pivot
+msgid "Payslip Analysis by Department"
+msgstr ""
+
+#. module: payroll_payslip_report
+#: model_terms:ir.ui.view,arch_db:payroll_payslip_report.res_config_settings_view_form
+msgid "Payslip Report Analysis"
+msgstr ""
+
+#. module: payroll_payslip_report
+#: model:ir.model.fields.selection,name:payroll_payslip_report.selection__hr_payslip_report_view__state__cancel
+msgid "Rejected"
+msgstr ""
+
+#. module: payroll_payslip_report
+#: model:ir.ui.menu,name:payroll_payslip_report.menu_hr_payslip_reports
+msgid "Reports"
+msgstr ""
+
+#. module: payroll_payslip_report
+#: model:ir.model.fields,field_description:payroll_payslip_report.field_hr_payslip_report_view__rule_name
+#: model_terms:ir.ui.view,arch_db:payroll_payslip_report.hr_payroll_report_view_search
+msgid "Rule Category"
+msgstr ""
+
+#. module: payroll_payslip_report
+#: model:ir.model.fields,field_description:payroll_payslip_report.field_hr_payslip_report_view__rule_id
+#: model_terms:ir.ui.view,arch_db:payroll_payslip_report.hr_payroll_report_view_search
+msgid "Salary Rule"
+msgstr ""
+
+#. module: payroll_payslip_report
+#: model:ir.model.fields,field_description:payroll_payslip_report.field_hr_payslip_report_view__struct_id
+msgid "Salary Structure"
+msgstr ""
+
+#. module: payroll_payslip_report
+#: model:ir.model.fields,field_description:payroll_payslip_report.field_hr_payslip_report_view__state
+#: model_terms:ir.ui.view,arch_db:payroll_payslip_report.hr_payroll_report_view_search
+msgid "Status"
+msgstr ""
+
+#. module: payroll_payslip_report
+#: model:ir.model.fields,field_description:payroll_payslip_report.field_hr_payslip_report_view__date_to
+msgid "To"
+msgstr ""
+
+#. module: payroll_payslip_report
+#: model:ir.model.fields.selection,name:payroll_payslip_report.selection__hr_payslip_report_view__state__verify
+msgid "Waiting"
+msgstr ""
diff --git a/payroll_payslip_report/models/__init__.py b/payroll_payslip_report/models/__init__.py
new file mode 100644
index 00000000..aa6387a0
--- /dev/null
+++ b/payroll_payslip_report/models/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import res_config_settings
diff --git a/payroll_payslip_report/models/res_config_settings.py b/payroll_payslip_report/models/res_config_settings.py
new file mode 100644
index 00000000..5cdd75a6
--- /dev/null
+++ b/payroll_payslip_report/models/res_config_settings.py
@@ -0,0 +1,13 @@
+# 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 ResConfigSettings(models.TransientModel):
+
+    _inherit = "res.config.settings"
+
+    include_category_codes = fields.Char(
+        config_parameter="payroll_payslip_report.include_category_codes"
+    )
diff --git a/payroll_payslip_report/readme/CREDITS.rst b/payroll_payslip_report/readme/CREDITS.rst
new file mode 100644
index 00000000..6cdef304
--- /dev/null
+++ b/payroll_payslip_report/readme/CREDITS.rst
@@ -0,0 +1 @@
+Cybrosys Technologies (<https://www.cybrosys.com>)
diff --git a/payroll_payslip_report/readme/DESCRIPTION.rst b/payroll_payslip_report/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..acd520bf
--- /dev/null
+++ b/payroll_payslip_report/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+This module provides a report to analyze payslips.
diff --git a/payroll_payslip_report/readme/ROADMAP.rst b/payroll_payslip_report/readme/ROADMAP.rst
new file mode 100644
index 00000000..b840c2e0
--- /dev/null
+++ b/payroll_payslip_report/readme/ROADMAP.rst
@@ -0,0 +1 @@
+Changes to the "Include Category Codes" setting in Payroll Settings will not take effect until the module is upgraded.
diff --git a/payroll_payslip_report/report/__init__.py b/payroll_payslip_report/report/__init__.py
new file mode 100644
index 00000000..b3412587
--- /dev/null
+++ b/payroll_payslip_report/report/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import hr_payslip_report
diff --git a/payroll_payslip_report/report/hr_payslip_report.py b/payroll_payslip_report/report/hr_payslip_report.py
new file mode 100644
index 00000000..3354ed0b
--- /dev/null
+++ b/payroll_payslip_report/report/hr_payslip_report.py
@@ -0,0 +1,114 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2020-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
+# Author: Anusha (<https://www.cybrosys.com>)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import SUPERUSER_ID, fields, models, tools
+
+
+class PayrollReportView(models.Model):
+    _name = "hr.payslip.report.view"
+    _description = "Payslip Analysis View"
+    _auto = False
+
+    name = fields.Many2one("hr.employee", string="Employee")
+    date_from = fields.Date(string="From")
+    date_to = fields.Date(string="To")
+    state = fields.Selection(
+        [
+            ("draft", "Draft"),
+            ("verify", "Waiting"),
+            ("done", "Done"),
+            ("cancel", "Rejected"),
+        ],
+        string="Status",
+    )
+    job_id = fields.Many2one("hr.job", string="Job Title")
+    company_id = fields.Many2one("res.company", string="Company")
+    department_id = fields.Many2one("hr.department", string="Department")
+    rule_name = fields.Many2one("hr.salary.rule.category", string="Rule Category")
+    rule_amount = fields.Float(string="Amount")
+    struct_id = fields.Many2one("hr.payroll.structure", string="Salary Structure")
+    rule_id = fields.Many2one("hr.salary.rule", string="Salary Rule")
+
+    def _select(self):
+        select_str = """
+            min(psl.id),
+            ps.id, ps.number,
+            emp.id as name,
+            dp.id as department_id,
+            jb.id as job_id,
+            cmp.id as company_id,
+            ps.date_from, ps.date_to,
+            ps.state as state,
+            rl.id as rule_name,
+            psl.total as rule_amount,
+            ps.struct_id as struct_id,
+            rlu.id as rule_id"""
+        return select_str
+
+    def _from(self):
+        from_str = """
+                hr_payslip_line psl
+                join hr_payslip ps on ps.id=psl.slip_id
+                join hr_salary_rule rlu on rlu.id = psl.salary_rule_id
+                join hr_employee emp on ps.employee_id=emp.id
+                join hr_salary_rule_category rl on rl.id = psl.category_id
+                left join hr_department dp on emp.department_id=dp.id
+                left join hr_job jb on emp.job_id=jb.id
+                join res_company cmp on cmp.id=ps.company_id
+             """
+        return from_str
+
+    def _group_by(self):
+        group_by_str = """
+            ps.number,
+            ps.id,
+            emp.id,
+            dp.id,
+            jb.id,
+            cmp.id,
+            ps.date_from,
+            ps.date_to,
+            ps.state,
+            psl.total,
+            psl.name,
+            psl.category_id,
+            rl.id,rlu.id"""
+        return group_by_str
+
+    def _having(self):
+
+        ir_config = self.env["ir.config_parameter"].with_user(SUPERUSER_ID)
+        include_category_codes = (
+            ir_config.get_param("payroll_payslip_report.include_category_codes")
+        ) or ""
+        lst_inc_rulecateg = include_category_codes.split(",")
+        inc_rulecateg_ids = False
+        if len(lst_inc_rulecateg) > 0:
+            inc_rulecateg_ids = self.env["hr.salary.rule.category"].search(
+                [("code", "in", lst_inc_rulecateg)]
+            )
+
+        having_str = ""
+        if inc_rulecateg_ids:
+            having_str = f"HAVING psl.category_id IN {tuple(inc_rulecateg_ids.ids)}"
+
+        return having_str
+
+    def init(self):
+        tools.drop_view_if_exists(self.env.cr, self._table)
+        query = """CREATE or REPLACE VIEW %s as ( SELECT
+                   %s
+                   FROM %s
+                   GROUP BY
+                   %s
+                   %s
+                   )""" % (
+            self._table,
+            self._select(),
+            self._from(),
+            self._group_by(),
+            self._having(),
+        )
+        self.env.cr.execute(query)
diff --git a/payroll_payslip_report/report/hr_payslip_report.xml b/payroll_payslip_report/report/hr_payslip_report.xml
new file mode 100644
index 00000000..c758fb30
--- /dev/null
+++ b/payroll_payslip_report/report/hr_payslip_report.xml
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+
+    <menuitem
+        name="Reports"
+        id="menu_hr_payslip_reports"
+        parent="payroll.payroll_menu_root"
+        groups="payroll.group_payroll_user"
+        sequence="90"
+    />
+
+    <!-- By Department -->
+    <record id="hr_payroll_report_view_pivot" model="ir.ui.view">
+        <field name="name">hr.payslip.pivot</field>
+        <field name="model">hr.payslip.report.view</field>
+        <field name="arch" type="xml">
+            <pivot string="Payslip Analysis by Department">
+                <field name="date_from" type="row" />
+                <field name="rule_amount" type="measure" />
+                <field name="department_id" type="col" />
+            </pivot>
+        </field>
+    </record>
+
+    <record id="hr_payroll_report_view_graph" model="ir.ui.view">
+        <field name="name">hr.payslip.graph</field>
+        <field name="model">hr.payslip.report.view</field>
+        <field name="arch" type="xml">
+            <graph string="Payslip Analysis by Department">
+                <field name="date_from" type="row" />
+                <field name="rule_amount" type="measure" />
+                <field name="department_id" type="col" />
+            </graph>
+        </field>
+    </record>
+
+    <!-- By Salary Rule Category -->
+    <record id="hr_payroll_report_category_view_pivot" model="ir.ui.view">
+        <field name="name">hr.payslip.pivot.category</field>
+        <field name="model">hr.payslip.report.view</field>
+        <field name="arch" type="xml">
+            <pivot string="Payslip Analysis by Category">
+                <field name="date_from" type="row" />
+                <field name="rule_amount" type="measure" />
+                <field name="rule_name" type="col" />
+            </pivot>
+        </field>
+    </record>
+
+    <record id="hr_payroll_report_category_view_graph" model="ir.ui.view">
+        <field name="name">hr.payslip.graph.category</field>
+        <field name="model">hr.payslip.report.view</field>
+        <field name="arch" type="xml">
+            <graph string="Payslip Analysis by Category">
+                <field name="date_from" type="row" />
+                <field name="rule_amount" type="measure" />
+                <field name="rule_name" type="col" />
+            </graph>
+        </field>
+    </record>
+
+    <record id="hr_payroll_report_view_search" model="ir.ui.view">
+        <field name="name">hr.payslip.search</field>
+        <field name="model">hr.payslip.report.view</field>
+        <field name="arch" type="xml">
+            <search string="Payslip Analysis">
+                <field name="name" />
+                <field name="rule_name" />
+                <field name="date_from" />
+                <field name="company_id" groups="base.group_multi_company" />
+                <filter
+                    name="my_department"
+                    string="My Department"
+                    domain="[('department_id.member_ids.user_id', '=', uid)]"
+                />
+                <filter
+                    string="Date From"
+                    name="filter_datefrom"
+                    date="date_from"
+                    default_period="this_year"
+                />
+                <filter name="Done" string="Done" domain="[('state','=', 'done')]" />
+                <filter name="Draft" string="Draft" domain="[('state','=','draft')]" />
+                <separator />
+                <field name="department_id" />
+                <group expand="1" string="Group By">
+                    <filter
+                        string="Employee"
+                        name="Employee"
+                        context="{'group_by':'name'}"
+                    />
+                    <filter string="Job" name="job" context="{'group_by':'job_id'}" />
+                    <filter
+                        string="Department"
+                        name="department"
+                        context="{'group_by':'department_id'}"
+                    />
+                    <filter
+                        string="Rule Category"
+                        name="rule_categ"
+                        context="{'group_by':'rule_name'}"
+                    />
+                    <filter
+                        string="Salary Rule"
+                        name="rule_id"
+                        context="{'group_by':'rule_id'}"
+                    />
+                    <filter
+                        name="status"
+                        string="Status"
+                        context="{'group_by':'state'}"
+                    />
+                    <filter
+                        string="Company"
+                        name="company"
+                        groups="base.group_multi_company"
+                        context="{'group_by':'company_id'}"
+                    />
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="action_hr_payslip_view_report" model="ir.actions.act_window">
+        <field name="res_model">hr.payslip.report.view</field>
+        <field name="name">Payslip Analysis</field>
+        <field name="view_mode">graph,pivot</field>
+        <field
+            name="view_ids"
+            eval="[
+            (5, 0, 0),
+            (0, 0, {'view_mode': 'graph', 'view_id': ref('hr_payroll_report_view_graph')}),
+            (0, 0, {'view_mode': 'pivot', 'view_id': ref('hr_payroll_report_view_pivot')}),
+        ]"
+        />
+        <field name="context">
+            {'search_default_filter_datefrom':1}
+        </field>
+    </record>
+    <menuitem
+        id="menu_hr_payslip_view_report"
+        name="Analysis by Department"
+        parent="menu_hr_payslip_reports"
+        action="action_hr_payslip_view_report"
+        groups="payroll.group_payroll_user"
+        sequence="10"
+    />
+
+    <record id="action_hr_payslip_category_view_report" model="ir.actions.act_window">
+        <field name="res_model">hr.payslip.report.view</field>
+        <field name="name">Payroll Analysis</field>
+        <field name="view_mode">graph,pivot</field>
+        <field
+            name="view_ids"
+            eval="[
+            (5, 0, 0),
+            (0, 0, {'view_mode': 'graph', 'view_id': ref('hr_payroll_report_category_view_graph')}),
+            (0, 0, {'view_mode': 'pivot', 'view_id': ref('hr_payroll_report_category_view_pivot')}),
+        ]"
+        />
+        <field name="context">
+            {'search_default_filter_datefrom':1}
+        </field>
+    </record>
+    <menuitem
+        id="menu_hr_payslip_category_view_report"
+        name="Analysis by Category"
+        parent="menu_hr_payslip_reports"
+        action="action_hr_payslip_category_view_report"
+        groups="payroll.group_payroll_user"
+        sequence="20"
+    />
+
+</odoo>
diff --git a/payroll_payslip_report/security/ir.model.access.csv b/payroll_payslip_report/security/ir.model.access.csv
new file mode 100644
index 00000000..3966ef83
--- /dev/null
+++ b/payroll_payslip_report/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_payslip_report_user,hr.payslip.report.view,payroll_payslip_report.model_hr_payslip_report_view,payroll.group_payroll_user,1,1,1,1
diff --git a/payroll_payslip_report/static/description/icon.png b/payroll_payslip_report/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/payroll_payslip_report/static/description/icon.png differ
diff --git a/payroll_payslip_report/static/description/index.html b/payroll_payslip_report/static/description/index.html
new file mode 100644
index 00000000..733946fc
--- /dev/null
+++ b/payroll_payslip_report/static/description/index.html
@@ -0,0 +1,419 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Payslip Report</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="payslip-report">
+<h1 class="title">Payslip Report</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:360f0cde2936adef4a861812c616ccb7797b91cf4dc3b593c2903bb21d4243d7
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_payslip_report"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<p>This module provides a report to analyze payslips.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#known-issues-roadmap" id="toc-entry-1">Known issues / Roadmap</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-2">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-3">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-4">Authors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-5">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-6">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="known-issues-roadmap">
+<h1><a class="toc-backref" href="#toc-entry-1">Known issues / Roadmap</a></h1>
+<p>Changes to the “Include Category Codes” setting in Payroll Settings will not take effect until the module is upgraded.</p>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_payslip_report%0Aversion:%2014.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="#toc-entry-3">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-4">Authors</a></h2>
+<ul class="simple">
+<li>TREVI Software</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-5">Other credits</a></h2>
+<p>Cybrosys Technologies (&lt;<a class="reference external" href="https://www.cybrosys.com">https://www.cybrosys.com</a>&gt;)</p>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_payslip_report">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/payroll_payslip_report/static/src/img/main_screenshot.png b/payroll_payslip_report/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/payroll_payslip_report/static/src/img/main_screenshot.png differ
diff --git a/payroll_payslip_report/views/res_config_settings_views.xml b/payroll_payslip_report/views/res_config_settings_views.xml
new file mode 100644
index 00000000..0c92a98d
--- /dev/null
+++ b/payroll_payslip_report/views/res_config_settings_views.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field
+            name="name"
+        >res.config.settings.view.form.inherit.payroll_payslip_dictionary</field>
+        <field name="model">res.config.settings</field>
+        <field name="priority" eval="80" />
+        <field name="inherit_id" ref="payroll.res_config_settings_view_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//div[@data-key='payroll']" position="inside">
+                <h2>Payslip Report Analysis</h2>
+                <div
+                    class="row mt16 o_settings_container"
+                    name="payroll_payslip_report_setting_container"
+                >
+                    <div class="col-12 col-lg-6 o_setting_box" id="inc_category_codes">
+                        <div class="o_setting_left_pane" />
+                        <div class="o_setting_right_pane">
+                            <label for="include_category_codes" />
+                            <field name="include_category_codes" />
+                            <div class="text-muted">
+                                Comma-separated list of codes of salary rule
+                                categories to include in the payslip analysis reports.
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/payroll_period_account/README.rst b/payroll_period_account/README.rst
new file mode 100644
index 00000000..5d7a602f
--- /dev/null
+++ b/payroll_period_account/README.rst
@@ -0,0 +1,61 @@
+======================
+Payroll Period Account
+======================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:80f26ce27dae6cc5cc26dffdff8a96b1081ae9afd2285d957892008e05f317ed
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_period_account
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+This module links payroll periods to payroll accounting.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_period_account%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+* Michael Telahun Makonnen
+
+Other credits
+~~~~~~~~~~~~~
+
+* Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_period_account>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/payroll_period_account/__init__.py b/payroll_period_account/__init__.py
new file mode 100644
index 00000000..2b0f2dca
--- /dev/null
+++ b/payroll_period_account/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
diff --git a/payroll_period_account/__manifest__.py b/payroll_period_account/__manifest__.py
new file mode 100644
index 00000000..1d8a3e35
--- /dev/null
+++ b/payroll_period_account/__manifest__.py
@@ -0,0 +1,22 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Payroll Period Account",
+    "summary": "Links payroll periods to accounting",
+    "version": "15.0.1.0.0",
+    "category": "Payroll",
+    "images": ["static/src/img/main_screenshot.png"],
+    "author": "TREVI Software, Michael Telahun Makonnen",
+    "license": "AGPL-3",
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "payroll_account",
+        "payroll_periods",
+    ],
+    "data": [
+        "security/ir.model.access.csv",
+    ],
+    "installable": True,
+}
diff --git a/payroll_period_account/i18n/payroll_period_account.pot b/payroll_period_account/i18n/payroll_period_account.pot
new file mode 100644
index 00000000..106c80ba
--- /dev/null
+++ b/payroll_period_account/i18n/payroll_period_account.pot
@@ -0,0 +1,34 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* payroll_period_account
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: payroll_period_account
+#: model:ir.model.fields,field_description:payroll_period_account.field_hr_payroll_period__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: payroll_period_account
+#: model:ir.model.fields,field_description:payroll_period_account.field_hr_payroll_period__id
+msgid "ID"
+msgstr ""
+
+#. module: payroll_period_account
+#: model:ir.model.fields,field_description:payroll_period_account.field_hr_payroll_period____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: payroll_period_account
+#: model:ir.model,name:payroll_period_account.model_hr_payroll_period
+msgid "Payroll Periods"
+msgstr ""
diff --git a/payroll_period_account/models/__init__.py b/payroll_period_account/models/__init__.py
new file mode 100644
index 00000000..ece97414
--- /dev/null
+++ b/payroll_period_account/models/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import hr_payroll_period
diff --git a/payroll_period_account/models/hr_payroll_period.py b/payroll_period_account/models/hr_payroll_period.py
new file mode 100644
index 00000000..491cc8c1
--- /dev/null
+++ b/payroll_period_account/models/hr_payroll_period.py
@@ -0,0 +1,20 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+
+from odoo import api, models
+
+
+class HrPayrollPeriod(models.Model):
+
+    _inherit = "hr.payroll.period"
+
+    @api.model
+    def payslip_create_hook(self, dictCreate):
+
+        if dictCreate.get("run_id", False):
+            run = self.env["hr.payslip.run"].browse(dictCreate["run_id"])
+            if run.journal_id:
+                dictCreate.update({"journal_id": run.journal_id.id})
+        return dictCreate
diff --git a/payroll_period_account/readme/CREDITS.rst b/payroll_period_account/readme/CREDITS.rst
new file mode 100644
index 00000000..d264bc7e
--- /dev/null
+++ b/payroll_period_account/readme/CREDITS.rst
@@ -0,0 +1 @@
+* Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/payroll_period_account/readme/DESCRIPTION.rst b/payroll_period_account/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..a7dbe560
--- /dev/null
+++ b/payroll_period_account/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+This module links payroll periods to payroll accounting.
diff --git a/payroll_period_account/security/ir.model.access.csv b/payroll_period_account/security/ir.model.access.csv
new file mode 100644
index 00000000..973c8b42
--- /dev/null
+++ b/payroll_period_account/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_account_journal_po,account.journal,account.model_account_journal,payroll.group_payroll_user,1,0,0,0
diff --git a/payroll_period_account/static/description/icon.png b/payroll_period_account/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/payroll_period_account/static/description/icon.png differ
diff --git a/payroll_period_account/static/description/index.html b/payroll_period_account/static/description/index.html
new file mode 100644
index 00000000..5d7b417f
--- /dev/null
+++ b/payroll_period_account/static/description/index.html
@@ -0,0 +1,417 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Payroll Period Account</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="payroll-period-account">
+<h1 class="title">Payroll Period Account</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:80f26ce27dae6cc5cc26dffdff8a96b1081ae9afd2285d957892008e05f317ed
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_period_account"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<p>This module links payroll periods to payroll accounting.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-4">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_period_account%0Aversion:%2014.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="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>TREVI Software</li>
+<li>Michael Telahun Makonnen</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-4">Other credits</a></h2>
+<ul class="simple">
+<li>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_period_account">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/payroll_period_account/static/src/img/main_screenshot.png b/payroll_period_account/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/payroll_period_account/static/src/img/main_screenshot.png differ
diff --git a/payroll_period_base_lock/README.rst b/payroll_period_base_lock/README.rst
new file mode 100644
index 00000000..f0e1cd43
--- /dev/null
+++ b/payroll_period_base_lock/README.rst
@@ -0,0 +1,61 @@
+===================
+Payroll Period Lock
+===================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:b19713d91e8d4b29c366a8c6761f0d93c984597b999e26bb7e1853c66b73fc40
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_period_base_lock
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+This module allows the Payroll Manager to lock and unlock a payroll period.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_period_base_lock%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+* Michael Telahun Makonnen
+
+Other credits
+~~~~~~~~~~~~~
+
+* Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_period_base_lock>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/payroll_period_base_lock/__init__.py b/payroll_period_base_lock/__init__.py
new file mode 100644
index 00000000..2b0f2dca
--- /dev/null
+++ b/payroll_period_base_lock/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
diff --git a/payroll_period_base_lock/__manifest__.py b/payroll_period_base_lock/__manifest__.py
new file mode 100644
index 00000000..afde8bbd
--- /dev/null
+++ b/payroll_period_base_lock/__manifest__.py
@@ -0,0 +1,19 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Payroll Period Lock",
+    "summary": "Adds a base lock field to a payroll period.",
+    "version": "15.0.1.0.0",
+    "category": "Payroll",
+    "images": ["static/src/img/main_screenshot.png"],
+    "author": "TREVI Software, Michael Telahun Makonnen",
+    "license": "AGPL-3",
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": ["base_lock", "payroll_periods"],
+    "data": [
+        "security/ir.model.access.csv",
+    ],
+    "installable": True,
+}
diff --git a/payroll_period_base_lock/i18n/payroll_period_base_lock.pot b/payroll_period_base_lock/i18n/payroll_period_base_lock.pot
new file mode 100644
index 00000000..d7bab460
--- /dev/null
+++ b/payroll_period_base_lock/i18n/payroll_period_base_lock.pot
@@ -0,0 +1,49 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* payroll_period_base_lock
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: payroll_period_base_lock
+#: model:ir.model.fields,field_description:payroll_period_base_lock.field_hr_payroll_period__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: payroll_period_base_lock
+#: model:ir.model.fields,field_description:payroll_period_base_lock.field_hr_payroll_period__id
+msgid "ID"
+msgstr ""
+
+#. module: payroll_period_base_lock
+#: model:ir.model.fields,field_description:payroll_period_base_lock.field_hr_payroll_period____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: payroll_period_base_lock
+#: model:ir.model.fields.selection,name:payroll_period_base_lock.selection__hr_payroll_period__state__locked
+msgid "Locked"
+msgstr ""
+
+#. module: payroll_period_base_lock
+#: model:ir.model.fields,field_description:payroll_period_base_lock.field_hr_payroll_period__lock_id
+msgid "Payroll Lock"
+msgstr ""
+
+#. module: payroll_period_base_lock
+#: model:ir.model,name:payroll_period_base_lock.model_hr_payroll_period
+msgid "Payroll Periods"
+msgstr ""
+
+#. module: payroll_period_base_lock
+#: model:ir.model.fields,field_description:payroll_period_base_lock.field_hr_payroll_period__state
+msgid "State"
+msgstr ""
diff --git a/payroll_period_base_lock/models/__init__.py b/payroll_period_base_lock/models/__init__.py
new file mode 100644
index 00000000..ece97414
--- /dev/null
+++ b/payroll_period_base_lock/models/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import hr_payroll_period
diff --git a/payroll_period_base_lock/models/hr_payroll_period.py b/payroll_period_base_lock/models/hr_payroll_period.py
new file mode 100644
index 00000000..3deac4ee
--- /dev/null
+++ b/payroll_period_base_lock/models/hr_payroll_period.py
@@ -0,0 +1,65 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import api, fields, models
+from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT as OE_DTFORMAT
+
+
+class PayrollPeriod(models.Model):
+    _inherit = "hr.payroll.period"
+
+    lock_id = fields.Many2one(comodel_name="base.lock", string="Payroll Lock")
+    state = fields.Selection(
+        selection_add=[
+            ("open",),
+            ("ended",),
+            ("locked", "Locked"),
+            ("generate",),
+            ("payment",),
+            ("closed",),
+        ],
+    )
+
+    @api.model
+    def lock_period(self, periods, employee_ids):
+
+        PayrollLock = self.env["base.lock"]
+        for period in periods:
+            utcDtStart, utcDtEnd = self.get_utc_times(period)
+            lock_id = PayrollLock.create(
+                {
+                    "name": period.name,
+                    "start_time": utcDtStart.strftime(OE_DTFORMAT),
+                    "end_time": utcDtEnd.strftime(OE_DTFORMAT),
+                    "tz": period.schedule_id.tz,
+                }
+            )
+            period.lock_id = lock_id
+
+        return
+
+    @api.model
+    def unlock_period(self, periods, employee_ids):
+
+        for period in periods:
+            if period.lock_id:
+                period.lock_id.unlink()
+
+        return
+
+    def set_state_locked(self):
+
+        for period in self:
+            self.lock_period([period])
+            period.state = "locked"
+
+        return True
+
+    @api.model
+    def is_payroll_locked(self, utcdt_str):
+
+        PayrollLock = self.env["base.lock"]
+        is_locked = PayrollLock.is_locked_datetime_utc(utcdt_str)
+
+        return is_locked
diff --git a/payroll_period_base_lock/readme/CREDITS.rst b/payroll_period_base_lock/readme/CREDITS.rst
new file mode 100644
index 00000000..d264bc7e
--- /dev/null
+++ b/payroll_period_base_lock/readme/CREDITS.rst
@@ -0,0 +1 @@
+* Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/payroll_period_base_lock/readme/DESCRIPTION.rst b/payroll_period_base_lock/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..72dcaf48
--- /dev/null
+++ b/payroll_period_base_lock/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+This module allows the Payroll Manager to lock and unlock a payroll period.
diff --git a/payroll_period_base_lock/security/ir.model.access.csv b/payroll_period_base_lock/security/ir.model.access.csv
new file mode 100644
index 00000000..a658a4dd
--- /dev/null
+++ b/payroll_period_base_lock/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_lock_user,access_base_lock,base_lock.model_base_lock,base.group_user,1,0,0,0
+access_lock_user_payroll_manager,access_base_lock,base_lock.model_base_lock,payroll.group_payroll_manager,1,1,1,1
diff --git a/payroll_period_base_lock/static/description/icon.png b/payroll_period_base_lock/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/payroll_period_base_lock/static/description/icon.png differ
diff --git a/payroll_period_base_lock/static/description/index.html b/payroll_period_base_lock/static/description/index.html
new file mode 100644
index 00000000..54885779
--- /dev/null
+++ b/payroll_period_base_lock/static/description/index.html
@@ -0,0 +1,417 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Payroll Period Lock</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="payroll-period-lock">
+<h1 class="title">Payroll Period Lock</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:b19713d91e8d4b29c366a8c6761f0d93c984597b999e26bb7e1853c66b73fc40
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_period_base_lock"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<p>This module allows the Payroll Manager to lock and unlock a payroll period.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-4">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_period_base_lock%0Aversion:%2014.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="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>TREVI Software</li>
+<li>Michael Telahun Makonnen</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-4">Other credits</a></h2>
+<ul class="simple">
+<li>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_period_base_lock">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/payroll_period_base_lock/static/src/img/main_screenshot.png b/payroll_period_base_lock/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/payroll_period_base_lock/static/src/img/main_screenshot.png differ
diff --git a/payroll_period_base_lock/tests/__init__.py b/payroll_period_base_lock/tests/__init__.py
new file mode 100644
index 00000000..79e5a3f6
--- /dev/null
+++ b/payroll_period_base_lock/tests/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import test_lock
diff --git a/payroll_period_base_lock/tests/test_lock.py b/payroll_period_base_lock/tests/test_lock.py
new file mode 100644
index 00000000..451a9c9e
--- /dev/null
+++ b/payroll_period_base_lock/tests/test_lock.py
@@ -0,0 +1,89 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import datetime
+
+from odoo.exceptions import AccessError
+from odoo.tests import common, new_test_user
+
+
+class TestLock(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super(TestLock, cls).setUpClass()
+
+        cls.Lock = cls.env["base.lock"]
+
+        # Payroll Manager user
+        cls.userPM = new_test_user(
+            cls.env,
+            login="hel",
+            groups="base.group_user,payroll.group_payroll_manager",
+            name="Payroll manager",
+            email="hel@example.com",
+        )
+
+    def create_lock(self, start, end, tz):
+        return self.Lock.create(
+            {
+                "name": "A lock",
+                "start_time": start,
+                "end_time": end,
+                "tz": tz,
+            }
+        )
+
+    def test_pm_write(self):
+        """Has write access to lock.lock"""
+
+        # utc: 2020-12-31 21:00:00 - 2021-01-31 20:59:59
+        start = datetime(2021, 1, 1, 0, 0, 0)
+        end = datetime(2021, 1, 31, 23, 59, 59)
+        lk = self.create_lock(start, end, "Africa/Addis_Ababa")
+        try:
+            lk.with_user(self.userPM.id).name = "B"
+        except AccessError:
+            self.fail("raised an AccessError exception")
+
+    def test_pm_read(self):
+        """Has read access to lock.lock"""
+
+        # utc: 2020-12-31 21:00:00 - 2021-01-31 20:59:59
+        start = datetime(2021, 1, 1, 0, 0, 0)
+        end = datetime(2021, 1, 31, 23, 59, 59)
+        lk = self.create_lock(start, end, "Africa/Addis_Ababa")
+        try:
+            lk.with_user(self.userPM.id).read([])
+        except AccessError:
+            self.fail("raised an AccessError exception")
+
+    def test_pm_create(self):
+        """Create access"""
+
+        # utc: 2020-12-31 21:00:00 - 2021-01-31 20:59:59
+        start = datetime(2021, 1, 1, 0, 0, 0)
+        end = datetime(2021, 1, 31, 23, 59, 59)
+        try:
+            self.Lock.with_user(self.userPM.id).create(
+                {
+                    "name": "A",
+                    "start_time": start,
+                    "end_time": end,
+                    "tz": "Africa/Addis_Ababa",
+                }
+            )
+        except AccessError:
+            self.fail("raised an AccessError exception")
+
+    def test_pm_unlink(self):
+        """Unlink access"""
+
+        # utc: 2020-12-31 21:00:00 - 2021-01-31 20:59:59
+        start = datetime(2021, 1, 1, 0, 0, 0)
+        end = datetime(2021, 1, 31, 23, 59, 59)
+        lk = self.create_lock(start, end, "Africa/Addis_Ababa")
+        try:
+            lk.with_user(self.userPM.id).unlink()
+        except AccessError:
+            self.fail("raised an AccessError exception")
diff --git a/payroll_period_by_contract_type/README.rst b/payroll_period_by_contract_type/README.rst
new file mode 100644
index 00000000..69cb1d5a
--- /dev/null
+++ b/payroll_period_by_contract_type/README.rst
@@ -0,0 +1,61 @@
+=====================================
+Payroll Period Batch by contract type
+=====================================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:e786f94a370fb36887ba979b9d118dfcb3a0a8354e68b46e00a4f83070472731
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_period_by_contract_type
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+This module introduces a **"Batch by contract type"** field in Payroll Period Schedule that if checked will cause Odoo to
+generate payslip batches based not on departments but on contract types.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_period_by_contract_type%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+
+Other credits
+~~~~~~~~~~~~~
+
+* Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_period_by_contract_type>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/payroll_period_by_contract_type/__init__.py b/payroll_period_by_contract_type/__init__.py
new file mode 100644
index 00000000..47cd20d0
--- /dev/null
+++ b/payroll_period_by_contract_type/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
+from . import wizard
diff --git a/payroll_period_by_contract_type/__manifest__.py b/payroll_period_by_contract_type/__manifest__.py
new file mode 100644
index 00000000..b2ba6cc6
--- /dev/null
+++ b/payroll_period_by_contract_type/__manifest__.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Payroll Period Batch by contract type",
+    "summary": "Generate separate payslip batches for each contract type.",
+    "version": "15.0.1.0.0",
+    "category": "Payroll",
+    "images": ["static/src/img/main_screenshot.png"],
+    "author": "TREVI Software",
+    "license": "AGPL-3",
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "hr_contract_type",
+        "payroll_periods",
+        "payroll_period_processing",
+    ],
+    "data": [
+        "views/hr_payroll_period_schedule_view.xml",
+        "wizard/process_view.xml",
+    ],
+    "demo": [],
+    "installable": True,
+}
diff --git a/payroll_period_by_contract_type/i18n/payroll_period_by_contract_type.pot b/payroll_period_by_contract_type/i18n/payroll_period_by_contract_type.pot
new file mode 100644
index 00000000..14d4bd0f
--- /dev/null
+++ b/payroll_period_by_contract_type/i18n/payroll_period_by_contract_type.pot
@@ -0,0 +1,54 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* payroll_period_by_contract_type
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: payroll_period_by_contract_type
+#: model:ir.model.fields,field_description:payroll_period_by_contract_type.field_hr_payroll_period_schedule__batch_by_contract_type
+#: model:ir.model.fields,field_description:payroll_period_by_contract_type.field_hr_payroll_processing__batch_by_contract_type
+msgid "Batch By Contract Type"
+msgstr ""
+
+#. module: payroll_period_by_contract_type
+#: model:ir.model.fields,field_description:payroll_period_by_contract_type.field_hr_payroll_period_schedule__display_name
+#: model:ir.model.fields,field_description:payroll_period_by_contract_type.field_hr_payroll_processing__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: payroll_period_by_contract_type
+#: model:ir.model,name:payroll_period_by_contract_type.model_hr_payroll_processing
+msgid "HR Payroll Processing Wizard"
+msgstr ""
+
+#. module: payroll_period_by_contract_type
+#: model:ir.model.fields,field_description:payroll_period_by_contract_type.field_hr_payroll_period_schedule__id
+#: model:ir.model.fields,field_description:payroll_period_by_contract_type.field_hr_payroll_processing__id
+msgid "ID"
+msgstr ""
+
+#. module: payroll_period_by_contract_type
+#: model:ir.model.fields,help:payroll_period_by_contract_type.field_hr_payroll_period_schedule__batch_by_contract_type
+#: model:ir.model.fields,help:payroll_period_by_contract_type.field_hr_payroll_processing__batch_by_contract_type
+msgid "If checked create payslip batches by contract type."
+msgstr ""
+
+#. module: payroll_period_by_contract_type
+#: model:ir.model.fields,field_description:payroll_period_by_contract_type.field_hr_payroll_period_schedule____last_update
+#: model:ir.model.fields,field_description:payroll_period_by_contract_type.field_hr_payroll_processing____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: payroll_period_by_contract_type
+#: model:ir.model,name:payroll_period_by_contract_type.model_hr_payroll_period_schedule
+msgid "Payroll Period Schedule"
+msgstr ""
diff --git a/payroll_period_by_contract_type/models/__init__.py b/payroll_period_by_contract_type/models/__init__.py
new file mode 100644
index 00000000..4d75fbc3
--- /dev/null
+++ b/payroll_period_by_contract_type/models/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import hr_payroll_period_schedule
diff --git a/payroll_period_by_contract_type/models/hr_payroll_period_schedule.py b/payroll_period_by_contract_type/models/hr_payroll_period_schedule.py
new file mode 100644
index 00000000..c03c6bf3
--- /dev/null
+++ b/payroll_period_by_contract_type/models/hr_payroll_period_schedule.py
@@ -0,0 +1,12 @@
+# 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 PayrollPeriodSchedule(models.Model):
+    _inherit = "hr.payroll.period.schedule"
+
+    batch_by_contract_type = fields.Boolean(
+        help="If checked create payslip batches by contract type."
+    )
diff --git a/payroll_period_by_contract_type/readme/CREDITS.rst b/payroll_period_by_contract_type/readme/CREDITS.rst
new file mode 100644
index 00000000..d264bc7e
--- /dev/null
+++ b/payroll_period_by_contract_type/readme/CREDITS.rst
@@ -0,0 +1 @@
+* Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/payroll_period_by_contract_type/readme/DESCRIPTION.rst b/payroll_period_by_contract_type/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..7c9c309c
--- /dev/null
+++ b/payroll_period_by_contract_type/readme/DESCRIPTION.rst
@@ -0,0 +1,2 @@
+This module introduces a **"Batch by contract type"** field in Payroll Period Schedule that if checked will cause Odoo to
+generate payslip batches based not on departments but on contract types.
diff --git a/payroll_period_by_contract_type/static/description/icon.png b/payroll_period_by_contract_type/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/payroll_period_by_contract_type/static/description/icon.png differ
diff --git a/payroll_period_by_contract_type/static/description/index.html b/payroll_period_by_contract_type/static/description/index.html
new file mode 100644
index 00000000..24943fd3
--- /dev/null
+++ b/payroll_period_by_contract_type/static/description/index.html
@@ -0,0 +1,417 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Payroll Period Batch by contract type</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="payroll-period-batch-by-contract-type">
+<h1 class="title">Payroll Period Batch by contract type</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:e786f94a370fb36887ba979b9d118dfcb3a0a8354e68b46e00a4f83070472731
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_period_by_contract_type"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<p>This module introduces a <strong>“Batch by contract type”</strong> field in Payroll Period Schedule that if checked will cause Odoo to
+generate payslip batches based not on departments but on contract types.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-4">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_period_by_contract_type%0Aversion:%2014.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="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>TREVI Software</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-4">Other credits</a></h2>
+<ul class="simple">
+<li>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_period_by_contract_type">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/payroll_period_by_contract_type/static/src/img/main_screenshot.png b/payroll_period_by_contract_type/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/payroll_period_by_contract_type/static/src/img/main_screenshot.png differ
diff --git a/payroll_period_by_contract_type/tests/__init__.py b/payroll_period_by_contract_type/tests/__init__.py
new file mode 100644
index 00000000..e33a2846
--- /dev/null
+++ b/payroll_period_by_contract_type/tests/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import test_payroll_period_processing
diff --git a/payroll_period_by_contract_type/tests/test_payroll_period_processing.py b/payroll_period_by_contract_type/tests/test_payroll_period_processing.py
new file mode 100644
index 00000000..0c61d970
--- /dev/null
+++ b/payroll_period_by_contract_type/tests/test_payroll_period_processing.py
@@ -0,0 +1,274 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import datetime
+
+from pytz import timezone, utc
+
+from odoo.tests import common, new_test_user
+
+
+class TestPayrollProcessing(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.Employee = cls.env["hr.employee"]
+        cls.Department = cls.env["hr.department"]
+        cls.Period = cls.env["hr.payroll.period"]
+        cls.Schedule = cls.env["hr.payroll.period.schedule"]
+        cls.ContractType = cls.env["hr.contract.type"]
+        cls.Users = cls.env["res.users"]
+        cls.Job = cls.env["hr.job"]
+        cls.Wizard = cls.env["hr.payroll.processing"]
+
+        # Payroll Manager user
+        cls.userPM = new_test_user(
+            cls.env,
+            login="hel",
+            groups="base.group_user,payroll.group_payroll_user",
+            name="Payroll manager",
+            email="ric@example.com",
+        )
+
+        # Contract types
+        cls.ctype_fulltime = cls.ContractType.create({"name": "Full-time"})
+        cls.ctype_parttime = cls.ContractType.create({"name": "Part-time"})
+
+        # Departments
+        cls.dept_rd = cls.Department.create(
+            {
+                "name": "Research and devlopment",
+            }
+        )
+        cls.dept_sales = cls.Department.create(
+            {
+                "name": "Sales",
+            }
+        )
+        cls.job_ux_designer = cls.Job.create(
+            {
+                "name": "#UX Designer",
+                "department_id": cls.dept_rd.id,
+            }
+        )
+        cls.job_sales_associate = cls.Job.create(
+            {
+                "name": "Sales Associate",
+                "department_id": cls.dept_sales.id,
+            }
+        )
+
+        # Employee
+        #
+        cls.emp_sally = cls.Employee.create(
+            {
+                "name": "Sally",
+                "department_id": cls.dept_rd.id,
+            }
+        )
+        cls.emp_john = cls.Employee.create(
+            {
+                "name": "John",
+                "department_id": cls.dept_sales.id,
+            }
+        )
+
+        cls.pay_struct = cls.env.ref("payroll.structure_base")
+
+    def create_payroll_schedule(self, stype=False, initial_date=False):
+        return self.Schedule.create(
+            {
+                "name": "PPS",
+                "tz": "Africa/Addis_Ababa",
+                "type": stype,
+                "initial_period_date": initial_date,
+                "batch_by_contract_type": True,
+            }
+        )
+
+    def create_payroll_period(self, sched_id, start, end):
+        local_tz = timezone("Africa/Addis_Ababa")
+        tzdt_start = local_tz.localize(start)
+        utcdt_start = tzdt_start.astimezone(utc)
+        tzdt_end = local_tz.localize(end)
+        utcdt_end = tzdt_end.astimezone(utc)
+        return self.Period.create(
+            {
+                "name": "Period 1",
+                "schedule_id": sched_id,
+                "date_start": utcdt_start.replace(tzinfo=None),
+                "date_end": utcdt_end.replace(tzinfo=None),
+            }
+        )
+
+    def create_contract(
+        self,
+        eid,
+        state,
+        kanban_state,
+        start,
+        end=None,
+        trial_end=None,
+        pps_id=None,
+        job_id=False,
+        contract_type_id=False,
+    ):
+        return self.env["hr.contract"].create(
+            {
+                "name": "Contract",
+                "employee_id": eid,
+                "state": state,
+                "kanban_state": kanban_state,
+                "wage": 1,
+                "date_start": start,
+                "trial_date_end": trial_end,
+                "date_end": end,
+                "struct_id": self.pay_struct.id,
+                "pps_id": pps_id,
+                "job_id": job_id,
+                "contract_type_id": contract_type_id,
+            }
+        )
+
+    def setUpCommon(self):
+
+        # Payroll Period
+        #
+        start = datetime(2021, 9, 1)
+        end = datetime(2021, 9, 30, 23, 59, 59)
+        self.period_schedule = self.create_payroll_schedule("manual", start.date())
+        self.period = self.create_payroll_period(self.period_schedule.id, start, end)
+        self.period.set_state_ended()
+
+    def test_payslip_batch_by_contract_type(self):
+
+        self.setUpCommon()
+        start = datetime(2021, 9, 1)
+
+        # Create contracts for Sally and John
+        self.create_contract(
+            self.emp_sally.id,
+            "draft",
+            "done",
+            start.date(),
+            pps_id=self.period_schedule.id,
+            job_id=self.job_ux_designer.id,
+            contract_type_id=self.ctype_fulltime.id,
+        ).signal_confirm()
+        self.create_contract(
+            self.emp_john.id,
+            "draft",
+            "done",
+            start.date(),
+            pps_id=self.period_schedule.id,
+            job_id=self.job_sales_associate.id,
+            contract_type_id=self.ctype_parttime.id,
+        ).signal_confirm()
+
+        # Start payroll wizard
+        wiz = (
+            self.Wizard.with_user(self.userPM)
+            .with_context({"active_id": self.period.id})
+            .create({})
+        )
+
+        self.assertTrue(
+            wiz.batch_by_contract_type, "The wizard inherited the schedule's setting"
+        )
+
+        # Create the payroll register
+        wiz.create_payroll_register()
+        fulltime_batch = parttime_batch = False
+        for b in self.period.register_id.run_ids:
+            if "Full-time" in b.name:
+                fulltime_batch = b
+            elif "Part-time" in b.name:
+                parttime_batch = b
+
+        self.assertEqual(
+            len(self.period.register_id.run_ids),
+            2,
+            "Two contract types created two payslip batches",
+        )
+        self.assertTrue(
+            all([fulltime_batch, parttime_batch]),
+            "Found both full-time and part-time batches",
+        )
+        self.assertTrue(fulltime_batch.slip_ids, "Full-time batch contains payslips")
+        self.assertTrue(parttime_batch.slip_ids, "Part-time batch contains payslips")
+        self.assertEqual(
+            fulltime_batch.slip_ids[0].employee_id,
+            self.emp_sally,
+            "Sally is in the full-time batch run",
+        )
+        self.assertEqual(
+            parttime_batch.slip_ids[0].employee_id,
+            self.emp_john,
+            "John is in the part-time batch run",
+        )
+
+    def test_wizard_uncheck_batch_by_contract_type(self):
+
+        self.setUpCommon()
+        start = datetime(2021, 9, 1)
+
+        # Create contracts for Sally and John
+        self.create_contract(
+            self.emp_sally.id,
+            "draft",
+            "done",
+            start.date(),
+            pps_id=self.period_schedule.id,
+            job_id=self.job_ux_designer.id,
+            contract_type_id=self.ctype_fulltime.id,
+        ).signal_confirm()
+        self.create_contract(
+            self.emp_john.id,
+            "draft",
+            "done",
+            start.date(),
+            pps_id=self.period_schedule.id,
+            job_id=self.job_sales_associate.id,
+            contract_type_id=self.ctype_parttime.id,
+        ).signal_confirm()
+
+        # Start payroll wizard
+        wiz = (
+            self.Wizard.with_user(self.userPM)
+            .with_context({"active_id": self.period.id})
+            .create({})
+        )
+
+        self.assertTrue(
+            wiz.batch_by_contract_type, "The wizard inherited the schedule's setting"
+        )
+
+        # Create the payroll register
+        wiz.batch_by_contract_type = False
+        wiz.create_payroll_register()
+        rd_batch = sales_batch = False
+        for b in self.period.register_id.run_ids:
+            if "Research" in b.name:
+                rd_batch = b
+            elif "Sales" in b.name:
+                sales_batch = b
+
+        self.assertEqual(
+            len(self.period.register_id.run_ids),
+            2,
+            "Two departments created two payslip batches",
+        )
+        self.assertTrue(all([rd_batch, sales_batch]), "Found both departments' batches")
+        self.assertTrue(rd_batch.slip_ids, "R&D batch contains payslips")
+        self.assertTrue(sales_batch.slip_ids, "Sales batch contains payslips")
+        self.assertEqual(
+            rd_batch.slip_ids[0].employee_id,
+            self.emp_sally,
+            "Sally is in the R&D batch run",
+        )
+        self.assertEqual(
+            sales_batch.slip_ids[0].employee_id,
+            self.emp_john,
+            "John is in the Sales batch run",
+        )
diff --git a/payroll_period_by_contract_type/views/hr_payroll_period_schedule_view.xml b/payroll_period_by_contract_type/views/hr_payroll_period_schedule_view.xml
new file mode 100644
index 00000000..d9197a07
--- /dev/null
+++ b/payroll_period_by_contract_type/views/hr_payroll_period_schedule_view.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="view_payperiod_schedule_tree" model="ir.ui.view">
+        <field name="name">hr.payroll.period.schedule.tree.batch_by_ctype</field>
+        <field name="model">hr.payroll.period.schedule</field>
+        <field name="inherit_id" ref="payroll_periods.view_payperiod_schedule_tree" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='type']" position="after">
+                <field name="batch_by_contract_type" />
+            </xpath>
+        </field>
+    </record>
+
+    <record id="view_payperiod_schedule_form" model="ir.ui.view">
+        <field name="name">hr.payroll.period.schedule.form.batch_by_ctype</field>
+        <field name="model">hr.payroll.period.schedule</field>
+        <field name="inherit_id" ref="payroll_periods.view_payperiod_schedule_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='type']" position="after">
+                <field name="batch_by_contract_type" />
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/payroll_period_by_contract_type/wizard/__init__.py b/payroll_period_by_contract_type/wizard/__init__.py
new file mode 100644
index 00000000..199a9e6f
--- /dev/null
+++ b/payroll_period_by_contract_type/wizard/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import process
diff --git a/payroll_period_by_contract_type/wizard/process.py b/payroll_period_by_contract_type/wizard/process.py
new file mode 100644
index 00000000..59f3c2c1
--- /dev/null
+++ b/payroll_period_by_contract_type/wizard/process.py
@@ -0,0 +1,89 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import api, fields, models
+
+from odoo.addons.payroll_period_processing.wizard.process import DEFAULT_BATCHBY
+
+
+class ProcessPayroll(models.TransientModel):
+    _inherit = "hr.payroll.processing"
+
+    @api.model
+    def _get_batch_type(self):
+        pp_id = self._get_pp()
+        if pp_id:
+            pp = self.env["hr.payroll.period"].browse(pp_id)
+            if pp.schedule_id.batch_by_contract_type:
+                return True
+        return False
+
+    batch_by_contract_type = fields.Boolean(
+        default=_get_batch_type,
+        help="If checked create payslip batches by contract type.",
+    )
+
+    def get_batch_criteria(self):
+        if self.batch_by_contract_type:
+            return "contract_type"
+        return super().get_batch_criteria()
+
+    def _create_batches(
+        self,
+        register,
+        contracts,
+        departments,
+        date_start,
+        date_end,
+        batch_by=DEFAULT_BATCHBY,
+    ):
+
+        batches = super()._create_batches(
+            register, contracts, departments, date_start, date_end, batch_by=batch_by
+        )
+        if batch_by != "contract_type":
+            return batches
+
+        # batch_by == "contract_type"
+        employees = self.env["hr.employee"]
+        ctypes = self.env["hr.contract.type"].search([])
+        for dept in departments:
+            employees |= self._get_employees_from_department(
+                dept, contracts, date_start, date_end
+            )
+
+        for ctype in ctypes:
+            ees = employees.filtered(
+                lambda e: contracts.filtered(lambda c: c.employee_id == e)[
+                    0
+                ].contract_type_id
+                == ctype
+            )
+            if len(ees) == 0:
+                continue
+
+            run_res = {
+                "name": f"{ctype.name} Staff",
+                "date_start": date_start,
+                "date_end": date_end,
+                "register_id": register.id,
+                "period_id": register.period_id.id,
+                "department_ids": [(6, 0, [dept.id])],
+            }
+            batch = self.env["hr.payslip.run"].create(run_res)
+
+            # Create a pay slip for each employee in each department that has
+            # a contract in the pay period schedule of this pay period
+            payslips = self.env["hr.payslip"]
+            ees = ees.sorted(key=lambda e: e.name)
+            for ee in ees:
+                if not self.payroll_period_id.process_employee(ee.id):
+                    continue
+
+                payslips |= self.payroll_period_id.create_payslip(ee.id, batch.id)
+
+            # Calculate payroll for all the pay slips in this batch (run)
+            payslips.compute_sheet()
+            batches |= batch
+
+        return batches
diff --git a/payroll_period_by_contract_type/wizard/process_view.xml b/payroll_period_by_contract_type/wizard/process_view.xml
new file mode 100644
index 00000000..9c95d4bf
--- /dev/null
+++ b/payroll_period_by_contract_type/wizard/process_view.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="payroll_processing_wizard" model="ir.ui.view">
+        <field
+            name="name"
+        >Payroll Processing Wizard Form - Batch by contract type</field>
+        <field name="model">hr.payroll.processing</field>
+        <field
+            name="inherit_id"
+            ref="payroll_period_processing.payroll_processing_wizard"
+        />
+        <field name="arch" type="xml">
+            <xpath expr="//header" position="after">
+                <group>
+                    <group name="payroll_period_by_contract_type">
+                        <field name="batch_by_contract_type" />
+                    </group>
+                </group>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/payroll_period_contract_values/README.rst b/payroll_period_contract_values/README.rst
new file mode 100644
index 00000000..4d6d1b71
--- /dev/null
+++ b/payroll_period_contract_values/README.rst
@@ -0,0 +1,61 @@
+====================================
+Payroll Period Schedule in Contracts
+====================================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:ccb5ff6269d22d6e2b85e33e299f26ecc7fc7c55b4ab935ddca412f0320f53a2
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_period_contract_values
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+This module links Initial Contract Values and Payroll Period Schedules so that the payroll period schedule can automatically be populated for an employee contract.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_period_contract_values%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+* Michael Telahun Makonnen
+
+Other credits
+~~~~~~~~~~~~~
+
+* Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_period_contract_values>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/payroll_period_contract_values/__init__.py b/payroll_period_contract_values/__init__.py
new file mode 100644
index 00000000..86f3c8b1
--- /dev/null
+++ b/payroll_period_contract_values/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
diff --git a/payroll_period_contract_values/__manifest__.py b/payroll_period_contract_values/__manifest__.py
new file mode 100644
index 00000000..f7896cb8
--- /dev/null
+++ b/payroll_period_contract_values/__manifest__.py
@@ -0,0 +1,26 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Payroll Period Schedule in Contracts",
+    "summary": "Links payroll period schedules with employee contracts.",
+    "version": "15.0.1.0.0",
+    "category": "Payroll",
+    "images": ["static/src/img/main_screenshot.png"],
+    "license": "AGPL-3",
+    "author": "TREVI Software, Michael Telahun Makonnen",
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "hr_contract",
+        "hr_contract_values_payroll",
+        "payroll_periods",
+    ],
+    "data": [
+        "views/hr_contract_init_view.xml",
+    ],
+    "demo": [
+        "data/hr_contract_values_demo.xml",
+    ],
+    "installable": True,
+}
diff --git a/payroll_period_contract_values/data/hr_contract_values_demo.xml b/payroll_period_contract_values/data/hr_contract_values_demo.xml
new file mode 100644
index 00000000..3ce6a5a0
--- /dev/null
+++ b/payroll_period_contract_values/data/hr_contract_values_demo.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+
+        <record id="hr_contract_values.default_europe" model="hr.contract.init">
+            <field name="pay_sched_id" eval="ref('payroll_periods.schedule1')" />
+        </record>
+
+    </data>
+</odoo>
diff --git a/payroll_period_contract_values/i18n/payroll_period_contract_values.pot b/payroll_period_contract_values/i18n/payroll_period_contract_values.pot
new file mode 100644
index 00000000..b009f55a
--- /dev/null
+++ b/payroll_period_contract_values/i18n/payroll_period_contract_values.pot
@@ -0,0 +1,48 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* payroll_period_contract_values
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: payroll_period_contract_values
+#: model:ir.model.fields,field_description:payroll_period_contract_values.field_hr_contract__display_name
+#: model:ir.model.fields,field_description:payroll_period_contract_values.field_hr_contract_init__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: payroll_period_contract_values
+#: model:ir.model,name:payroll_period_contract_values.model_hr_contract
+msgid "Employee Contract"
+msgstr ""
+
+#. module: payroll_period_contract_values
+#: model:ir.model.fields,field_description:payroll_period_contract_values.field_hr_contract__id
+#: model:ir.model.fields,field_description:payroll_period_contract_values.field_hr_contract_init__id
+msgid "ID"
+msgstr ""
+
+#. module: payroll_period_contract_values
+#: model:ir.model,name:payroll_period_contract_values.model_hr_contract_init
+msgid "Initial Contract Settings"
+msgstr ""
+
+#. module: payroll_period_contract_values
+#: model:ir.model.fields,field_description:payroll_period_contract_values.field_hr_contract____last_update
+#: model:ir.model.fields,field_description:payroll_period_contract_values.field_hr_contract_init____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: payroll_period_contract_values
+#: model:ir.model.fields,field_description:payroll_period_contract_values.field_hr_contract__pps_id
+#: model:ir.model.fields,field_description:payroll_period_contract_values.field_hr_contract_init__pay_sched_id
+msgid "Payroll Period Schedule"
+msgstr ""
diff --git a/payroll_period_contract_values/models/__init__.py b/payroll_period_contract_values/models/__init__.py
new file mode 100644
index 00000000..fd166672
--- /dev/null
+++ b/payroll_period_contract_values/models/__init__.py
@@ -0,0 +1,6 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import hr_contract
+from . import hr_contract_init
diff --git a/payroll_period_contract_values/models/hr_contract.py b/payroll_period_contract_values/models/hr_contract.py
new file mode 100644
index 00000000..c2917ff1
--- /dev/null
+++ b/payroll_period_contract_values/models/hr_contract.py
@@ -0,0 +1,20 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import api, fields, models
+
+
+class HrContract(models.Model):
+
+    _inherit = "hr.contract"
+
+    @api.model
+    def _get_pay_sched(self):
+
+        iv = self.get_latest_initial_values()
+        if iv is not None and iv.pay_sched_id:
+            return iv.pay_sched_id.id
+        return False
+
+    pps_id = fields.Many2one(default=_get_pay_sched)
diff --git a/payroll_period_contract_values/models/hr_contract_init.py b/payroll_period_contract_values/models/hr_contract_init.py
new file mode 100644
index 00000000..0c6c8a36
--- /dev/null
+++ b/payroll_period_contract_values/models/hr_contract_init.py
@@ -0,0 +1,15 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import fields, models
+
+
+class ContractInit(models.Model):
+    _inherit = "hr.contract.init"
+
+    pay_sched_id = fields.Many2one(
+        string="Payroll Period Schedule",
+        comodel_name="hr.payroll.period.schedule",
+        required=False,
+    )
diff --git a/payroll_period_contract_values/readme/CREDITS.rst b/payroll_period_contract_values/readme/CREDITS.rst
new file mode 100644
index 00000000..d264bc7e
--- /dev/null
+++ b/payroll_period_contract_values/readme/CREDITS.rst
@@ -0,0 +1 @@
+* Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/payroll_period_contract_values/readme/DESCRIPTION.rst b/payroll_period_contract_values/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..e9b7ca32
--- /dev/null
+++ b/payroll_period_contract_values/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+This module links Initial Contract Values and Payroll Period Schedules so that the payroll period schedule can automatically be populated for an employee contract.
diff --git a/payroll_period_contract_values/static/description/icon.png b/payroll_period_contract_values/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/payroll_period_contract_values/static/description/icon.png differ
diff --git a/payroll_period_contract_values/static/description/index.html b/payroll_period_contract_values/static/description/index.html
new file mode 100644
index 00000000..10e82cd8
--- /dev/null
+++ b/payroll_period_contract_values/static/description/index.html
@@ -0,0 +1,417 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Payroll Period Schedule in Contracts</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="payroll-period-schedule-in-contracts">
+<h1 class="title">Payroll Period Schedule in Contracts</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:ccb5ff6269d22d6e2b85e33e299f26ecc7fc7c55b4ab935ddca412f0320f53a2
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_period_contract_values"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<p>This module links Initial Contract Values and Payroll Period Schedules so that the payroll period schedule can automatically be populated for an employee contract.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-4">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_period_contract_values%0Aversion:%2014.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="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>TREVI Software</li>
+<li>Michael Telahun Makonnen</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-4">Other credits</a></h2>
+<ul class="simple">
+<li>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_period_contract_values">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/payroll_period_contract_values/static/src/img/main_screenshot.png b/payroll_period_contract_values/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/payroll_period_contract_values/static/src/img/main_screenshot.png differ
diff --git a/payroll_period_contract_values/tests/__init__.py b/payroll_period_contract_values/tests/__init__.py
new file mode 100644
index 00000000..18b31b21
--- /dev/null
+++ b/payroll_period_contract_values/tests/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import test_hr_contract_init
diff --git a/payroll_period_contract_values/tests/test_hr_contract_init.py b/payroll_period_contract_values/tests/test_hr_contract_init.py
new file mode 100644
index 00000000..4c218624
--- /dev/null
+++ b/payroll_period_contract_values/tests/test_hr_contract_init.py
@@ -0,0 +1,63 @@
+# 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
+
+from odoo.addons.hr_contract_values.tests.test_hr_contract_init import TestContractInit
+
+
+class TestPayrollHrContractInit(TestContractInit):
+    @classmethod
+    def setUpClass(cls):
+        super(TestPayrollHrContractInit, cls).setUpClass()
+
+        cls.PPSchedule = cls.env["hr.payroll.period.schedule"]
+
+    def test_no_schedule(self):
+
+        today = fields.Date.today()
+        self.HrContractInit.create(
+            {
+                "name": "Today",
+                "date": today,
+                "trial_period": 60,
+            }
+        )
+        contract = self.HrContract.create(
+            {
+                "name": "C1",
+                "employee_id": self.eeJohn.id,
+            }
+        )
+        self.assertFalse(contract.pps_id, "Contract pay period schedule field is empty")
+
+    def test_contract_has_schedule(self):
+
+        today = fields.Date.today()
+        pps = self.PPSchedule.create(
+            {
+                "name": "PPS",
+                "tz": "Africa/Addis_Ababa",
+                "type": "monthly",
+                "initial_period_date": today,
+            }
+        )
+        self.HrContractInit.create(
+            {
+                "name": "Today",
+                "date": today,
+                "trial_period": 60,
+                "pay_sched_id": pps.id,
+            }
+        )
+        contract = self.HrContract.create(
+            {
+                "name": "C1",
+                "employee_id": self.eeJohn.id,
+            }
+        )
+        self.assertEqual(
+            contract.pps_id,
+            pps,
+            "Contract has a default Pay Period Schedule",
+        )
diff --git a/payroll_period_contract_values/views/hr_contract_init_view.xml b/payroll_period_contract_values/views/hr_contract_init_view.xml
new file mode 100644
index 00000000..e2b5a5b4
--- /dev/null
+++ b/payroll_period_contract_values/views/hr_contract_init_view.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+
+        <!-- Initial Contract Settings -->
+        <record id="view_contract_init_tree" model="ir.ui.view">
+            <field name="name">hr.contract.init.tree.payroll_period</field>
+            <field name="model">hr.contract.init</field>
+            <field
+                name="inherit_id"
+                ref="hr_contract_values_payroll.view_contract_init_tree"
+            />
+            <field name="priority">99</field>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='struct_id']" position="after">
+                    <field name="pay_sched_id" />
+                </xpath>
+            </field>
+        </record>
+        <record id="view_contract_init_form" model="ir.ui.view">
+            <field name="name">hr.contract.init.form.payroll_period</field>
+            <field name="model">hr.contract.init</field>
+            <field
+                name="inherit_id"
+                ref="hr_contract_values_payroll.view_contract_init_form"
+            />
+            <field name="priority">99</field>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='struct_id']" position="after">
+                    <field name="pay_sched_id" required="1" />
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/payroll_period_payslip_amendment/README.rst b/payroll_period_payslip_amendment/README.rst
new file mode 100644
index 00000000..06439227
--- /dev/null
+++ b/payroll_period_payslip_amendment/README.rst
@@ -0,0 +1,55 @@
+======================================
+Payroll Periods and Payslip Amendments
+======================================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:e93b55f04d7b6b016e909c7546b218104c8d59d621df97b5579a892524011807
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_period_payslip_amendment
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+This module links Payslip Amendments and Payroll Periods so that each payslip amendment is associated with a payroll period.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_period_payslip_amendment%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_period_payslip_amendment>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/payroll_period_payslip_amendment/__init__.py b/payroll_period_payslip_amendment/__init__.py
new file mode 100644
index 00000000..4e124ccb
--- /dev/null
+++ b/payroll_period_payslip_amendment/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
diff --git a/payroll_period_payslip_amendment/__manifest__.py b/payroll_period_payslip_amendment/__manifest__.py
new file mode 100644
index 00000000..1ef5c7d6
--- /dev/null
+++ b/payroll_period_payslip_amendment/__manifest__.py
@@ -0,0 +1,21 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Payroll Periods and Payslip Amendments",
+    "summary": "Link payslip amendments with a payroll period.",
+    "version": "15.0.1.0.0",
+    "category": "Payroll",
+    "images": ["static/src/img/main_screenshot.png"],
+    "license": "AGPL-3",
+    "author": "TREVI Software",
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "payroll_payslip_amendment",
+        "payroll_periods",
+    ],
+    "data": [
+        "views/hr_payslip_amendment_view.xml",
+    ],
+    "installable": True,
+}
diff --git a/payroll_period_payslip_amendment/i18n/payroll_period_payslip_amendment.pot b/payroll_period_payslip_amendment/i18n/payroll_period_payslip_amendment.pot
new file mode 100644
index 00000000..4ed24fb7
--- /dev/null
+++ b/payroll_period_payslip_amendment/i18n/payroll_period_payslip_amendment.pot
@@ -0,0 +1,47 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* payroll_period_payslip_amendment
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: payroll_period_payslip_amendment
+#: model:ir.model.fields,field_description:payroll_period_payslip_amendment.field_hr_payslip__display_name
+#: model:ir.model.fields,field_description:payroll_period_payslip_amendment.field_hr_payslip_amendment__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: payroll_period_payslip_amendment
+#: model:ir.model.fields,field_description:payroll_period_payslip_amendment.field_hr_payslip__id
+#: model:ir.model.fields,field_description:payroll_period_payslip_amendment.field_hr_payslip_amendment__id
+msgid "ID"
+msgstr ""
+
+#. module: payroll_period_payslip_amendment
+#: model:ir.model.fields,field_description:payroll_period_payslip_amendment.field_hr_payslip____last_update
+#: model:ir.model.fields,field_description:payroll_period_payslip_amendment.field_hr_payslip_amendment____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: payroll_period_payslip_amendment
+#: model:ir.model,name:payroll_period_payslip_amendment.model_hr_payslip_amendment
+msgid "Pay Slip Amendment"
+msgstr ""
+
+#. module: payroll_period_payslip_amendment
+#: model:ir.model.fields,field_description:payroll_period_payslip_amendment.field_hr_payslip_amendment__period_id
+msgid "Payroll Period"
+msgstr ""
+
+#. module: payroll_period_payslip_amendment
+#: model:ir.model,name:payroll_period_payslip_amendment.model_hr_payslip
+msgid "Payslip"
+msgstr ""
diff --git a/payroll_period_payslip_amendment/models/__init__.py b/payroll_period_payslip_amendment/models/__init__.py
new file mode 100644
index 00000000..4d1a5739
--- /dev/null
+++ b/payroll_period_payslip_amendment/models/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import hr_payslip
+from . import hr_payslip_amendment
diff --git a/payroll_period_payslip_amendment/models/hr_payslip.py b/payroll_period_payslip_amendment/models/hr_payslip.py
new file mode 100644
index 00000000..378e8bbd
--- /dev/null
+++ b/payroll_period_payslip_amendment/models/hr_payslip.py
@@ -0,0 +1,26 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import api, models
+
+
+class HrPayslip(models.Model):
+    _inherit = "hr.payslip"
+
+    @api.model
+    def get_inputs(self, contracts, date_from, date_to):
+
+        # Modify all the layers below to use the dates from the payroll period
+        #
+        periods = self.env["hr.payroll.period"].search(
+            [
+                ("date_start", "<=", date_to),
+                ("date_end", ">=", date_from),
+            ]
+        )
+        if periods:
+            date_from = periods[0].date_start
+            date_to = periods[0].date_end
+
+        return super(HrPayslip, self).get_inputs(contracts, date_from, date_to)
diff --git a/payroll_period_payslip_amendment/models/hr_payslip_amendment.py b/payroll_period_payslip_amendment/models/hr_payslip_amendment.py
new file mode 100644
index 00000000..311866e4
--- /dev/null
+++ b/payroll_period_payslip_amendment/models/hr_payslip_amendment.py
@@ -0,0 +1,21 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import api, fields, models
+
+
+class PayslipAmendment(models.Model):
+    _inherit = "hr.payslip.amendment"
+
+    period_id = fields.Many2one(
+        string="Payroll Period",
+        comodel_name="hr.payroll.period",
+        required=False,
+        readonly=True,
+        states={"draft": [("readonly", False)]},
+    )
+
+    @api.onchange("period_id")
+    def _onchange_period_id(self):
+        for rec in self:
+            rec.date = rec.period_id.date_end
diff --git a/payroll_period_payslip_amendment/readme/DESCRIPTION.rst b/payroll_period_payslip_amendment/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..2746b005
--- /dev/null
+++ b/payroll_period_payslip_amendment/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+This module links Payslip Amendments and Payroll Periods so that each payslip amendment is associated with a payroll period.
diff --git a/payroll_period_payslip_amendment/static/description/icon.png b/payroll_period_payslip_amendment/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/payroll_period_payslip_amendment/static/description/icon.png differ
diff --git a/payroll_period_payslip_amendment/static/description/index.html b/payroll_period_payslip_amendment/static/description/index.html
new file mode 100644
index 00000000..3cad8341
--- /dev/null
+++ b/payroll_period_payslip_amendment/static/description/index.html
@@ -0,0 +1,409 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Payroll Periods and Payslip Amendments</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="payroll-periods-and-payslip-amendments">
+<h1 class="title">Payroll Periods and Payslip Amendments</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:e93b55f04d7b6b016e909c7546b218104c8d59d621df97b5579a892524011807
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_period_payslip_amendment"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<p>This module links Payslip Amendments and Payroll Periods so that each payslip amendment is associated with a payroll period.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-4">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_period_payslip_amendment%0Aversion:%2014.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="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>TREVI Software</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-4">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_period_payslip_amendment">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/payroll_period_payslip_amendment/static/src/img/main_screenshot.png b/payroll_period_payslip_amendment/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/payroll_period_payslip_amendment/static/src/img/main_screenshot.png differ
diff --git a/payroll_period_payslip_amendment/tests/__init__.py b/payroll_period_payslip_amendment/tests/__init__.py
new file mode 100644
index 00000000..a1d40677
--- /dev/null
+++ b/payroll_period_payslip_amendment/tests/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import test_payslip_amendment
diff --git a/payroll_period_payslip_amendment/tests/test_payslip_amendment.py b/payroll_period_payslip_amendment/tests/test_payslip_amendment.py
new file mode 100644
index 00000000..4e7f647e
--- /dev/null
+++ b/payroll_period_payslip_amendment/tests/test_payslip_amendment.py
@@ -0,0 +1,283 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import date, datetime
+
+from odoo import fields
+from odoo.tests import Form, common
+
+
+class TestPayslipAmendment(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super(TestPayslipAmendment, cls).setUpClass()
+
+        cls.Period = cls.env["hr.payroll.period"]
+        cls.Schedule = cls.env["hr.payroll.period.schedule"]
+        cls.Run = cls.env["hr.payslip.run"]
+        cls.Payslip = cls.env["hr.payslip"]
+        cls.Amendment = cls.env["hr.payslip.amendment"]
+
+        cls.eeSally = cls.env["hr.employee"].create({"name": "Sally"})
+
+        cls.rule_commision = cls.env["hr.salary.rule"].create(
+            {
+                "name": "Commission",
+                "code": "COMM",
+                "category_id": cls.env.ref("payroll.ALW").id,
+                "sequence": 17,
+                "amount_select": "code",
+                "amount_python_compute": "result = inputs.SALECOM.amount",
+            }
+        )
+        cls.input_commision = cls.env["hr.rule.input"].create(
+            {
+                "name": "Sales Commission Input",
+                "code": "SALECOM",
+                "input_id": cls.rule_commision.id,
+            }
+        )
+
+        cls.pay_struct = cls.env.ref("payroll.structure_base")
+        cls.pay_struct.write({"rule_ids": [(4, cls.rule_commision.id)]})
+
+    def create_payroll_schedule(self, stype=False, initial_date=False):
+        return self.Schedule.create(
+            {
+                "name": "PPS",
+                "tz": "Africa/Addis_Ababa",
+                "type": stype,
+                "initial_period_date": initial_date,
+            }
+        )
+
+    def create_payroll_period(self, sched_id, start, end):
+        return self.Period.create(
+            {
+                "name": "Period 1",
+                "schedule_id": sched_id,
+                "date_start": start,
+                "date_end": end,
+            }
+        )
+
+    def create_contract(
+        self,
+        eid,
+        state,
+        kanban_state,
+        start=None,
+        end=None,
+        trial_end=None,
+        pps_id=None,
+    ):
+        if start is None:
+            start = date.today()
+        return self.env["hr.contract"].create(
+            {
+                "name": "Contract",
+                "employee_id": eid,
+                "state": state,
+                "kanban_state": kanban_state,
+                "wage": 1,
+                "date_start": start,
+                "trial_date_end": trial_end,
+                "date_end": end,
+                "struct_id": self.pay_struct.id,
+                "pps_id": pps_id,
+            }
+        )
+
+    def apply_contract_cron(self):
+        self.env.ref(
+            "hr_contract.ir_cron_data_contract_update_state"
+        ).method_direct_trigger()
+
+    def test_amendment_in_period(self):
+
+        # Create Payroll Period
+        #
+        start = datetime(2021, 1, 1)
+        end = datetime(2021, 1, 31, 23, 59, 59)
+        pps = self.create_payroll_schedule("manual", start.date())
+        pp = self.create_payroll_period(pps.id, start, end)
+        run = self.Run.create(
+            {
+                "name": "Run A",
+                "date_start": start.date(),
+                "date_end": end.date(),
+                "period_id": pp.id,
+            }
+        )
+
+        # Create Contract
+        self.create_contract(
+            self.eeSally.id, "close", "normal", start.date(), end.date(), pps_id=pps.id
+        )
+        self.apply_contract_cron()
+
+        # Create Payslip Amendment
+        psa = self.Amendment.create(
+            {
+                "employee_id": self.eeSally.id,
+                "input_id": self.input_commision.id,
+                "amount": 500,
+                "period_id": pp.id,
+            }
+        )
+        psa._onchange_period_id()
+        psa.do_validate()
+
+        # Create Payslip
+        slip = pp.create_payslip(self.eeSally.id, run_id=run.id)
+
+        input_lines = slip.input_line_ids.filtered(lambda self: self.code == "SALECOM")
+        self.assertEqual(
+            len(input_lines), 1, "There must be ONE payslip input line for SALECOM"
+        )
+
+        _res1 = fields.Float.compare(input_lines[0].amount, 500.0, precision_digits=2)
+        self.assertEqual(_res1, 0, "The Input amount should be equal to 500.00")
+        self.assertEqual(
+            psa.state, "done", "The payslip amendment must be in 'done' state"
+        )
+
+    def test_amendment_not_in_period(self):
+
+        # Create Payroll Period
+        #
+        start = datetime(2021, 1, 1)
+        end = datetime(2021, 1, 31, 23, 59, 59)
+        start2 = datetime(2021, 2, 1)
+        end2 = datetime(2021, 2, 28, 23, 59, 59)
+        pps = self.create_payroll_schedule("manual", start.date())
+        pp = self.create_payroll_period(pps.id, start, end)
+        pp2 = self.create_payroll_period(pps.id, start2, end2)
+        run = self.Run.create(
+            {
+                "name": "Run A",
+                "date_start": start.date(),
+                "date_end": end.date(),
+                "period_id": pp.id,
+            }
+        )
+
+        # Create Contract
+        self.create_contract(
+            self.eeSally.id, "close", "normal", start.date(), end.date(), pps_id=pps.id
+        )
+        self.apply_contract_cron()
+
+        # Create Payslip Amendment
+        psa = self.Amendment.create(
+            {
+                "employee_id": self.eeSally.id,
+                "input_id": self.input_commision.id,
+                "amount": 500,
+                "period_id": pp2.id,
+            }
+        )
+        psa._onchange_period_id()
+        psa.do_validate()
+
+        # Create Payslip
+        slip = pp.create_payslip(self.eeSally.id, run_id=run.id)
+
+        input_lines = slip.input_line_ids.filtered(lambda self: self.code == "SALECOM")
+        self.assertEqual(
+            len(input_lines), 1, "There must be ONE payslip input line for SALECOM"
+        )
+
+        _res1 = fields.Float.compare(input_lines[0].amount, 0.0, precision_digits=2)
+        self.assertEqual(_res1, 0, "The paylip amendment should NOT have been applied")
+
+    def test_amendment_in_period2(self):
+        """
+        The amendment should be applied even when the employee contract is
+        less than payroll period.
+        """
+
+        # Create Payroll Period
+        #
+        start = datetime(2021, 1, 1)
+        end = datetime(2021, 1, 31, 23, 59, 59)
+        cstart = datetime(2021, 1, 10)
+        cend = datetime(2021, 1, 21, 23, 59, 59)
+        pps = self.create_payroll_schedule("manual", start.date())
+        pp = self.create_payroll_period(pps.id, start, end)
+        run = self.Run.create(
+            {
+                "name": "Run A",
+                "date_start": start.date(),
+                "date_end": end.date(),
+                "period_id": pp.id,
+            }
+        )
+
+        # Create Contract
+        self.create_contract(
+            self.eeSally.id,
+            "close",
+            "normal",
+            cstart.date(),
+            cend.date(),
+            pps_id=pps.id,
+        )
+        self.apply_contract_cron()
+
+        # Create Payslip Amendment
+        psa = self.Amendment.create(
+            {
+                "employee_id": self.eeSally.id,
+                "input_id": self.input_commision.id,
+                "amount": 500,
+                "period_id": pp.id,
+            }
+        )
+        psa._onchange_period_id()
+        psa.do_validate()
+
+        # Create Payslip
+        slip = pp.create_payslip(self.eeSally.id, run_id=run.id)
+
+        input_lines = slip.input_line_ids.filtered(lambda self: self.code == "SALECOM")
+        self.assertEqual(
+            len(input_lines), 1, "There must be ONE payslip input line for SALECOM"
+        )
+
+        _res1 = fields.Float.compare(input_lines[0].amount, 500.0, precision_digits=2)
+        self.assertEqual(_res1, 0, "The Input amount should be equal to 500.00")
+        self.assertEqual(
+            psa.state, "done", "The payslip amendment must be in 'done' state"
+        )
+
+    def test_onchange_amendment(self):
+
+        # Create Payroll Period
+        #
+        start = datetime(2021, 1, 1)
+        end = datetime(2021, 1, 31, 23, 59, 59)
+        pps = self.create_payroll_schedule("manual", start.date())
+        pp = self.create_payroll_period(pps.id, start, end)
+
+        # Create Contract
+        self.create_contract(
+            self.eeSally.id, "close", "normal", start.date(), end.date(), pps_id=pps.id
+        )
+        self.apply_contract_cron()
+
+        # Create Payslip Amendment
+        f = Form(self.Amendment)
+        f.employee_id = self.eeSally
+        f.input_id = self.input_commision
+        f.amount = 10.00
+        f.period_id = pp
+
+        self.assertEqual(
+            f.date,
+            end.date(),
+            "The date field is automatically set when the period is set",
+        )
+
+        f.save()
diff --git a/payroll_period_payslip_amendment/views/hr_payslip_amendment_view.xml b/payroll_period_payslip_amendment/views/hr_payslip_amendment_view.xml
new file mode 100644
index 00000000..08acc0ea
--- /dev/null
+++ b/payroll_period_payslip_amendment/views/hr_payslip_amendment_view.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+
+        <!-- Pay Slip Amendment -->
+
+        <record id="view_payslip_amendment_tree" model="ir.ui.view">
+            <field name="name">hr.payslip.amendment.tree.payroll_period</field>
+            <field name="model">hr.payslip.amendment</field>
+            <field
+                name="inherit_id"
+                ref="payroll_payslip_amendment.view_payslip_amendment_tree"
+            />
+            <field name="priority">99</field>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='date']" position="replace">
+                    <field name="period_id" />
+                </xpath>
+            </field>
+        </record>
+
+        <record id="view_payslip_amendment_form" model="ir.ui.view">
+            <field name="name">hr.payslip.amendment.form.payroll_period</field>
+            <field name="model">hr.payslip.amendment</field>
+            <field
+                name="inherit_id"
+                ref="payroll_payslip_amendment.view_payslip_amendment_form"
+            />
+            <field name="priority">99</field>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='date']" position="after">
+                    <field name="period_id" required="1" />
+                </xpath>
+                <xpath expr="//field[@name='date']" position="attributes">
+                    <attribute name="invisible">True</attribute>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/payroll_period_per_ou/README.rst b/payroll_period_per_ou/README.rst
new file mode 100644
index 00000000..5f57dbfb
--- /dev/null
+++ b/payroll_period_per_ou/README.rst
@@ -0,0 +1,61 @@
+==========================================
+Payroll Period Register per Operating Unit
+==========================================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:14e7a349bac23ff3c79bf6427e634aa7baaec7dc5e5971969fa008fa7e946eac
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_period_per_ou
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+This module introduces a **"Use Operating Units"** field in Payroll Period Schedule that if checked will cause Odoo to
+generate one Payroll Periods for each operating unit separately.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_period_per_ou%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+
+Other credits
+~~~~~~~~~~~~~
+
+* Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_period_per_ou>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/payroll_period_per_ou/__init__.py b/payroll_period_per_ou/__init__.py
new file mode 100644
index 00000000..4e124ccb
--- /dev/null
+++ b/payroll_period_per_ou/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
diff --git a/payroll_period_per_ou/__manifest__.py b/payroll_period_per_ou/__manifest__.py
new file mode 100644
index 00000000..325905ec
--- /dev/null
+++ b/payroll_period_per_ou/__manifest__.py
@@ -0,0 +1,23 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Payroll Period Register per Operating Unit",
+    "summary": "Generate separate payroll sheets for each OU.",
+    "version": "15.0.1.0.0",
+    "category": "Payroll",
+    "images": ["static/src/img/main_screenshot.png"],
+    "author": "TREVI Software",
+    "license": "AGPL-3",
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "payroll_operating_unit",
+        "payroll_periods",
+    ],
+    "data": [
+        "views/hr_payroll_period_schedule_view.xml",
+        "views/hr_payroll_period_view.xml",
+    ],
+    "demo": [],
+    "installable": True,
+}
diff --git a/payroll_period_per_ou/i18n/payroll_period_per_ou.pot b/payroll_period_per_ou/i18n/payroll_period_per_ou.pot
new file mode 100644
index 00000000..e4b4d16f
--- /dev/null
+++ b/payroll_period_per_ou/i18n/payroll_period_per_ou.pot
@@ -0,0 +1,57 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* payroll_period_per_ou
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: payroll_period_per_ou
+#: model:ir.model.fields,field_description:payroll_period_per_ou.field_hr_payroll_period__display_name
+#: model:ir.model.fields,field_description:payroll_period_per_ou.field_hr_payroll_period_schedule__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: payroll_period_per_ou
+#: model:ir.model.fields,field_description:payroll_period_per_ou.field_hr_payroll_period__id
+#: model:ir.model.fields,field_description:payroll_period_per_ou.field_hr_payroll_period_schedule__id
+msgid "ID"
+msgstr ""
+
+#. module: payroll_period_per_ou
+#: model:ir.model.fields,help:payroll_period_per_ou.field_hr_payroll_period_schedule__use_operating_units
+msgid "If checked create a separate payroll period for each Operating Unit"
+msgstr ""
+
+#. module: payroll_period_per_ou
+#: model:ir.model.fields,field_description:payroll_period_per_ou.field_hr_payroll_period____last_update
+#: model:ir.model.fields,field_description:payroll_period_per_ou.field_hr_payroll_period_schedule____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: payroll_period_per_ou
+#: model:ir.model.fields,field_description:payroll_period_per_ou.field_hr_payroll_period__operating_unit_id
+msgid "Operating Unit"
+msgstr ""
+
+#. module: payroll_period_per_ou
+#: model:ir.model,name:payroll_period_per_ou.model_hr_payroll_period_schedule
+msgid "Payroll Period Schedule"
+msgstr ""
+
+#. module: payroll_period_per_ou
+#: model:ir.model,name:payroll_period_per_ou.model_hr_payroll_period
+msgid "Payroll Periods"
+msgstr ""
+
+#. module: payroll_period_per_ou
+#: model:ir.model.fields,field_description:payroll_period_per_ou.field_hr_payroll_period_schedule__use_operating_units
+msgid "Use Operating Units"
+msgstr ""
diff --git a/payroll_period_per_ou/models/__init__.py b/payroll_period_per_ou/models/__init__.py
new file mode 100644
index 00000000..21cfeac5
--- /dev/null
+++ b/payroll_period_per_ou/models/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import hr_payroll_period
+from . import hr_payroll_period_schedule
diff --git a/payroll_period_per_ou/models/hr_payroll_period.py b/payroll_period_per_ou/models/hr_payroll_period.py
new file mode 100644
index 00000000..7dd31998
--- /dev/null
+++ b/payroll_period_per_ou/models/hr_payroll_period.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 PayrollPeriod(models.Model):
+    _inherit = "hr.payroll.period"
+
+    operating_unit_id = fields.Many2one("operating.unit")
diff --git a/payroll_period_per_ou/models/hr_payroll_period_schedule.py b/payroll_period_per_ou/models/hr_payroll_period_schedule.py
new file mode 100644
index 00000000..a2f3e576
--- /dev/null
+++ b/payroll_period_per_ou/models/hr_payroll_period_schedule.py
@@ -0,0 +1,47 @@
+# 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 PayrollPeriodSchedule(models.Model):
+    _inherit = "hr.payroll.period.schedule"
+
+    use_operating_units = fields.Boolean(
+        help="If checked create a separate payroll period for each Operating Unit"
+    )
+
+    def payroll_period_data_hook(
+        self, _data=None, mo_name=False, mo_num=False, yearno=False
+    ):
+
+        # Modify the current data to be for the first OU and
+        # Create a payroll period for all the rest
+        #
+        res = super().payroll_period_data_hook(
+            _data, mo_name=mo_name, mo_num=mo_num, yearno=yearno
+        )
+        if self.use_operating_units:
+            ou_ids = self.env["operating.unit"].search([])
+            if len(ou_ids) > 0:
+                res.update(
+                    {
+                        "operating_unit_id": ou_ids.ids[0],
+                        "name": f"{ou_ids[0].name}",
+                    }
+                )
+            if len(ou_ids) > 1:
+                for ou in ou_ids.filtered(lambda x: x.id != res["operating_unit_id"]):
+                    other_data = {
+                        "name": f"{ou.name}",
+                        "period_name": _("{}/{} {}").format(
+                            str(yearno), str(mo_num), str(mo_name)
+                        ),
+                        "schedule_id": res["schedule_id"],
+                        "date_start": res["date_start"],
+                        "date_end": res["date_end"],
+                        "operating_unit_id": ou.id,
+                    }
+                    self.write({"pay_period_ids": [(0, 0, other_data)]})
+
+        return res
diff --git a/payroll_period_per_ou/readme/CREDITS.rst b/payroll_period_per_ou/readme/CREDITS.rst
new file mode 100644
index 00000000..d264bc7e
--- /dev/null
+++ b/payroll_period_per_ou/readme/CREDITS.rst
@@ -0,0 +1 @@
+* Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/payroll_period_per_ou/readme/DESCRIPTION.rst b/payroll_period_per_ou/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..82863ffa
--- /dev/null
+++ b/payroll_period_per_ou/readme/DESCRIPTION.rst
@@ -0,0 +1,2 @@
+This module introduces a **"Use Operating Units"** field in Payroll Period Schedule that if checked will cause Odoo to
+generate one Payroll Periods for each operating unit separately.
diff --git a/payroll_period_per_ou/static/description/icon.png b/payroll_period_per_ou/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/payroll_period_per_ou/static/description/icon.png differ
diff --git a/payroll_period_per_ou/static/description/index.html b/payroll_period_per_ou/static/description/index.html
new file mode 100644
index 00000000..47acef14
--- /dev/null
+++ b/payroll_period_per_ou/static/description/index.html
@@ -0,0 +1,417 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Payroll Period Register per Operating Unit</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="payroll-period-register-per-operating-unit">
+<h1 class="title">Payroll Period Register per Operating Unit</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:14e7a349bac23ff3c79bf6427e634aa7baaec7dc5e5971969fa008fa7e946eac
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_period_per_ou"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<p>This module introduces a <strong>“Use Operating Units”</strong> field in Payroll Period Schedule that if checked will cause Odoo to
+generate one Payroll Periods for each operating unit separately.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-4">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_period_per_ou%0Aversion:%2014.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="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>TREVI Software</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-4">Other credits</a></h2>
+<ul class="simple">
+<li>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_period_per_ou">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/payroll_period_per_ou/static/src/img/main_screenshot.png b/payroll_period_per_ou/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/payroll_period_per_ou/static/src/img/main_screenshot.png differ
diff --git a/payroll_period_per_ou/tests/__init__.py b/payroll_period_per_ou/tests/__init__.py
new file mode 100644
index 00000000..595ca8b9
--- /dev/null
+++ b/payroll_period_per_ou/tests/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import test_payroll_period_schedule
diff --git a/payroll_period_per_ou/tests/test_payroll_period_schedule.py b/payroll_period_per_ou/tests/test_payroll_period_schedule.py
new file mode 100644
index 00000000..d95d8495
--- /dev/null
+++ b/payroll_period_per_ou/tests/test_payroll_period_schedule.py
@@ -0,0 +1,80 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import date
+
+from odoo.tests import new_test_user
+
+from odoo.addons.payroll_periods.tests.test_payroll_period_schedule import TestSchedule
+
+
+class TestScheduleOperatingUnit(TestSchedule):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.OU = cls.env["operating.unit"]
+        cls.Users = cls.env["res.users"]
+
+        # Operating Units
+        cls.ou_main = cls.OU.create(
+            {"name": "Main", "code": "M", "partner_id": cls.env.company.id}
+        )
+        cls.ou_second = cls.OU.create(
+            {"name": "Second", "code": "S", "partner_id": cls.env.company.id}
+        )
+
+        # Users
+        cls.user1 = new_test_user(
+            cls.env,
+            login="user1",
+            name="User 1",
+            email="user1@example.org",
+            groups="base.group_user,payroll.group_payroll_manager",
+            operating_unit_ids=[(4, ou.id) for ou in [cls.ou_main, cls.ou_second]],
+        )
+        cls.user2 = new_test_user(
+            cls.env,
+            login="user2",
+            name="User 2",
+            email="user1@example.org",
+            groups="base.group_user,payroll.group_payroll_manager",
+            operating_unit_ids=[(4, ou.id) for ou in [cls.ou_second]],
+        )
+
+    def test_period_per_ou(self):
+        """One period is created for each OU"""
+
+        pps = self.create_payroll_schedule("monthly", date(2021, 1, 1))
+        pps.use_operating_units = True
+        pps.button_add_pay_periods()
+
+        len_ou = len(self.OU.search([]).ids)
+        listPP = self.Period.search([])
+        self.assertEqual(
+            len(listPP), len_ou, "There is one period for each Operating Unit"
+        )
+        for pp in listPP:
+            self.assertIn(
+                pp.operating_unit_id.name,
+                pp.name,
+                "The pay period contains the Operating Unit's name",
+            )
+
+        listPP = self.Period.search(
+            [("operating_unit_id", "in", [self.ou_main.id, self.ou_second.id])]
+        )
+        self.assertEqual(len(listPP), 2, "I found the two OUs created for this test")
+        self.assertEqual(
+            listPP[0].operating_unit_id,
+            self.ou_second,
+        )
+        self.assertEqual(
+            listPP[1].operating_unit_id,
+            self.ou_main,
+        )
+        self.assertNotEqual(
+            listPP[0].operating_unit_id,
+            listPP[1].operating_unit_id,
+            "Each period is for a different Operating Unit",
+        )
diff --git a/payroll_period_per_ou/views/hr_payroll_period_schedule_view.xml b/payroll_period_per_ou/views/hr_payroll_period_schedule_view.xml
new file mode 100644
index 00000000..a816426a
--- /dev/null
+++ b/payroll_period_per_ou/views/hr_payroll_period_schedule_view.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="view_payperiod_schedule_tree" model="ir.ui.view">
+        <field name="name">hr.payroll.period.schedule.tree.operating_unit</field>
+        <field name="model">hr.payroll.period.schedule</field>
+        <field name="inherit_id" ref="payroll_periods.view_payperiod_schedule_tree" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='type']" position="after">
+                <field name="use_operating_units" />
+            </xpath>
+        </field>
+    </record>
+
+    <record id="view_payperiod_schedule_form" model="ir.ui.view">
+        <field name="name">hr.payroll.period.schedule.form.operating_unit</field>
+        <field name="model">hr.payroll.period.schedule</field>
+        <field name="inherit_id" ref="payroll_periods.view_payperiod_schedule_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='type']" position="after">
+                <field name="use_operating_units" />
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/payroll_period_per_ou/views/hr_payroll_period_view.xml b/payroll_period_per_ou/views/hr_payroll_period_view.xml
new file mode 100644
index 00000000..e58bd798
--- /dev/null
+++ b/payroll_period_per_ou/views/hr_payroll_period_view.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="view_payroll_period_tree" model="ir.ui.view">
+        <field name="name">hr.payroll.period.tree.operating_unit</field>
+        <field name="model">hr.payroll.period</field>
+        <field name="inherit_id" ref="payroll_periods.view_payroll_period_tree" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='date_end']" position="after">
+                <field name="operating_unit_id" />
+            </xpath>
+        </field>
+    </record>
+
+    <record id="view_payroll_period_form" model="ir.ui.view">
+        <field name="name">hr.payroll.period.form.operating_unit</field>
+        <field name="model">hr.payroll.period</field>
+        <field name="inherit_id" ref="payroll_periods.view_payroll_period_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='schedule_id']" position="after">
+                <field name="operating_unit_id" />
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/payroll_period_processing/README.rst b/payroll_period_processing/README.rst
new file mode 100644
index 00000000..b5989c0b
--- /dev/null
+++ b/payroll_period_processing/README.rst
@@ -0,0 +1,86 @@
+=========================
+Payroll Period Processing
+=========================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:08680ce021f41545b6b733e3ec3a764d6972c88a3de709763f458ffb39d66cd5
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_period_processing
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+This module provides an End-of-Period payroll processing wizard. The wizard can be used to:
+* Check there are no draft contracts
+* Check there are no un-approved leaves
+* Check and adjust the dates of any public holidays
+* Generate pay slips
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Usage
+=====
+
+To use this module:
+#. Navigate to Payroll -> Payroll Periods and open a payroll period that has ended
+#. Click on the "Process Payroll" button
+#. Click on the "Next" button to progress through the various check screens
+#. Click on the "Back" button to return to any previous check screens
+#. At any time you can click on the "Generate Payslips" button to generate the payroll
+
+Changelog
+=========
+
+14.0.1.2.1 (2022-08-10)
+~~~~~~~~~~~~~~~~~~~~~~~
+* [FIX] take into account timezone when creating payslip runs
+
+14.0.1.2.0 (2022-04-13)
+~~~~~~~~~~~~~~~~~~~~~~~
+* This module now depends on hr_holidays_public from OCA and not on trevi_hr_public_holidays
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_period_processing%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+* Clear ICT Solutions
+
+Other credits
+~~~~~~~~~~~~~
+
+* Clear ICT Solutions <info@clearict.com>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_period_processing>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/payroll_period_processing/__init__.py b/payroll_period_processing/__init__.py
new file mode 100644
index 00000000..32c12c03
--- /dev/null
+++ b/payroll_period_processing/__init__.py
@@ -0,0 +1,6 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2015 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
+from . import wizard
diff --git a/payroll_period_processing/__manifest__.py b/payroll_period_processing/__manifest__.py
new file mode 100644
index 00000000..16c19c2c
--- /dev/null
+++ b/payroll_period_processing/__manifest__.py
@@ -0,0 +1,29 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2015 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Payroll Period Processing",
+    "summary": "Payroll period processing wizard",
+    "version": "15.0.1.0.0",
+    "category": "Payroll",
+    "images": ["static/src/img/main_screenshot.png"],
+    "license": "AGPL-3",
+    "author": "TREVI Software, Clear ICT Solutions",
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "hr",
+        "hr_holidays",
+        "hr_holidays_public",
+        "payroll",
+        "payroll_periods",
+        "payroll_register",
+    ],
+    "data": [
+        "security/ir.model.access.csv",
+        "security/ir_rule.xml",
+        "wizard/process_view.xml",
+        "views/hr_payroll_view.xml",
+    ],
+    "installable": True,
+}
diff --git a/payroll_period_processing/i18n/payroll_period_processing.pot b/payroll_period_processing/i18n/payroll_period_processing.pot
new file mode 100644
index 00000000..d8430e10
--- /dev/null
+++ b/payroll_period_processing/i18n/payroll_period_processing.pot
@@ -0,0 +1,183 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* payroll_period_processing
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: payroll_period_processing
+#: code:addons/payroll_period_processing/wizard/process.py:0
+#, python-format
+msgid "%s Payroll Sheet"
+msgstr ""
+
+#. module: payroll_period_processing
+#: model_terms:ir.ui.view,arch_db:payroll_period_processing.payroll_processing_wizard
+msgid "Back"
+msgstr ""
+
+#. module: payroll_period_processing
+#: model:ir.model.fields.selection,name:payroll_period_processing.selection__hr_payroll_processing__state__apprvcn
+#: model_terms:ir.ui.view,arch_db:payroll_period_processing.payroll_processing_wizard
+msgid "Contracts"
+msgstr ""
+
+#. module: payroll_period_processing
+#: model:ir.model.fields,field_description:payroll_period_processing.field_hr_payroll_processing__contract_ids
+#: model_terms:ir.ui.view,arch_db:payroll_period_processing.payroll_processing_wizard
+msgid "Contracts to Approve"
+msgstr ""
+
+#. module: payroll_period_processing
+#: model:ir.model.fields,field_description:payroll_period_processing.field_hr_payroll_processing__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: payroll_period_processing
+#: model:ir.model.fields,field_description:payroll_period_processing.field_hr_payroll_processing__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: payroll_period_processing
+#: model:ir.model.fields,field_description:payroll_period_processing.field_hr_payroll_period__display_name
+#: model:ir.model.fields,field_description:payroll_period_processing.field_hr_payroll_processing__display_name
+#: model:ir.model.fields,field_description:payroll_period_processing.field_hr_payroll_register__display_name
+#: model:ir.model.fields,field_description:payroll_period_processing.field_hr_payslip_exception__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: payroll_period_processing
+#: model_terms:ir.ui.view,arch_db:payroll_period_processing.payroll_processing_wizard
+msgid "Generate Pay Slips"
+msgstr ""
+
+#. module: payroll_period_processing
+#: model:ir.model,name:payroll_period_processing.model_hr_payroll_processing
+msgid "HR Payroll Processing Wizard"
+msgstr ""
+
+#. module: payroll_period_processing
+#: model:ir.model.fields.selection,name:payroll_period_processing.selection__hr_payroll_processing__state__holidays
+msgid "Holidays"
+msgstr ""
+
+#. module: payroll_period_processing
+#: model:ir.model.fields,field_description:payroll_period_processing.field_hr_payroll_period__id
+#: model:ir.model.fields,field_description:payroll_period_processing.field_hr_payroll_processing__id
+#: model:ir.model.fields,field_description:payroll_period_processing.field_hr_payroll_register__id
+#: model:ir.model.fields,field_description:payroll_period_processing.field_hr_payslip_exception__id
+msgid "ID"
+msgstr ""
+
+#. module: payroll_period_processing
+#: model:ir.model.fields,field_description:payroll_period_processing.field_hr_payroll_period____last_update
+#: model:ir.model.fields,field_description:payroll_period_processing.field_hr_payroll_processing____last_update
+#: model:ir.model.fields,field_description:payroll_period_processing.field_hr_payroll_register____last_update
+#: model:ir.model.fields,field_description:payroll_period_processing.field_hr_payslip_exception____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: payroll_period_processing
+#: model:ir.model.fields,field_description:payroll_period_processing.field_hr_payroll_processing__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: payroll_period_processing
+#: model:ir.model.fields,field_description:payroll_period_processing.field_hr_payroll_processing__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: payroll_period_processing
+#: model:ir.model.fields.selection,name:payroll_period_processing.selection__hr_payroll_processing__state__apprvlv
+#: model_terms:ir.ui.view,arch_db:payroll_period_processing.payroll_processing_wizard
+msgid "Leaves"
+msgstr ""
+
+#. module: payroll_period_processing
+#: model:ir.model.fields,field_description:payroll_period_processing.field_hr_payroll_processing__leave_ids
+#: model_terms:ir.ui.view,arch_db:payroll_period_processing.payroll_processing_wizard
+msgid "Leaves to Approve"
+msgstr ""
+
+#. module: payroll_period_processing
+#: model_terms:ir.ui.view,arch_db:payroll_period_processing.payroll_processing_wizard
+msgid "Next"
+msgstr ""
+
+#. module: payroll_period_processing
+#: model:ir.model,name:payroll_period_processing.model_hr_payslip_exception
+msgid "Payroll Exception"
+msgstr ""
+
+#. module: payroll_period_processing
+#: model:ir.model.fields,field_description:payroll_period_processing.field_hr_payroll_processing__payroll_period_id
+msgid "Payroll Period"
+msgstr ""
+
+#. module: payroll_period_processing
+#: model:ir.model,name:payroll_period_processing.model_hr_payroll_period
+msgid "Payroll Periods"
+msgstr ""
+
+#. module: payroll_period_processing
+#: model_terms:ir.ui.view,arch_db:payroll_period_processing.payroll_processing_wizard
+msgid "Payroll Processing Wizard"
+msgstr ""
+
+#. module: payroll_period_processing
+#: model:ir.model,name:payroll_period_processing.model_hr_payroll_register
+msgid "Payroll Register"
+msgstr ""
+
+#. module: payroll_period_processing
+#: model:ir.model.fields,field_description:payroll_period_processing.field_hr_payroll_register__period_id
+msgid "Payroll period"
+msgstr ""
+
+#. module: payroll_period_processing
+#: model:ir.model.fields,field_description:payroll_period_processing.field_hr_payroll_period__register_id
+msgid "Payroll register"
+msgstr ""
+
+#. module: payroll_period_processing
+#: model:ir.actions.act_window,name:payroll_period_processing.action_payroll_period_process
+#: model_terms:ir.ui.view,arch_db:payroll_period_processing.view_payroll_period_form
+msgid "Process Payroll"
+msgstr ""
+
+#. module: payroll_period_processing
+#: model:ir.model.fields,field_description:payroll_period_processing.field_hr_payroll_processing__public_holiday_ids
+#: model_terms:ir.ui.view,arch_db:payroll_period_processing.payroll_processing_wizard
+msgid "Public Holidays"
+msgstr ""
+
+#. module: payroll_period_processing
+#: model_terms:ir.ui.view,arch_db:payroll_period_processing.payroll_processing_wizard
+msgid "Public Holidays in Payroll Period"
+msgstr ""
+
+#. module: payroll_period_processing
+#: model:ir.model.fields,field_description:payroll_period_processing.field_hr_payroll_processing__state
+msgid "State"
+msgstr ""
+
+#. module: payroll_period_processing
+#: code:addons/payroll_period_processing/wizard/process.py:0
+#, python-format
+msgid ""
+"You cannot modify a payroll register once it has been marked for payment"
+msgstr ""
+
+#. module: payroll_period_processing
+#: code:addons/payroll_period_processing/wizard/process.py:0
+#, python-format
+msgid "You must lock the payroll period first."
+msgstr ""
diff --git a/payroll_period_processing/models/__init__.py b/payroll_period_processing/models/__init__.py
new file mode 100644
index 00000000..643f6b53
--- /dev/null
+++ b/payroll_period_processing/models/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2015 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import hr_payroll
diff --git a/payroll_period_processing/models/hr_payroll.py b/payroll_period_processing/models/hr_payroll.py
new file mode 100644
index 00000000..459f3b05
--- /dev/null
+++ b/payroll_period_processing/models/hr_payroll.py
@@ -0,0 +1,28 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2016 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import fields, models
+
+
+class PayrollPeriod(models.Model):
+    _inherit = "hr.payroll.period"
+
+    register_id = fields.Many2one("hr.payroll.register", "Payroll register")
+
+
+class PayrollRegister(models.Model):
+    _inherit = "hr.payroll.register"
+
+    period_id = fields.Many2one("hr.payroll.period", "Payroll period")
+
+
+class PayslipException(models.Model):
+
+    _inherit = "hr.payslip.exception"
+
+    def button_recalculate(self):
+
+        for ex in self:
+            period = ex.slip_id.payslip_run_id.register_id.period_id
+            period.rerun_payslip(ex.slip_id)
diff --git a/payroll_period_processing/readme/CREDITS.rst b/payroll_period_processing/readme/CREDITS.rst
new file mode 100644
index 00000000..90a20419
--- /dev/null
+++ b/payroll_period_processing/readme/CREDITS.rst
@@ -0,0 +1 @@
+* Clear ICT Solutions <info@clearict.com>
diff --git a/payroll_period_processing/readme/DESCRIPTION.rst b/payroll_period_processing/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..b9126b4d
--- /dev/null
+++ b/payroll_period_processing/readme/DESCRIPTION.rst
@@ -0,0 +1,5 @@
+This module provides an End-of-Period payroll processing wizard. The wizard can be used to:
+* Check there are no draft contracts
+* Check there are no un-approved leaves
+* Check and adjust the dates of any public holidays
+* Generate pay slips
diff --git a/payroll_period_processing/readme/HISTORY.rst b/payroll_period_processing/readme/HISTORY.rst
new file mode 100644
index 00000000..d46f83cd
--- /dev/null
+++ b/payroll_period_processing/readme/HISTORY.rst
@@ -0,0 +1,7 @@
+14.0.1.2.1 (2022-08-10)
+~~~~~~~~~~~~~~~~~~~~~~~
+* [FIX] take into account timezone when creating payslip runs
+
+14.0.1.2.0 (2022-04-13)
+~~~~~~~~~~~~~~~~~~~~~~~
+* This module now depends on hr_holidays_public from OCA and not on trevi_hr_public_holidays
diff --git a/payroll_period_processing/readme/USAGE.rst b/payroll_period_processing/readme/USAGE.rst
new file mode 100644
index 00000000..524fa89e
--- /dev/null
+++ b/payroll_period_processing/readme/USAGE.rst
@@ -0,0 +1,6 @@
+To use this module:
+#. Navigate to Payroll -> Payroll Periods and open a payroll period that has ended
+#. Click on the "Process Payroll" button
+#. Click on the "Next" button to progress through the various check screens
+#. Click on the "Back" button to return to any previous check screens
+#. At any time you can click on the "Generate Payslips" button to generate the payroll
diff --git a/payroll_period_processing/security/ir.model.access.csv b/payroll_period_processing/security/ir.model.access.csv
new file mode 100644
index 00000000..64c490c8
--- /dev/null
+++ b/payroll_period_processing/security/ir.model.access.csv
@@ -0,0 +1,4 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_payroll_processing,access_hr_payroll_processing,model_hr_payroll_processing,payroll.group_payroll_user,1,1,1,1
+access_hr_leave_user,access_hr_leave,hr_holidays.model_hr_leave,payroll.group_payroll_user,1,0,0,0
+access_hr_payslip_run_user,access_hr_payslip_run,payroll.model_hr_payslip_run,payroll.group_payroll_user,1,1,1,1
diff --git a/payroll_period_processing/security/ir_rule.xml b/payroll_period_processing/security/ir_rule.xml
new file mode 100644
index 00000000..d23718fd
--- /dev/null
+++ b/payroll_period_processing/security/ir_rule.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data noupdate="1">
+
+        <record id="hr_leave_rule_user_read" model="ir.rule">
+            <field name="name">Time Off: Payroll User read</field>
+            <field name="model_id" ref="hr_holidays.model_hr_leave" />
+            <field name="domain_force">[(1, '=', 1)]</field>
+            <field name="perm_write" eval="True" />
+            <field name="perm_create" eval="True" />
+            <field name="perm_unlink" eval="True" />
+            <field name="groups" eval="[(4, ref('payroll.group_payroll_user'))]" />
+        </record>
+
+        <record id="hr_payslip_rule_user" model="ir.rule">
+            <field name="name">All Payslip: Payroll User</field>
+            <field name="model_id" ref="payroll.model_hr_payslip" />
+            <field name="domain_force">[(1,'=',1)]</field>
+            <field name="groups" eval="[(4, ref('payroll.group_payroll_user'))]" />
+        </record>
+
+    </data>
+</odoo>
diff --git a/payroll_period_processing/static/description/icon.png b/payroll_period_processing/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/payroll_period_processing/static/description/icon.png differ
diff --git a/payroll_period_processing/static/description/index.html b/payroll_period_processing/static/description/index.html
new file mode 100644
index 00000000..e8829c67
--- /dev/null
+++ b/payroll_period_processing/static/description/index.html
@@ -0,0 +1,451 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Payroll Period Processing</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="payroll-period-processing">
+<h1 class="title">Payroll Period Processing</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:08680ce021f41545b6b733e3ec3a764d6972c88a3de709763f458ffb39d66cd5
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_period_processing"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<p>This module provides an End-of-Period payroll processing wizard. The wizard can be used to:
+* Check there are no draft contracts
+* Check there are no un-approved leaves
+* Check and adjust the dates of any public holidays
+* Generate pay slips</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#usage" id="toc-entry-1">Usage</a></li>
+<li><a class="reference internal" href="#changelog" id="toc-entry-2">Changelog</a><ul>
+<li><a class="reference internal" href="#section-1" id="toc-entry-3">14.0.1.2.1 (2022-08-10)</a></li>
+<li><a class="reference internal" href="#section-2" id="toc-entry-4">14.0.1.2.0 (2022-04-13)</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-5">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-6">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-7">Authors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-8">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-9">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="usage">
+<h1><a class="toc-backref" href="#toc-entry-1">Usage</a></h1>
+<p>To use this module:
+#. Navigate to Payroll -&gt; Payroll Periods and open a payroll period that has ended
+#. Click on the “Process Payroll” button
+#. Click on the “Next” button to progress through the various check screens
+#. Click on the “Back” button to return to any previous check screens
+#. At any time you can click on the “Generate Payslips” button to generate the payroll</p>
+</div>
+<div class="section" id="changelog">
+<h1><a class="toc-backref" href="#toc-entry-2">Changelog</a></h1>
+<div class="section" id="section-1">
+<h2><a class="toc-backref" href="#toc-entry-3">14.0.1.2.1 (2022-08-10)</a></h2>
+<ul class="simple">
+<li>[FIX] take into account timezone when creating payslip runs</li>
+</ul>
+</div>
+<div class="section" id="section-2">
+<h2><a class="toc-backref" href="#toc-entry-4">14.0.1.2.0 (2022-04-13)</a></h2>
+<ul class="simple">
+<li>This module now depends on hr_holidays_public from OCA and not on trevi_hr_public_holidays</li>
+</ul>
+</div>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-5">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_period_processing%0Aversion:%2014.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="#toc-entry-6">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-7">Authors</a></h2>
+<ul class="simple">
+<li>TREVI Software</li>
+<li>Clear ICT Solutions</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-8">Other credits</a></h2>
+<ul class="simple">
+<li>Clear ICT Solutions &lt;<a class="reference external" href="mailto:info&#64;clearict.com">info&#64;clearict.com</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-9">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_period_processing">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/payroll_period_processing/static/src/img/main_screenshot.png b/payroll_period_processing/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/payroll_period_processing/static/src/img/main_screenshot.png differ
diff --git a/payroll_period_processing/tests/__init__.py b/payroll_period_processing/tests/__init__.py
new file mode 100644
index 00000000..48a8907c
--- /dev/null
+++ b/payroll_period_processing/tests/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import test_payroll_period_process
diff --git a/payroll_period_processing/tests/test_payroll_period_process.py b/payroll_period_processing/tests/test_payroll_period_process.py
new file mode 100644
index 00000000..29e6a18b
--- /dev/null
+++ b/payroll_period_processing/tests/test_payroll_period_process.py
@@ -0,0 +1,294 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import date, datetime
+
+from pytz import timezone, utc
+
+from odoo.tests import common, new_test_user
+
+from odoo.addons.mail.tests.common import mail_new_test_user
+
+
+class TestProcessing(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super(TestProcessing, cls).setUpClass()
+
+        cls.Employee = cls.env["hr.employee"]
+        cls.Wizard = cls.env["hr.payroll.processing"]
+        cls.Period = cls.env["hr.payroll.period"]
+        cls.Schedule = cls.env["hr.payroll.period.schedule"]
+        cls.HolidayPublic = cls.env["hr.holidays.public"]
+        cls.HolidayPublicLine = cls.env["hr.holidays.public.line"]
+        cls.Department = cls.env["hr.department"].with_context(tracking_disable=True)
+        cls.LeaveType = cls.env["hr.leave.type"].with_context(tracking_disable=True)
+        cls.payrollOfficer = new_test_user(
+            cls.env,
+            login="Payroff",
+            groups="base.group_user,payroll.group_payroll_user",
+            name="Pyaroll Officer",
+            email="payroff@example.com",
+        )
+        cls.pay_struct = cls.env.ref("payroll.structure_base")
+        cls.rd_dept = cls.Department.create(
+            {
+                "name": "Research and devlopment",
+            }
+        )
+        cls.job_ux_designer = cls.env["hr.job"].create(
+            {
+                "name": "#UX Designer",
+                "department_id": cls.rd_dept.id,
+            }
+        )
+
+        # Employee
+        #
+        cls.user_employee = mail_new_test_user(
+            cls.env, login="david", groups="base.group_user"
+        )
+        cls.employee_emp = cls.Employee.create(
+            {
+                "name": "David Employee",
+                "user_id": cls.user_employee.id,
+                "department_id": cls.rd_dept.id,
+            }
+        )
+
+        # Leave
+        #
+        cls.leave_type_1 = cls.LeaveType.create(
+            {
+                "name": "NotLimitedHR",
+                "allocation_type": "no",
+                "leave_validation_type": "hr",
+                "validity_start": False,
+            }
+        )
+        cls.employee_leave = cls.env["hr.leave"].create(
+            {
+                "name": "Hol11",
+                "employee_id": cls.employee_emp.id,
+                "holiday_status_id": cls.leave_type_1.id,
+                "date_from": datetime(2021, 9, 1),
+                "date_to": datetime(2021, 9, 3),
+                "number_of_days": 2,
+            }
+        )
+
+        # Public Holiday related
+        #
+        cls.hrMgr = new_test_user(
+            cls.env,
+            login="hel",
+            groups="base.group_user,hr_holidays.group_hr_holidays_manager",
+            name="HR Officer",
+            email="ric@example.com",
+        )
+        cls.new_year = date(2021, 9, 11)
+        cls.holidays = cls.HolidayPublic.with_user(cls.hrMgr).create({"year": 2021})
+        cls.holidayLine = cls.HolidayPublicLine.with_user(cls.hrMgr).create(
+            [
+                {
+                    "name": "New Year",
+                    "date": cls.new_year,
+                    "variable_date": False,
+                    "year_id": cls.holidays.id,
+                },
+            ]
+        )
+
+    def create_payroll_schedule(self, stype=False, initial_date=False):
+        return self.Schedule.create(
+            {
+                "name": "PPS",
+                "tz": "Africa/Addis_Ababa",
+                "type": stype,
+                "initial_period_date": initial_date,
+            }
+        )
+
+    def create_payroll_period(self, sched_id, start, end):
+        local_tz = timezone("Africa/Addis_Ababa")
+        tzdt_start = local_tz.localize(start)
+        utcdt_start = tzdt_start.astimezone(utc)
+        tzdt_end = local_tz.localize(end)
+        utcdt_end = tzdt_end.astimezone(utc)
+        return self.Period.create(
+            {
+                "name": "Period 1",
+                "schedule_id": sched_id,
+                "date_start": utcdt_start.replace(tzinfo=None),
+                "date_end": utcdt_end.replace(tzinfo=None),
+            }
+        )
+
+    def create_contract(
+        self,
+        eid,
+        state,
+        kanban_state,
+        start,
+        end=None,
+        trial_end=None,
+        pps_id=None,
+        job_id=False,
+    ):
+        return self.env["hr.contract"].create(
+            {
+                "name": "Contract",
+                "employee_id": eid,
+                "state": state,
+                "kanban_state": kanban_state,
+                "wage": 1,
+                "date_start": start,
+                "trial_date_end": trial_end,
+                "date_end": end,
+                "struct_id": self.pay_struct.id,
+                "pps_id": pps_id,
+                "job_id": job_id,
+            }
+        )
+
+    def setUpCommon(self):
+
+        # Payroll Period
+        #
+        start = datetime(2021, 9, 1)
+        end = datetime(2021, 9, 30, 23, 59, 59)
+        self.schedule = self.create_payroll_schedule("manual", start.date())
+        self.period = self.create_payroll_period(self.schedule.id, start, end)
+        self.period.set_state_ended()
+
+    def test_load_public_holidays(self):
+        """When in 'holidays' state the list of public holidays is populated"""
+
+        self.setUpCommon()
+        wiz = (
+            self.Wizard.with_user(self.payrollOfficer)
+            .with_context({"active_id": self.period.id})
+            .create({})
+        )
+        wiz.state_holidays()
+        self.assertIn(self.holidayLine, wiz.public_holiday_ids)
+
+    def test_load_leaves(self):
+        """When in 'apprvlv' state the list of draft leaves is populated"""
+
+        self.setUpCommon()
+        wiz = (
+            self.Wizard.with_user(self.payrollOfficer)
+            .with_context({"active_id": self.period.id})
+            .create({})
+        )
+        wiz.state_leaves()
+        self.assertEqual("confirm", self.employee_leave.state)
+        self.assertIn(self.employee_leave, wiz.leave_ids)
+
+    def test_load_contracts(self):
+        """When the wizard loads the list of un-approved contracts is populated"""
+
+        self.setUpCommon()
+        start = datetime(2021, 9, 1)
+        cc = self.create_contract(self.employee_emp.id, "draft", "done", start)
+        wiz = (
+            self.Wizard.with_user(self.payrollOfficer)
+            .with_context({"active_id": self.period.id})
+            .create({})
+        )
+
+        self.assertIn(cc, wiz.contract_ids)
+
+    def test_payroll_register_create(self):
+        """Payroll register, batch run and payslip creation"""
+
+        self.setUpCommon()
+        start = datetime(2021, 9, 1)
+        cc = self.create_contract(
+            self.employee_emp.id,
+            "draft",
+            "done",
+            start.date(),
+            pps_id=self.schedule.id,
+            job_id=self.job_ux_designer.id,
+        )
+        cc.signal_confirm()
+        wiz = (
+            self.Wizard.with_user(self.payrollOfficer)
+            .with_context({"active_id": self.period.id})
+            .create({})
+        )
+        wiz.create_payroll_register()
+
+        register = self.period.register_id
+        self.assertEqual(self.job_ux_designer, self.employee_emp.job_id)
+        self.assertEqual(self.rd_dept, self.employee_emp.department_id)
+        self.assertEqual(self.rd_dept, cc.department_id)
+        self.assertEqual(self.period.date_start, register.date_start)
+        self.assertEqual(self.period.date_end, register.date_end)
+        self.assertGreater(len(register.run_ids), 0)
+        departments = register.run_ids.mapped("department_ids")
+        self.assertIn(self.rd_dept, departments)
+        fail = True
+        for run in register.run_ids:
+            self.assertEqual(run.period_id, self.period)
+            if self.rd_dept in run.department_ids:
+                employees = run.slip_ids.mapped("employee_id")
+                self.assertIn(self.employee_emp, employees)
+                fail = False
+                break
+        if fail:
+            self.assertFail("Unable to find department in payslip batches")
+
+    def test_payslip_tz_date_start(self):
+        """Payroll batch run and payslip start/end dates"""
+
+        self.setUpCommon()
+        start = datetime(2021, 9, 1)
+        utc_start_dt = datetime(2021, 8, 31, 21, 0, 0)
+        cc = self.create_contract(
+            self.employee_emp.id,
+            "draft",
+            "done",
+            start.date(),
+            pps_id=self.schedule.id,
+            job_id=self.job_ux_designer.id,
+        )
+        cc.signal_confirm()
+        wiz = (
+            self.Wizard.with_user(self.payrollOfficer)
+            .with_context({"active_id": self.period.id})
+            .create({})
+        )
+        wiz.create_payroll_register()
+
+        register = self.period.register_id
+        self.assertEqual(self.period.date_start, register.date_start)
+        self.assertEqual(self.period.date_end, register.date_end)
+        self.assertGreater(len(register.run_ids), 0)
+
+        self.assertEqual(
+            self.period.date_start,
+            utc_start_dt,
+            "Payroll Period start datetime is in UTC",
+        )
+        self.assertEqual(
+            register.date_start,
+            utc_start_dt,
+            "Payroll Register start datetime is in UTC",
+        )
+        self.assertEqual(
+            register.run_ids[0].date_start,
+            start.date(),
+            "Start date of payslip batch is adjusted for timezone",
+        )
+
+        self.assertTrue(len(register.run_ids) > 0)
+        self.assertTrue(len(register.run_ids[0].slip_ids) > 0)
+        payslip = register.run_ids[0].slip_ids[0]
+        self.assertEqual(
+            payslip.date_from,
+            start.date(),
+            "Start date of payslip batch is adjusted for timezone",
+        )
diff --git a/payroll_period_processing/views/hr_payroll_view.xml b/payroll_period_processing/views/hr_payroll_view.xml
new file mode 100644
index 00000000..bf84fa24
--- /dev/null
+++ b/payroll_period_processing/views/hr_payroll_view.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+
+        <record id="view_payroll_period_form" model="ir.ui.view">
+            <field name="name">hr.payroll.period.form.inherit.processing</field>
+            <field name="model">hr.payroll.period</field>
+            <field name="inherit_id" ref="payroll_periods.view_payroll_period_form" />
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="//button[@name='set_state_payment']" position="before">
+                        <button
+                            name="%(action_payroll_period_process)d"
+                            type="action"
+                            states="open,ended,locked,generate"
+                            class="oe_highlight"
+                            string="Process Payroll"
+                        />
+                    </xpath>
+                    <xpath expr="//field[@name='name']" position="before">
+                        <field name="register_id" />
+                    </xpath>
+                    <xpath
+                        expr="//form/sheet/notebook/page/group/field/tree/button[@name='button_ignore']"
+                        position="before"
+                    >
+                        <button
+                            name="button_recalculate"
+                            type="object"
+                            icon="fa-gears"
+                        />
+                    </xpath>
+                </data>
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/payroll_period_processing/wizard/__init__.py b/payroll_period_processing/wizard/__init__.py
new file mode 100644
index 00000000..7eae85bc
--- /dev/null
+++ b/payroll_period_processing/wizard/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2015 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import process
diff --git a/payroll_period_processing/wizard/process.py b/payroll_period_processing/wizard/process.py
new file mode 100644
index 00000000..c62f5c7e
--- /dev/null
+++ b/payroll_period_processing/wizard/process.py
@@ -0,0 +1,328 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2015 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from pytz import timezone, utc
+
+from odoo import _, api, exceptions, fields, models
+
+DEFAULT_BATCHBY = "department"
+
+
+class ProcessingWizard(models.TransientModel):
+
+    _name = "hr.payroll.processing"
+    _description = "HR Payroll Processing Wizard"
+
+    @api.model
+    def _get_pp(self):
+
+        res = False
+        if self.env.context is not None:
+            res = self.env.context.get("active_id", False)
+        return res
+
+    @api.model
+    def _get_contracts(self):
+
+        res = []
+        Contract = self.env["hr.contract"]
+        pp_id = self._get_pp()
+        if pp_id:
+            pp = self.env["hr.payroll.period"].browse(pp_id)
+            res = Contract.search(
+                [
+                    ("date_start", "<=", pp.date_end),
+                    ("state", "=", "draft"),
+                    "|",
+                    ("date_end", "=", False),
+                    ("date_end", ">=", pp.date_start),
+                ]
+            )
+        return res
+
+    state = fields.Selection(
+        selection=[
+            ("apprvcn", "Contracts"),
+            ("apprvlv", "Leaves"),
+            ("holidays", "Holidays"),
+        ],
+        default="apprvcn",
+        readonly=True,
+    )
+    payroll_period_id = fields.Many2one(
+        string="Payroll Period",
+        comodel_name="hr.payroll.period",
+        default=_get_pp,
+        readonly=True,
+    )
+
+    # Contracts in Draft State
+    contract_ids = fields.Many2many(
+        string="Contracts to Approve",
+        comodel_name="hr.contract",
+        relation="hr_payroll_processing_contracts_rel",
+        column1="wizard_id",
+        column2="contract_id",
+        default=_get_contracts,
+        readonly=True,
+    )
+
+    # Leaves in Draft State
+    leave_ids = fields.Many2many(
+        string="Leaves to Approve",
+        comodel_name="hr.leave",
+        relation="hr_payroll_processing_leaves_rel",
+        column1="wizard_id",
+        column2="leave_id",
+        readonly=True,
+    )
+
+    # Public Holidays
+    public_holiday_ids = fields.Many2many(
+        string="Public Holidays",
+        comodel_name="hr.holidays.public.line",
+        relation="hr_payroll_processing_hol_rel",
+        readonly=True,
+    )
+
+    def _populate_leaves(self):
+
+        self.ensure_one()
+        Leaves = self.env["hr.leave"]
+        res = Leaves.search(
+            [
+                ("date_from", "<=", self.payroll_period_id.date_end),
+                ("date_to", ">=", self.payroll_period_id.date_start),
+                ("state", "not in", ["cancel", "refuse", "validate"]),
+            ]
+        )
+        self.write({"leave_ids": [(6, 0, res.ids)]})
+        return
+
+    def _populate_holidays(self):
+
+        self.ensure_one()
+        holiday_ids = []
+        pp = self.payroll_period_id
+
+        # XXX - Someone interested in DST should fix this.
+        #
+        local_tz = timezone(pp.schedule_id.tz)
+        utcdtStart = utc.localize(pp.date_start, is_dst=False)
+        dtStart = utcdtStart.astimezone(local_tz)
+        utcdtEnd = utc.localize(pp.date_end, is_dst=False)
+        dtEnd = utcdtEnd.astimezone(local_tz)
+        holiday_ids = self.env["hr.holidays.public.line"].search(
+            ["&", ("date", ">=", dtStart.date()), ("date", "<=", dtEnd.date())]
+        )
+        if len(holiday_ids) > 0:
+            self.write({"public_holiday_ids": [(6, 0, holiday_ids.ids)]})
+        else:
+            self.write({"public_holiday_ids": [(5,)]})
+
+        return
+
+    def state_back(self):
+
+        wizard = self
+        if wizard.state == "holidays":
+            self.state_leaves()
+        elif wizard.state == "apprvlv":
+            self.state_contracts()
+
+        return {
+            "view_type": "form",
+            "view_mode": "form",
+            "res_model": "hr.payroll.processing",
+            "res_id": self.ids[0],
+            "type": "ir.actions.act_window",
+            "target": "new",
+            "nodestroy": True,
+            "context": self.env.context,
+        }
+
+    def state_next(self):
+
+        wizard = self
+        if wizard.state == "apprvcn":
+            self.state_leaves()
+        elif wizard.state == "apprvlv":
+            self.state_holidays()
+
+        return {
+            "view_type": "form",
+            "view_mode": "form",
+            "res_model": "hr.payroll.processing",
+            "res_id": self.ids[0],
+            "type": "ir.actions.act_window",
+            "target": "new",
+            "nodestroy": True,
+            "context": self.env.context,
+        }
+
+    def generate_payslips(self):
+
+        self.create_payroll_register()
+        return {"type": "ir.actions.act_window_close"}
+
+    def state_contracts(self):
+
+        self.write({"state": "apprvcn"})
+
+    def state_leaves(self):
+
+        self._populate_leaves()
+        self.write({"state": "apprvlv"})
+
+    def state_holidays(self):
+
+        self._populate_holidays()
+        self.write({"state": "holidays"})
+
+    def create_payroll_register(self):
+
+        self.ensure_one()
+        if self.payroll_period_id.state in ["payment", "closed"]:
+            raise exceptions.UserError(
+                _(
+                    "You cannot modify a payroll register once it has been marked for payment"
+                )
+            )
+
+        if self.payroll_period_id.state not in ["open", "ended", "locked", "generate"]:
+            raise exceptions.UserError(_("You must lock the payroll period first."))
+
+        # Create the payroll register
+        register_values = {
+            "name": _("%s Payroll Sheet" % (self.payroll_period_id.name)),
+            "period_name": self.payroll_period_id.period_name,
+            "date_start": self.payroll_period_id.date_start,
+            "date_end": self.payroll_period_id.date_end,
+            "period_id": self.payroll_period_id.id,
+        }
+
+        # Get list of departments
+        department_ids = self.env["hr.department"].search([])
+
+        register = self.create_payslip_runs(register_values, department_ids)
+        register.set_denominations()
+
+    @api.model
+    def _remove_register(self, register):
+
+        for run in register.run_ids:
+            run.slip_ids.unlink()
+        register.run_ids.unlink()
+        register.unlink()
+
+    def get_period_schedule_contracts(self, period):
+        """Get contracts attached to payroll schedule of 'period'."""
+
+        return period.schedule_id.contract_ids
+
+    def _get_employees_from_department(self, dept, contracts, date_start, date_end):
+        c_ids = self.env["hr.contract"].search(
+            [
+                ("id", "in", contracts.ids),
+                ("date_start", "<=", date_end),
+                "|",
+                ("date_end", "=", False),
+                ("date_end", ">=", date_start),
+                "|",
+                ("department_id.id", "=", dept.id),
+                ("employee_id.department_id", "=", dept.id),
+            ]
+        )
+        return c_ids.mapped("employee_id")
+
+    def _create_batches(
+        self,
+        register,
+        contracts,
+        departments,
+        date_start,
+        date_end,
+        batch_by=DEFAULT_BATCHBY,
+    ):
+
+        batches = self.env["hr.payslip.run"]
+        if batch_by != DEFAULT_BATCHBY:
+            return batches
+
+        # Create payslip batch (run) for each department
+        #
+        for dept in departments:
+            ee_ids = self._get_employees_from_department(
+                dept, contracts, date_start, date_end
+            )
+            if len(ee_ids) == 0:
+                continue
+
+            run_res = {
+                "name": dept.complete_name,
+                "date_start": date_start,
+                "date_end": date_end,
+                "register_id": register.id,
+                "period_id": register.period_id.id,
+                "department_ids": [(6, 0, [dept.id])],
+            }
+            batch = self.env["hr.payslip.run"].create(run_res)
+
+            # Create a pay slip for each employee in each department that has
+            # a contract in the pay period schedule of this pay period
+            payslips = self.env["hr.payslip"]
+            ee_ids = ee_ids.sorted(key=lambda e: e.name)
+            for ee in ee_ids:
+                if not self.payroll_period_id.process_employee(ee.id):
+                    continue
+
+                payslips |= self.payroll_period_id.create_payslip(ee.id, batch.id)
+
+            # Calculate payroll for all the pay slips in this batch (run)
+            payslips.compute_sheet()
+            batches |= batch
+
+        return batches
+
+    def create_payslip_runs(self, register_values, dept_ids):
+        """
+        Create payslips for employees, in all departments, that have a contract in
+        this pay period's schedule.
+        """
+
+        # DateTime in db is stored as naive UTC. Convert it to explicit UTC and then convert
+        # that into the time zone of the pay period schedule.
+        #
+        period = self.payroll_period_id
+        local_tz = timezone(period.schedule_id.tz)
+        utcdt_start = utc.localize(period.date_start)
+        tzdt_start = utcdt_start.astimezone(local_tz)
+        utcdt_end = utc.localize(period.date_end)
+        tzdt_end = utcdt_end.astimezone(local_tz)
+
+        date_start = tzdt_start.date()
+        date_end = tzdt_end.date()
+        previous_register = period.register_id
+        contract_ids = self.get_period_schedule_contracts(period)
+        batch_by = self.get_batch_criteria()
+
+        # Remove any pre-existing payroll registers
+        if previous_register:
+            self._remove_register(previous_register)
+
+        # Create Payroll Register
+        register = self.env["hr.payroll.register"].create(register_values)
+
+        # Create payslip batches
+        self._create_batches(
+            register, contract_ids, dept_ids, date_start, date_end, batch_by
+        )
+
+        # Attach payroll register to this pay period
+        period.register_id = register
+
+        return register
+
+    def get_batch_criteria(self):
+        return DEFAULT_BATCHBY
diff --git a/payroll_period_processing/wizard/process_view.xml b/payroll_period_processing/wizard/process_view.xml
new file mode 100644
index 00000000..868a0d13
--- /dev/null
+++ b/payroll_period_processing/wizard/process_view.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+
+        <record id="payroll_processing_wizard" model="ir.ui.view">
+            <field name="name">Payroll Processing Wizard Form</field>
+            <field name="model">hr.payroll.processing</field>
+            <field name="arch" type="xml">
+                <form string="Payroll Processing Wizard">
+                    <header>
+                        <button
+                            name="state_back"
+                            type="object"
+                            states="apprvlv,holidays"
+                            class="oe_highlight"
+                            string="Back"
+                        />
+                        <button
+                            name="state_next"
+                            type="object"
+                            states="apprvcn,apprvlv"
+                            class="oe_highlight"
+                            string="Next"
+                        />
+                        <button
+                            name="generate_payslips"
+                            type="object"
+                            class="oe_highlight"
+                            string="Generate Pay Slips"
+                        />
+                        <field name="state" widget="statusbar" />
+                    </header>
+                    <notebook>
+                        <page name="state_apprvcn" string="Contracts" states="apprvcn">
+                            <group string="Contracts to Approve">
+                                <field name="contract_ids" nolabel="1" />
+                            </group>
+                        </page>
+                        <page name="state_apprvlv" string="Leaves" states="apprvlv">
+                            <group string="Leaves to Approve">
+                                <field name="leave_ids" nolabel="1" />
+                            </group>
+                        </page>
+                        <page
+                            name="state_holidays"
+                            string="Public Holidays"
+                            states="holidays"
+                        >
+                            <group string="Public Holidays in Payroll Period">
+                                <field name="public_holiday_ids" nolabel="1" />
+                            </group>
+                        </page>
+                        </notebook>
+                </form>
+            </field>
+        </record>
+        <record id="action_payroll_period_process" model="ir.actions.act_window">
+            <field name="name">Process Payroll</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr.payroll.processing</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/payroll_period_processing_per_ou/README.rst b/payroll_period_processing_per_ou/README.rst
new file mode 100644
index 00000000..21e779df
--- /dev/null
+++ b/payroll_period_processing_per_ou/README.rst
@@ -0,0 +1,60 @@
+============================================
+Payroll Period Processing per Operating Unit
+============================================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:f191670f7aed6f139159a6a4832dd71076b743554efac8c6ecdd1c770383ba01
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_period_processing_per_ou
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+This module ensures that only payslips from the period's Operating Unit are processed.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_period_processing_per_ou%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+
+Other credits
+~~~~~~~~~~~~~
+
+* Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_period_processing_per_ou>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/payroll_period_processing_per_ou/__init__.py b/payroll_period_processing_per_ou/__init__.py
new file mode 100644
index 00000000..32c12c03
--- /dev/null
+++ b/payroll_period_processing_per_ou/__init__.py
@@ -0,0 +1,6 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2015 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
+from . import wizard
diff --git a/payroll_period_processing_per_ou/__manifest__.py b/payroll_period_processing_per_ou/__manifest__.py
new file mode 100644
index 00000000..b416d69f
--- /dev/null
+++ b/payroll_period_processing_per_ou/__manifest__.py
@@ -0,0 +1,23 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Payroll Period Processing per Operating Unit",
+    "summary": "For each period process only those payslips that belong to the OU.",
+    "version": "15.0.1.0.0",
+    "category": "Payroll",
+    "images": ["static/src/img/main_screenshot.png"],
+    "license": "AGPL-3",
+    "author": "TREVI Software",
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "payroll_operating_unit",
+        "payroll_period_per_ou",
+        "payroll_period_processing",
+        "payroll_register",
+    ],
+    "data": [
+        "security/ir_rule.xml",
+    ],
+    "installable": True,
+}
diff --git a/payroll_period_processing_per_ou/i18n/payroll_period_processing_per_ou.pot b/payroll_period_processing_per_ou/i18n/payroll_period_processing_per_ou.pot
new file mode 100644
index 00000000..824d67bb
--- /dev/null
+++ b/payroll_period_processing_per_ou/i18n/payroll_period_processing_per_ou.pot
@@ -0,0 +1,57 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* payroll_period_processing_per_ou
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: payroll_period_processing_per_ou
+#: model:res.groups,name:payroll_period_processing_per_ou.group_all_ou_periods
+msgid "Access all OUs' Payroll Periods"
+msgstr ""
+
+#. module: payroll_period_processing_per_ou
+#: model:ir.model.fields,field_description:payroll_period_processing_per_ou.field_hr_payroll_processing__contract_ids
+msgid "Contracts to Approve"
+msgstr ""
+
+#. module: payroll_period_processing_per_ou
+#: model:ir.model.fields,field_description:payroll_period_processing_per_ou.field_hr_payroll_processing__display_name
+#: model:ir.model.fields,field_description:payroll_period_processing_per_ou.field_hr_payroll_register__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: payroll_period_processing_per_ou
+#: model:ir.model,name:payroll_period_processing_per_ou.model_hr_payroll_processing
+msgid "HR Payroll Processing Wizard"
+msgstr ""
+
+#. module: payroll_period_processing_per_ou
+#: model:ir.model.fields,field_description:payroll_period_processing_per_ou.field_hr_payroll_processing__id
+#: model:ir.model.fields,field_description:payroll_period_processing_per_ou.field_hr_payroll_register__id
+msgid "ID"
+msgstr ""
+
+#. module: payroll_period_processing_per_ou
+#: model:ir.model.fields,field_description:payroll_period_processing_per_ou.field_hr_payroll_processing____last_update
+#: model:ir.model.fields,field_description:payroll_period_processing_per_ou.field_hr_payroll_register____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: payroll_period_processing_per_ou
+#: model:ir.model.fields,field_description:payroll_period_processing_per_ou.field_hr_payroll_register__operating_unit_id
+msgid "Operating Unit"
+msgstr ""
+
+#. module: payroll_period_processing_per_ou
+#: model:ir.model,name:payroll_period_processing_per_ou.model_hr_payroll_register
+msgid "Payroll Register"
+msgstr ""
diff --git a/payroll_period_processing_per_ou/models/__init__.py b/payroll_period_processing_per_ou/models/__init__.py
new file mode 100644
index 00000000..012cc4e9
--- /dev/null
+++ b/payroll_period_processing_per_ou/models/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import hr_payroll
diff --git a/payroll_period_processing_per_ou/models/hr_payroll.py b/payroll_period_processing_per_ou/models/hr_payroll.py
new file mode 100644
index 00000000..62c2e38c
--- /dev/null
+++ b/payroll_period_processing_per_ou/models/hr_payroll.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 PayrollRegister(models.Model):
+    _inherit = "hr.payroll.register"
+
+    operating_unit_id = fields.Many2one("operating.unit")
diff --git a/payroll_period_processing_per_ou/readme/CREDITS.rst b/payroll_period_processing_per_ou/readme/CREDITS.rst
new file mode 100644
index 00000000..d264bc7e
--- /dev/null
+++ b/payroll_period_processing_per_ou/readme/CREDITS.rst
@@ -0,0 +1 @@
+* Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/payroll_period_processing_per_ou/readme/DESCRIPTION.rst b/payroll_period_processing_per_ou/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..b85d8d0a
--- /dev/null
+++ b/payroll_period_processing_per_ou/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+This module ensures that only payslips from the period's Operating Unit are processed.
diff --git a/payroll_period_processing_per_ou/security/ir_rule.xml b/payroll_period_processing_per_ou/security/ir_rule.xml
new file mode 100644
index 00000000..42151db0
--- /dev/null
+++ b/payroll_period_processing_per_ou/security/ir_rule.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data noupdate="1">
+
+        <record id="group_all_ou_periods" model="res.groups">
+            <field name="name">Access all OUs' Payroll Periods</field>
+            <field name="category_id" ref="operating_unit.module_operating_units" />
+        </record>
+
+        <record id="hr_payslip_rule_allowed_operating_units" model="ir.rule">
+            <field name="model_id" ref="payroll_periods.model_hr_payroll_period" />
+            <field
+                name="domain_force"
+            >['|','|',(1, '=', 1) if user.has_group('payroll_period_processing_per_ou.group_all_ou_periods') else (0, '=', 1),('operating_unit_id','=',False),('operating_unit_id','in', user.operating_unit_ids.ids)]</field>
+            <field name="name">Payroll Periods from allowed operating units</field>
+            <field name="global" eval="True" />
+            <field eval="0" name="perm_unlink" />
+            <field eval="0" name="perm_write" />
+            <field eval="1" name="perm_read" />
+            <field eval="0" name="perm_create" />
+        </record>
+
+        <record id="hr_payroll_register_rule_allowed_operating_units" model="ir.rule">
+            <field name="model_id" ref="payroll_register.model_hr_payroll_register" />
+            <field
+                name="domain_force"
+            >['|','|',(1, '=', 1) if user.has_group('payroll_period_processing_per_ou.group_all_ou_periods') else (0, '=', 1),('operating_unit_id','=',False),('operating_unit_id','in', user.operating_unit_ids.ids)]</field>
+            <field name="name">Payroll Registers from allowed operating units</field>
+            <field name="global" eval="True" />
+            <field eval="0" name="perm_unlink" />
+            <field eval="0" name="perm_write" />
+            <field eval="1" name="perm_read" />
+            <field eval="0" name="perm_create" />
+        </record>
+
+    </data>
+</odoo>
diff --git a/payroll_period_processing_per_ou/static/description/icon.png b/payroll_period_processing_per_ou/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/payroll_period_processing_per_ou/static/description/icon.png differ
diff --git a/payroll_period_processing_per_ou/static/description/index.html b/payroll_period_processing_per_ou/static/description/index.html
new file mode 100644
index 00000000..faa96285
--- /dev/null
+++ b/payroll_period_processing_per_ou/static/description/index.html
@@ -0,0 +1,416 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Payroll Period Processing per Operating Unit</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="payroll-period-processing-per-operating-unit">
+<h1 class="title">Payroll Period Processing per Operating Unit</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:f191670f7aed6f139159a6a4832dd71076b743554efac8c6ecdd1c770383ba01
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_period_processing_per_ou"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<p>This module ensures that only payslips from the period’s Operating Unit are processed.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-4">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_period_processing_per_ou%0Aversion:%2014.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="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>TREVI Software</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-4">Other credits</a></h2>
+<ul class="simple">
+<li>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_period_processing_per_ou">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/payroll_period_processing_per_ou/static/src/img/main_screenshot.png b/payroll_period_processing_per_ou/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/payroll_period_processing_per_ou/static/src/img/main_screenshot.png differ
diff --git a/payroll_period_processing_per_ou/tests/__init__.py b/payroll_period_processing_per_ou/tests/__init__.py
new file mode 100644
index 00000000..e7682582
--- /dev/null
+++ b/payroll_period_processing_per_ou/tests/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import test_payroll_period_process
diff --git a/payroll_period_processing_per_ou/tests/test_payroll_period_process.py b/payroll_period_processing_per_ou/tests/test_payroll_period_process.py
new file mode 100644
index 00000000..31141145
--- /dev/null
+++ b/payroll_period_processing_per_ou/tests/test_payroll_period_process.py
@@ -0,0 +1,311 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import date, datetime
+
+from odoo.addons.mail.tests.common import mail_new_test_user
+from odoo.addons.payroll_period_processing.tests.test_payroll_period_process import (
+    TestProcessing,
+)
+
+
+class TestProcessingOU(TestProcessing):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.OU = cls.env["operating.unit"]
+        cls.Register = cls.env["hr.payroll.register"]
+
+        cls.admin_dept = cls.Department.create(
+            {
+                "name": "Administration",
+            }
+        )
+        cls.job_hradmin = cls.env["hr.job"].create(
+            {
+                "name": "HR Admin",
+                "department_id": cls.admin_dept.id,
+            }
+        )
+
+        # Operating Units
+        cls.ou_main = cls.OU.create(
+            {"name": "Main", "code": "M", "partner_id": cls.env.company.id}
+        )
+        cls.ou_second = cls.OU.create(
+            {"name": "Second", "code": "S", "partner_id": cls.env.company.id}
+        )
+        cls.all_ou_ids = cls.OU.sudo().search([])
+
+        cls.user_sally = mail_new_test_user(
+            cls.env, login="sally", groups="base.group_user,payroll.group_payroll_user"
+        )
+        cls.user_marry = mail_new_test_user(
+            cls.env,
+            login="marry",
+            groups="base.group_user,"
+            "payroll.group_payroll_user,"
+            "payroll_period_processing_per_ou.group_all_ou_periods",
+        )
+        cls.user_employee.default_operating_unit_id = cls.ou_main
+        cls.user_employee.operating_unit_ids = cls.ou_main
+        cls.user_sally.default_operating_unit_id = cls.ou_second
+        cls.user_sally.operating_unit_ids = cls.ou_second
+        cls.employee_emp.default_operating_unit_id = cls.ou_main
+        cls.employee_sally = cls.Employee.create(
+            {"name": "Sally", "default_operating_unit_id": cls.ou_second.id}
+        )
+        cls.payrollOfficer.operating_unit_ids = cls.all_ou_ids
+        cls.payrollOfficer.write(
+            {
+                "groups_id": [
+                    (
+                        4,
+                        cls.env.ref(
+                            "payroll_period_processing_per_ou.group_all_ou_periods"
+                        ).id,
+                    )
+                ]
+            }
+        )
+
+    def apply_contract_cron(self):
+        self.env.ref(
+            "hr_contract.ir_cron_data_contract_update_state"
+        ).method_direct_trigger()
+
+    def test_ou_access(self):
+
+        cc1 = self.create_contract(
+            self.employee_emp.id, "draft", "done", date(2021, 1, 1)
+        )
+        cc2 = self.create_contract(
+            self.employee_sally.id, "draft", "done", date(2021, 1, 1)
+        )
+        cc1.operating_unit_id = self.ou_main
+        cc2.operating_unit_id = self.ou_second
+        self.apply_contract_cron()
+        start = datetime(2021, 9, 1)
+        schedule = self.create_payroll_schedule("monthly", start.date())
+        schedule.use_operating_units = True
+        schedule.add_pay_period()
+        ou_ids = self.OU.search([])
+        self.assertEqual(
+            len(schedule.pay_period_ids), len(ou_ids), "There is one pay period per OU"
+        )
+
+        emp_pp_ids = self.Period.with_user(self.user_employee.id).search([])
+        sally_pp_ids = self.Period.with_user(self.user_sally.id).search([])
+        officer_pp_ids = self.Period.with_user(self.payrollOfficer.id).search([])
+        self.assertEqual(
+            len(emp_pp_ids), 1, "There is only 1 payperiod 'user_employee' can see"
+        )
+        self.assertEqual(
+            emp_pp_ids.operating_unit_id,
+            self.ou_main,
+            "User 'user_employee' has access to OU %s" % self.ou_main.name,
+        )
+        self.assertEqual(
+            len(sally_pp_ids), 1, "There is only 1 payperiod 'user_sally' can see"
+        )
+        self.assertEqual(
+            sally_pp_ids.operating_unit_id,
+            self.ou_second,
+            "User 'user_sally' has access to OU %s" % self.ou_second.name,
+        )
+        self.assertEqual(
+            self.all_ou_ids,
+            officer_pp_ids.mapped("operating_unit_id"),
+            "Payroll Officer has access to all pay periods from all OUs",
+        )
+
+    def test_register_access(self):
+
+        cc1 = self.create_contract(
+            self.employee_emp.id, "draft", "done", date(2021, 1, 1)
+        )
+        cc2 = self.create_contract(
+            self.employee_sally.id, "draft", "done", date(2021, 1, 1)
+        )
+        cc1.operating_unit_id = self.ou_main
+        cc2.operating_unit_id = self.ou_second
+        self.apply_contract_cron()
+        start = datetime(2021, 9, 1)
+        schedule = self.create_payroll_schedule("monthly", start.date())
+        schedule.use_operating_units = True
+        schedule.add_pay_period()
+        self.user_employee.write(
+            {"groups_id": [(4, self.env.ref("payroll.group_payroll_user").id)]}
+        )
+        self.user_sally.write(
+            {"groups_id": [(4, self.env.ref("payroll.group_payroll_user").id)]}
+        )
+
+        # Process each period
+        for period in schedule.pay_period_ids:
+            wiz = (
+                self.Wizard.with_user(self.payrollOfficer)
+                .with_context({"active_id": period.id})
+                .create({})
+            )
+            wiz.create_payroll_register()
+
+        emp_reg_ids = self.Register.with_user(self.user_employee.id).search([])
+        sally_reg_ids = self.Register.with_user(self.user_sally.id).search([])
+        officer_reg_ids = self.Register.with_user(self.payrollOfficer.id).search([])
+        self.assertEqual(
+            len(emp_reg_ids), 1, "There is only 1 register 'user_employee' can see"
+        )
+        self.assertEqual(
+            emp_reg_ids.operating_unit_id,
+            self.ou_main,
+            "User 'user_employee' has access to register in OU %s" % self.ou_main.name,
+        )
+        self.assertEqual(
+            len(sally_reg_ids), 1, "There is only 1 register 'user_sally' can see"
+        )
+        self.assertEqual(
+            sally_reg_ids.operating_unit_id,
+            self.ou_second,
+            "User 'user_sally' has access to register in OU %s" % self.ou_second.name,
+        )
+        self.assertEqual(
+            self.all_ou_ids,
+            officer_reg_ids.mapped("operating_unit_id"),
+            "Payroll Officer has access to all registers from all OUs",
+        )
+
+    def test_register_contracts(self):
+
+        cc1 = self.create_contract(
+            self.employee_emp.id, "draft", "done", date(2021, 1, 1)
+        )
+        cc2 = self.create_contract(
+            self.employee_sally.id, "draft", "done", date(2021, 1, 1)
+        )
+        cc1.operating_unit_id = self.ou_main
+        cc2.operating_unit_id = self.ou_second
+        start = datetime(2021, 9, 1)
+        schedule = self.create_payroll_schedule("monthly", start.date())
+        schedule.use_operating_units = True
+        schedule.add_pay_period()
+        self.user_employee.write(
+            {"groups_id": [(4, self.env.ref("payroll.group_payroll_user").id)]}
+        )
+        self.user_sally.write(
+            {"groups_id": [(4, self.env.ref("payroll.group_payroll_user").id)]}
+        )
+
+        # Process each period
+        for period in schedule.pay_period_ids:
+            wiz = (
+                self.Wizard.with_user(self.payrollOfficer)
+                .with_context({"active_id": period.id})
+                .create({})
+            )
+            wiz.create_payroll_register()
+            for contract in wiz.contract_ids:
+                self.assertEqual(
+                    contract.operating_unit_id,
+                    period.operating_unit_id,
+                    "Draft contract in period has same OU as payroll period",
+                )
+
+    def test_register_payslips(self):
+
+        start = datetime(2021, 9, 1)
+        schedule = self.create_payroll_schedule("monthly", start.date())
+        schedule.use_operating_units = True
+        cc1 = self.create_contract(
+            self.employee_emp.id,
+            "draft",
+            "done",
+            date(2021, 1, 1),
+            pps_id=schedule.id,
+            job_id=self.job_ux_designer.id,
+        )
+        cc2 = self.create_contract(
+            self.employee_sally.id,
+            "draft",
+            "done",
+            date(2021, 1, 1),
+            pps_id=schedule.id,
+            job_id=self.job_hradmin.id,
+        )
+        cc1.operating_unit_id = self.ou_main
+        cc2.operating_unit_id = self.ou_second
+        self.apply_contract_cron()
+        schedule.add_pay_period()
+
+        pp_main_ids = self.Period.with_user(self.payrollOfficer.id).search(
+            [("operating_unit_id", "=", self.ou_main.id)]
+        )
+        pp_second_ids = self.Period.with_user(self.payrollOfficer.id).search(
+            [("operating_unit_id", "=", self.ou_second.id)]
+        )
+        self.assertEqual(
+            len(pp_main_ids), 1, "There is exactly one payroll period for Main OU"
+        )
+        self.assertEqual(
+            len(pp_second_ids), 1, "There is exactly one payroll period for Second OU"
+        )
+
+        # Process Main payroll period wizard
+        wiz = (
+            self.Wizard.with_user(self.payrollOfficer)
+            .with_context({"active_id": pp_main_ids[0].id})
+            .create({})
+        )
+        wiz.create_payroll_register()
+        pp_main_ids = self.Period.with_user(self.payrollOfficer.id).search(
+            [("operating_unit_id", "=", self.ou_main.id)]
+        )
+        self.assertTrue(
+            pp_main_ids.register_id, "The Main OU payroll period has a payroll sheet"
+        )
+        self.assertEqual(
+            len(pp_main_ids.register_id.run_ids),
+            1,
+            "There is only one payslip batch in Main OU",
+        )
+        self.assertEqual(
+            len(pp_main_ids.register_id.run_ids.slip_ids),
+            1,
+            "There is only one payslip in Main OU payslip batch",
+        )
+        self.assertEqual(
+            pp_main_ids.register_id.run_ids.slip_ids.operating_unit_id,
+            self.ou_main,
+            "The one payslip has same OU as period",
+        )
+
+        # Process Second payroll period wizard
+        wiz = (
+            self.Wizard.with_user(self.payrollOfficer)
+            .with_context({"active_id": pp_second_ids[0].id})
+            .create({})
+        )
+        wiz.create_payroll_register()
+        pp_second_ids = self.Period.with_user(self.payrollOfficer.id).search(
+            [("operating_unit_id", "=", self.ou_second.id)]
+        )
+        self.assertTrue(
+            pp_second_ids.register_id,
+            "The Second OU payroll period has a payroll sheet",
+        )
+        self.assertEqual(
+            len(pp_second_ids.register_id.run_ids),
+            1,
+            "There is only one payslip batch in Second OU",
+        )
+        self.assertEqual(
+            len(pp_second_ids.register_id.run_ids.slip_ids),
+            1,
+            "There is only one payslip in Second OU payslip batch",
+        )
+        self.assertEqual(
+            pp_second_ids.register_id.run_ids.slip_ids.operating_unit_id,
+            self.ou_second,
+            "The one payslip has same OU as period",
+        )
diff --git a/payroll_period_processing_per_ou/wizard/__init__.py b/payroll_period_processing_per_ou/wizard/__init__.py
new file mode 100644
index 00000000..199a9e6f
--- /dev/null
+++ b/payroll_period_processing_per_ou/wizard/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import process
diff --git a/payroll_period_processing_per_ou/wizard/process.py b/payroll_period_processing_per_ou/wizard/process.py
new file mode 100644
index 00000000..3874626c
--- /dev/null
+++ b/payroll_period_processing_per_ou/wizard/process.py
@@ -0,0 +1,42 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import api, fields, models
+
+
+class ProcessingWizard(models.TransientModel):
+    _inherit = "hr.payroll.processing"
+
+    @api.model
+    def _get_contracts(self):
+
+        res = super()._get_contracts()
+        if len(res) > 0:
+            pp_id = self._get_pp()
+            if pp_id:
+                pp = self.env["hr.payroll.period"].browse(pp_id)
+                if pp.schedule_id.use_operating_units:
+                    res = res.filtered(
+                        lambda c: c.operating_unit_id == pp.operating_unit_id
+                    )
+        return res
+
+    contract_ids = fields.Many2many(default=_get_contracts)
+
+    def get_period_schedule_contracts(self, period):
+        """Get contracts attached to payroll schedule of 'period'."""
+
+        res = super().get_period_schedule_contracts(period)
+        if period.schedule_id.use_operating_units:
+            res = res.filtered(
+                lambda c: c.operating_unit_id == period.operating_unit_id
+            )
+        return res
+
+    def create_payslip_runs(self, register_values, dept_ids):
+
+        if self.payroll_period_id.operating_unit_id:
+            register_values.update(
+                {"operating_unit_id": self.payroll_period_id.operating_unit_id.id}
+            )
+        return super().create_payslip_runs(register_values, dept_ids)
diff --git a/payroll_periods/README.rst b/payroll_periods/README.rst
new file mode 100644
index 00000000..6f72e787
--- /dev/null
+++ b/payroll_periods/README.rst
@@ -0,0 +1,106 @@
+==============
+Payroll Period
+==============
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:4c971f072ccfe55f578956e3e55c52d767148f350fbe8325dfd83521b0c5eb1e
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_periods
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+Easy Payroll Management
+-----------------------
+This module implements a more formal payroll cycle. This cycle is based on payroll period schedules configured by the user. Based on the configured schedule payroll periods are periodicaly created in advance. When a payroll period ends the state is automatically set to 'Ended'. A manual schedule can also be created, in which case the payroll manager must create payroll periods individually.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Configuration
+=============
+
+To configure payroll periods, you need to:
+
+#. Go to Payroll -> Configuration -> Payroll Period Schedules
+#. Click on the "Create" button to create a new schedule
+
+To configure payslip exception rules, you need to:
+
+#. Go to Payroll -> Configuration -> Payslip Exception Rules
+#. Click on the "Create" button to create a new rule
+
+Known issues / Roadmap
+======================
+
+* Currently only monthly schedules are implemented
+* The option to make payment on a business day is not yet implemented
+
+Changelog
+=========
+
+14.0.1.1.4 (2022-08-11)
+~~~~~~~~~~~~~~~~~~~~~~~
+* [FIX] A bug when creating pay slips that didn't change the period's start/end times to the local timezone
+
+14.0.1.1.3 (2022-04-10)
+~~~~~~~~~~~~~~~~~~~~~~~
+* [FIX] Fixed a bug that prevented multiple payslips being computed at once
+
+14.0.1.1.2 (2022-01-12)
+~~~~~~~~~~~~~~~~~~~~~~~
+* [ADD] Allow users to view their own (and subordinates) payslips
+
+14.0.1.1.1 (2021-10-07)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* [ADD] Additional access rules
+* [FIX] Replace broken gtk-icons with font-awesome icons in payslip exception buttons in form view
+* [FIX] Properly spell out Payroll period schedule field name in hr.contract
+* [ADD] Change the severity of the NETZERO payslip exception rule from 'low' to 'critical'
+* [FIX] Payroll Period cron jobs did not complete running because of a programming error
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_periods%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+* Michael Telahun Makonnen
+
+Other credits
+~~~~~~~~~~~~~
+
+* Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_periods>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/payroll_periods/__init__.py b/payroll_periods/__init__.py
new file mode 100644
index 00000000..2b0f2dca
--- /dev/null
+++ b/payroll_periods/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
diff --git a/payroll_periods/__manifest__.py b/payroll_periods/__manifest__.py
new file mode 100644
index 00000000..e1dbe254
--- /dev/null
+++ b/payroll_periods/__manifest__.py
@@ -0,0 +1,36 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Payroll Period",
+    "summary": "Configurable payroll schedules.",
+    "version": "15.0.1.0.0",
+    "category": "Payroll",
+    "images": ["static/src/img/main_screenshot.png"],
+    "author": "TREVI Software, Michael Telahun Makonnen",
+    "license": "AGPL-3",
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "hr",
+        "hr_contract",
+        "hr_employee_status",
+        "payroll",
+    ],
+    "data": [
+        "security/ir.model.access.csv",
+        "security/ir_rule.xml",
+        "data/hr_payroll_period_data.xml",
+        "data/hr_payroll_period_cron.xml",
+        "views/hr_contract_view.xml",
+        "views/hr_payroll_period_view.xml",
+        "views/hr_payroll_period_schedule_view.xml",
+        "views/hr_payslip_exception_rule_view.xml",
+        "views/hr_payslip_exception_view.xml",
+        "views/hr_payslip_view.xml",
+    ],
+    "demo": [
+        "data/hr_payroll_period_demo.xml",
+    ],
+    "installable": True,
+}
diff --git a/payroll_periods/data/hr_payroll_period_cron.xml b/payroll_periods/data/hr_payroll_period_cron.xml
new file mode 100644
index 00000000..9b89ebea
--- /dev/null
+++ b/payroll_periods/data/hr_payroll_period_cron.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+
+        <record model="ir.cron" id="hr_payroll_period_ended_cron">
+            <field name="name">Payroll Period: Past End Date</field>
+            <field name="model_id" ref="model_hr_payroll_period" />
+            <field name="type">ir.actions.server</field>
+            <field name="state">code</field>
+            <field name="code">model.try_signal_end_period()</field>
+            <field
+                name="nextcall"
+                eval="(DateTime.now() + timedelta(minutes=60)).strftime('%Y-%m-%d %H:05:00')"
+            />
+            <field name="interval_number">1</field>
+            <field name="interval_type">hours</field>
+            <field name="numbercall">-1</field>
+        </record>
+
+        <record model="ir.cron" id="hr_payroll_period_create_cron">
+            <field name="name">Payroll Period Schedule: Create New Periods</field>
+            <field name="model_id" ref="model_hr_payroll_period_schedule" />
+            <field name="type">ir.actions.server</field>
+            <field name="state">code</field>
+            <field name="code">model.try_create_new_period()</field>
+            <field
+                eval="(DateTime.now() + timedelta(minutes=60)).strftime('%Y-%m-%d %H:05:00')"
+                name="nextcall"
+            />
+            <field name="interval_number">1</field>
+            <field name="interval_type">hours</field>
+            <field name="numbercall">-1</field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/payroll_periods/data/hr_payroll_period_data.xml b/payroll_periods/data/hr_payroll_period_data.xml
new file mode 100644
index 00000000..c420f3fa
--- /dev/null
+++ b/payroll_periods/data/hr_payroll_period_data.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data noupdate="1">
+
+        <!-- Messaging / Chatter -->
+
+        <record id="mt_state_open" model="mail.message.subtype">
+            <field name="name">Create</field>
+            <field name="res_model">hr.payroll.period</field>
+            <field name="description">Payroll Period opened</field>
+        </record>
+        <record id="mt_state_end" model="mail.message.subtype">
+            <field name="name">Ended</field>
+            <field name="res_model">hr.payroll.period</field>
+            <field name="description">Begin end-of-period processing</field>
+        </record>
+        <record id="mt_state_lock" model="mail.message.subtype">
+            <field name="name">Locked</field>
+            <field name="res_model">hr.payroll.period</field>
+            <field name="description">Payroll Period has been locked</field>
+        </record>
+        <record id="mt_state_generate" model="mail.message.subtype">
+            <field name="name">Generate Payslips</field>
+            <field name="res_model">hr.payroll.period</field>
+            <field name="description">Pay Slip generation has begun</field>
+        </record>
+        <record id="mt_state_payment" model="mail.message.subtype">
+            <field name="name">Payment</field>
+            <field name="res_model">hr.payroll.period</field>
+            <field name="description">Payment has started</field>
+        </record>
+        <record id="mt_state_close" model="mail.message.subtype">
+            <field name="name">Closed</field>
+            <field name="res_model">hr.payroll.period</field>
+            <field name="description">Payroll Period closed</field>
+        </record>
+
+        <!-- Payroll Exception Rules -->
+
+        <record id="payslip_exception_third" model="hr.payslip.exception.rule">
+            <field name="name">Net Salary is less than 1/3 of Gross</field>
+            <field name="code">NET13GROSS</field>
+            <field name="condition_select">python</field>
+            <field
+                name="condition_python"
+            >result = categories.NET &lt; (categories.GROSS / 3.0)</field>
+            <field name="sequence" eval="10" />
+            <field name="severity">critical</field>
+            <field
+                name="note"
+            >In some jurisdictions the employee's Net Salary cannot be less than 1/3 of Gross.</field>
+        </record>
+
+        <record id="payslip_exception_negative" model="hr.payslip.exception.rule">
+            <field name="name">Net Salary is negative</field>
+            <field name="code">NETNEG</field>
+            <field name="condition_select">python</field>
+            <field name="condition_python">result = categories.NET &lt;= -0.01</field>
+            <field name="sequence" eval="15" />
+            <field name="severity">critical</field>
+            <field name="note">An employee can never have a negative salary.</field>
+        </record>
+
+        <record id="payslip_exception_zero" model="hr.payslip.exception.rule">
+            <field name="name">Net Salary is Zero</field>
+            <field name="code">NETZERO</field>
+            <field name="condition_select">python</field>
+            <field
+                name="condition_python"
+            >result = categories.NET > -0.01 and categories.NET &lt; 0.01</field>
+            <field name="sequence" eval="20" />
+            <field name="severity">critical</field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/payroll_periods/data/hr_payroll_period_demo.xml b/payroll_periods/data/hr_payroll_period_demo.xml
new file mode 100644
index 00000000..cac66186
--- /dev/null
+++ b/payroll_periods/data/hr_payroll_period_demo.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+
+        <record id="schedule1" model="hr.payroll.period.schedule">
+            <field name="name">Calendar Month Schedule</field>
+            <field name="tz">GMT</field>
+            <field name="type">monthly</field>
+            <field name="mo_paydate">3</field>
+            <field
+                name="initial_period_date"
+                eval="datetime.now().strftime('%Y-%m-1')"
+            />
+        </record>
+
+        <!-- Amend demo contracts -->
+
+        <record id="hr_contract.hr_contract_admin" model="hr.contract">
+            <field name="pps_id" ref="schedule1" />
+        </record>
+        <record id="hr_contract.hr_contract_al" model="hr.contract">
+            <field name="pps_id" ref="schedule1" />
+        </record>
+        <record id="hr_contract.hr_contract_mit" model="hr.contract">
+            <field name="pps_id" ref="schedule1" />
+        </record>
+        <record id="hr_contract.hr_contract_stw" model="hr.contract">
+            <field name="pps_id" ref="schedule1" />
+        </record>
+        <record id="hr_contract.hr_contract_qdp" model="hr.contract">
+            <field name="pps_id" ref="schedule1" />
+        </record>
+        <record id="hr_contract.hr_contract_han" model="hr.contract">
+            <field name="pps_id" ref="schedule1" />
+        </record>
+        <record id="hr_contract.hr_contract_niv" model="hr.contract">
+            <field name="pps_id" ref="schedule1" />
+        </record>
+        <record id="hr_contract.hr_contract_jth" model="hr.contract">
+            <field name="pps_id" ref="schedule1" />
+        </record>
+        <record id="hr_contract.hr_contract_chs" model="hr.contract">
+            <field name="pps_id" ref="schedule1" />
+        </record>
+        <record id="hr_contract.hr_contract_jve" model="hr.contract">
+            <field name="pps_id" ref="schedule1" />
+        </record>
+        <record id="hr_contract.hr_contract_fme" model="hr.contract">
+            <field name="pps_id" ref="schedule1" />
+        </record>
+        <record id="hr_contract.hr_contract_fpi" model="hr.contract">
+            <field name="pps_id" ref="schedule1" />
+        </record>
+        <record id="hr_contract.hr_contract_vad" model="hr.contract">
+            <field name="pps_id" ref="schedule1" />
+        </record>
+
+    </data>
+</odoo>
diff --git a/payroll_periods/i18n/payroll_periods.pot b/payroll_periods/i18n/payroll_periods.pot
new file mode 100644
index 00000000..38536249
--- /dev/null
+++ b/payroll_periods/i18n/payroll_periods.pot
@@ -0,0 +1,947 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* payroll_periods
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: payroll_periods
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_firstday__10
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_paydate__10
+msgid "10"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_firstday__11
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_paydate__11
+msgid "11"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_firstday__12
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_paydate__12
+msgid "12"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_firstday__13
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_paydate__13
+msgid "13"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_firstday__14
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_paydate__14
+msgid "14"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_firstday__15
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_paydate__15
+msgid "15"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_firstday__16
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_paydate__16
+msgid "16"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_firstday__17
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_paydate__17
+msgid "17"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_firstday__18
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_paydate__18
+msgid "18"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_firstday__19
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_paydate__19
+msgid "19"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_firstday__20
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_paydate__20
+msgid "20"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_firstday__21
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_paydate__21
+msgid "21"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_firstday__22
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_paydate__22
+msgid "22"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_firstday__23
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_paydate__23
+msgid "23"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_firstday__24
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_paydate__24
+msgid "24"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_firstday__25
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_paydate__25
+msgid "25"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_firstday__26
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_paydate__26
+msgid "26"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_firstday__27
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_paydate__27
+msgid "27"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_firstday__28
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_paydate__28
+msgid "28"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_firstday__29
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_paydate__29
+msgid "29"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_firstday__30
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_paydate__30
+msgid "30"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_firstday__31
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__mo_paydate__31
+msgid "31"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period_schedule__active
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payslip_exception_rule__active
+msgid "Active"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__activity_exception_decoration
+msgid "Activity Exception Decoration"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__activity_type_icon
+msgid "Activity Type Icon"
+msgstr ""
+
+#. module: payroll_periods
+#: model_terms:ir.ui.view,arch_db:payroll_periods.view_payperiod_schedule_form
+msgid "Add"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payslip_exception_rule__condition_select__none
+msgid "Always True"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period_schedule__annual_pay_periods
+msgid "Annual Pay Periods"
+msgstr ""
+
+#. module: payroll_periods
+#: model_terms:ir.ui.view,arch_db:payroll_periods.view_payroll_period_form
+msgid ""
+"Are you sure? Once you start payment you cannot make any more modifications "
+"to the pay slip."
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: payroll_periods
+#: model:mail.message.subtype,description:payroll_periods.mt_state_end
+msgid "Begin end-of-period processing"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period__state__closed
+#: model:mail.message.subtype,name:payroll_periods.mt_state_close
+msgid "Closed"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payslip_exception_rule__code
+#: model_terms:ir.ui.view,arch_db:payroll_periods.view_exception_rule_form
+msgid "Code"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__company_id
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period_schedule__company_id
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payslip_exception_rule__company_id
+#: model_terms:ir.ui.view,arch_db:payroll_periods.view_payroll_period_filter
+msgid "Company"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payslip_exception_rule__condition_select
+msgid "Condition Based on"
+msgstr ""
+
+#. module: payroll_periods
+#: model_terms:ir.ui.view,arch_db:payroll_periods.view_exception_rule_form
+msgid "Conditions"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period_schedule__contract_ids
+#: model_terms:ir.ui.view,arch_db:payroll_periods.view_payperiod_schedule_form
+msgid "Contracts"
+msgstr ""
+
+#. module: payroll_periods
+#: model:mail.message.subtype,name:payroll_periods.mt_state_open
+msgid "Create"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__create_uid
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period_schedule__create_uid
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payslip_exception__create_uid
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payslip_exception_rule__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__create_date
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period_schedule__create_date
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payslip_exception__create_date
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payslip_exception_rule__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payslip_exception_rule__severity__critical
+msgid "Critical"
+msgstr ""
+
+#. module: payroll_periods
+#: code:addons/payroll_periods/models/hr_payroll_period.py:0
+#, python-format
+msgid ""
+"Critical exceptions remain in %s. If you wish to"
+"                             proceed you must resolve or ignore them."
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__name
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period_schedule__name
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payslip_exception_rule__note
+msgid "Description"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_contract__display_name
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__display_name
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period_schedule__display_name
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payslip__display_name
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payslip_exception__display_name
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payslip_exception_rule__display_name
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payslip_run__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model,name:payroll_periods.model_hr_contract
+msgid "Employee Contract"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__date_end
+msgid "End Date"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period__state__ended
+msgid "End of Period Processing"
+msgstr ""
+
+#. module: payroll_periods
+#: model:mail.message.subtype,name:payroll_periods.mt_state_end
+msgid "Ended"
+msgstr ""
+
+#. module: payroll_periods
+#: model_terms:ir.ui.view,arch_db:payroll_periods.view_payroll_period_filter
+msgid "Ended Periods"
+msgstr ""
+
+#. module: payroll_periods
+#: code:addons/payroll_periods/models/hr_payslip_exception_rule.py:0
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.actions.act_window,name:payroll_periods.open_payroll_exception_view
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payslip__exception_ids
+#: model:ir.ui.menu,name:payroll_periods.menu_payroll_exception_view
+#: model_terms:ir.ui.view,arch_db:payroll_periods.view_payslip_form
+msgid "Exceptions"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,help:payroll_periods.field_hr_payroll_period__activity_type_icon
+msgid "Font awesome icon e.g. fa-tasks"
+msgstr ""
+
+#. module: payroll_periods
+#: code:addons/payroll_periods/models/hr_payroll_period_schedule.py:0
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__ot_week_startday__5
+#, python-format
+msgid "Friday"
+msgstr ""
+
+#. module: payroll_periods
+#: model_terms:ir.ui.view,arch_db:payroll_periods.view_payroll_period_form
+msgid "General"
+msgstr ""
+
+#. module: payroll_periods
+#: model:mail.message.subtype,name:payroll_periods.mt_state_generate
+msgid "Generate Payslips"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period__state__generate
+msgid "Generating Payslips"
+msgstr ""
+
+#. module: payroll_periods
+#: model_terms:ir.ui.view,arch_db:payroll_periods.view_payroll_period_filter
+msgid "Group By..."
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_contract__id
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__id
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period_schedule__id
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payslip__id
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payslip_exception__id
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payslip_exception_rule__id
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payslip_run__id
+msgid "ID"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__activity_exception_icon
+msgid "Icon"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,help:payroll_periods.field_hr_payroll_period__activity_exception_icon
+msgid "Icon to indicate an exception activity."
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,help:payroll_periods.field_hr_payroll_period__message_needaction
+#: model:ir.model.fields,help:payroll_periods.field_hr_payroll_period__message_unread
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,help:payroll_periods.field_hr_payroll_period__message_has_error
+#: model:ir.model.fields,help:payroll_periods.field_hr_payroll_period__message_has_sms_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,help:payroll_periods.field_hr_payslip_exception_rule__active
+msgid ""
+"If the active field is set to false, it will allow you to hide the rule "
+"without removing it."
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payslip_exception__ignore
+msgid "Ignore"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period_schedule__initial_period_date
+msgid "Initial Period Start Date"
+msgstr ""
+
+#. module: payroll_periods
+#: model_terms:ir.ui.view,arch_db:payroll_periods.view_payroll_period_form
+msgid "Interval"
+msgstr ""
+
+#. module: payroll_periods
+#: code:addons/payroll_periods/models/hr_payslip_run.py:0
+#, python-format
+msgid "Invalid Action"
+msgstr ""
+
+#. module: payroll_periods
+#: code:addons/payroll_periods/models/hr_payroll_period.py:0
+#, python-format
+msgid ""
+"Invalid ActionYou cannot modify a pay slip once the period it is in has been"
+" marked for payment."
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_contract____last_update
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period____last_update
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period_schedule____last_update
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payslip____last_update
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payslip_exception____last_update
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payslip_exception_rule____last_update
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payslip_run____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__write_uid
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period_schedule__write_uid
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payslip_exception__write_uid
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payslip_exception_rule__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__write_date
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period_schedule__write_date
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payslip_exception__write_date
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payslip_exception_rule__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: payroll_periods
+#: model:mail.message.subtype,name:payroll_periods.mt_state_lock
+msgid "Locked"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payslip_exception_rule__severity__low
+msgid "Low"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__type__manual
+msgid "Manual"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payslip_exception_rule__severity__medium
+msgid "Medium"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: payroll_periods
+#: code:addons/payroll_periods/models/hr_payroll_period_schedule.py:0
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__ot_week_startday__1
+#, python-format
+msgid "Monday"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__type__monthly
+msgid "Monthly"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__my_activity_date_deadline
+msgid "My Activity Deadline"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payslip_exception__name
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payslip_exception_rule__name
+msgid "Name"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: payroll_periods
+#: model_terms:ir.ui.view,arch_db:payroll_periods.view_exception_rule_form
+msgid "Note"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__message_has_error_counter
+msgid "Number of errors"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,help:payroll_periods.field_hr_payroll_period__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,help:payroll_periods.field_hr_payroll_period__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,help:payroll_periods.field_hr_payroll_period__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period_schedule__ot_max_rollover_hours
+msgid "OT Max. Continous Hours"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period_schedule__ot_max_rollover_gap
+msgid "OT Max. Continuous Hours Gap (in Min.)"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period__state__open
+msgid "Open"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period_schedule__mo_paydate
+msgid "Pay Date"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period_schedule__paydate_biz_day
+msgid "Pay Date on a Business Day"
+msgstr ""
+
+#. module: payroll_periods
+#: model_terms:ir.ui.view,arch_db:payroll_periods.view_payperiod_schedule_form
+msgid "Pay Period Schedule"
+msgstr ""
+
+#. module: payroll_periods
+#: model_terms:ir.ui.view,arch_db:payroll_periods.view_payperiod_schedule_tree
+msgid "Pay Period Schedules"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period_schedule__pay_period_ids
+#: model_terms:ir.ui.view,arch_db:payroll_periods.view_payperiod_schedule_form
+msgid "Pay Periods"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payslip_exception__slip_id
+msgid "Pay Slip"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__exception_ids
+#: model_terms:ir.ui.view,arch_db:payroll_periods.view_payroll_period_form
+msgid "Pay Slip Exceptions"
+msgstr ""
+
+#. module: payroll_periods
+#: code:addons/payroll_periods/models/hr_payroll_period.py:0
+#, python-format
+msgid "Pay Slip for %s for %s/%s"
+msgstr ""
+
+#. module: payroll_periods
+#: model:mail.message.subtype,description:payroll_periods.mt_state_generate
+msgid "Pay Slip generation has begun"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period__state__payment
+#: model:mail.message.subtype,name:payroll_periods.mt_state_payment
+msgid "Payment"
+msgstr ""
+
+#. module: payroll_periods
+#: model:mail.message.subtype,description:payroll_periods.mt_state_payment
+msgid "Payment has started"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model,name:payroll_periods.model_hr_payslip_exception
+#: model_terms:ir.ui.view,arch_db:payroll_periods.view_payroll_exception_form
+msgid "Payroll Exception"
+msgstr ""
+
+#. module: payroll_periods
+#: model_terms:ir.ui.view,arch_db:payroll_periods.view_exception_rule_form
+msgid "Payroll Exception Rule"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.actions.act_window,name:payroll_periods.open_payroll_exception_rule_view
+#: model:ir.ui.menu,name:payroll_periods.menu_payroll_exception_rule_view
+#: model_terms:ir.ui.view,arch_db:payroll_periods.view_exception_rule_tree
+msgid "Payroll Exception Rules"
+msgstr ""
+
+#. module: payroll_periods
+#: model_terms:ir.ui.view,arch_db:payroll_periods.view_payroll_exception_tree
+#: model_terms:ir.ui.view,arch_db:payroll_periods.view_payslip_form
+msgid "Payroll Exceptions"
+msgstr ""
+
+#. module: payroll_periods
+#: model_terms:ir.ui.view,arch_db:payroll_periods.view_payroll_period_form
+msgid "Payroll Exceptions in Period"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payslip_run__period_id
+#: model_terms:ir.ui.view,arch_db:payroll_periods.view_payroll_period_form
+msgid "Payroll Period"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model,name:payroll_periods.model_hr_payroll_period_schedule
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_contract__pps_id
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__schedule_id
+msgid "Payroll Period Schedule"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.actions.server,name:payroll_periods.hr_payroll_period_create_cron_ir_actions_server
+#: model:ir.cron,cron_name:payroll_periods.hr_payroll_period_create_cron
+#: model:ir.cron,name:payroll_periods.hr_payroll_period_create_cron
+msgid "Payroll Period Schedule: Create New Periods"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.actions.act_window,name:payroll_periods.open_payroll_period_schedule_view
+#: model:ir.ui.menu,name:payroll_periods.menu_payroll_period_schedule_view
+msgid "Payroll Period Schedules"
+msgstr ""
+
+#. module: payroll_periods
+#: model:mail.message.subtype,description:payroll_periods.mt_state_close
+msgid "Payroll Period closed"
+msgstr ""
+
+#. module: payroll_periods
+#: model:mail.message.subtype,description:payroll_periods.mt_state_lock
+msgid "Payroll Period has been locked"
+msgstr ""
+
+#. module: payroll_periods
+#: model:mail.message.subtype,description:payroll_periods.mt_state_open
+msgid "Payroll Period opened"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.actions.server,name:payroll_periods.hr_payroll_period_ended_cron_ir_actions_server
+#: model:ir.cron,cron_name:payroll_periods.hr_payroll_period_ended_cron
+#: model:ir.cron,name:payroll_periods.hr_payroll_period_ended_cron
+msgid "Payroll Period: Past End Date"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.actions.act_window,name:payroll_periods.open_payroll_period_view
+#: model:ir.model,name:payroll_periods.model_hr_payroll_period
+#: model:ir.ui.menu,name:payroll_periods.menu_payroll_period_view
+#: model_terms:ir.ui.view,arch_db:payroll_periods.view_payroll_period_filter
+#: model_terms:ir.ui.view,arch_db:payroll_periods.view_payroll_period_tree
+msgid "Payroll Periods"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model,name:payroll_periods.model_hr_payslip
+msgid "Payslip"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model,name:payroll_periods.model_hr_payslip_run
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__run_ids
+#: model_terms:ir.ui.view,arch_db:payroll_periods.view_payroll_period_form
+msgid "Payslip Batches"
+msgstr ""
+
+#. module: payroll_periods
+#: model_terms:ir.ui.view,arch_db:payroll_periods.view_payroll_period_form
+msgid "Payslips"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__period_name
+msgid "Period Name"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payslip_exception_rule__condition_python
+msgid "Python Condition"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payslip_exception_rule__condition_select__python
+msgid "Python Expression"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payslip_exception__rule_id
+msgid "Rule"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model,name:payroll_periods.model_hr_payslip_exception_rule
+msgid "Rules describing pay slips in an abnormal state"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: payroll_periods
+#: code:addons/payroll_periods/models/hr_payroll_period_schedule.py:0
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__ot_week_startday__6
+#, python-format
+msgid "Saturday"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payslip_exception_rule__sequence
+msgid "Sequence"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payslip_exception__severity
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payslip_exception_rule__severity
+msgid "Severity"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__date_start
+msgid "Start Date"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period_schedule__mo_firstday
+msgid "Start Day"
+msgstr ""
+
+#. module: payroll_periods
+#: model_terms:ir.ui.view,arch_db:payroll_periods.view_payroll_period_form
+msgid "Start Payment"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period_schedule__ot_week_startday
+msgid "Start of Week"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__state
+msgid "State"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,help:payroll_periods.field_hr_payroll_period__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: payroll_periods
+#: code:addons/payroll_periods/models/hr_payroll_period_schedule.py:0
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__ot_week_startday__0
+#, python-format
+msgid "Sunday"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,help:payroll_periods.field_hr_payslip_exception_rule__condition_python
+msgid "The condition that triggers the exception."
+msgstr ""
+
+#. module: payroll_periods
+#: model_terms:ir.actions.act_window,help:payroll_periods.open_payroll_period_view
+msgid "There are no current pay periods that are past their end date."
+msgstr ""
+
+#. module: payroll_periods
+#: code:addons/payroll_periods/models/hr_payroll_period_schedule.py:0
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__ot_week_startday__4
+#, python-format
+msgid "Thursday"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period_schedule__tz
+msgid "Time Zone"
+msgstr ""
+
+#. module: payroll_periods
+#: code:addons/payroll_periods/models/hr_payroll_period_schedule.py:0
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__ot_week_startday__2
+#, python-format
+msgid "Tuesday"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period_schedule__type
+msgid "Type"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,help:payroll_periods.field_hr_payroll_period__activity_exception_decoration
+msgid "Type of the exception activity on record."
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,help:payroll_periods.field_hr_payslip_exception_rule__sequence
+msgid "Use to arrange calculation sequence"
+msgstr ""
+
+#. module: payroll_periods
+#: code:addons/payroll_periods/models/hr_payroll_period.py:0
+#, python-format
+msgid "Validation Error"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,field_description:payroll_periods.field_hr_payroll_period__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: payroll_periods
+#: model:ir.model.fields,help:payroll_periods.field_hr_payroll_period__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: payroll_periods
+#: code:addons/payroll_periods/models/hr_payroll_period_schedule.py:0
+#: model:ir.model.fields.selection,name:payroll_periods.selection__hr_payroll_period_schedule__ot_week_startday__3
+#, python-format
+msgid "Wednesday"
+msgstr ""
+
+#. module: payroll_periods
+#: code:addons/payroll_periods/models/hr_payslip_exception_rule.py:0
+#, python-format
+msgid "Wrong python condition defined for payroll exception rule %s (%s)."
+msgstr ""
+
+#. module: payroll_periods
+#: code:addons/payroll_periods/models/hr_payslip_run.py:0
+#, python-format
+msgid "You must lock the payroll period first."
+msgstr ""
diff --git a/payroll_periods/models/__init__.py b/payroll_periods/models/__init__.py
new file mode 100644
index 00000000..51250f1f
--- /dev/null
+++ b/payroll_periods/models/__init__.py
@@ -0,0 +1,11 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import hr_contract
+from . import hr_payroll_period
+from . import hr_payroll_period_schedule
+from . import hr_payslip
+from . import hr_payslip_exception
+from . import hr_payslip_exception_rule
+from . import hr_payslip_run
diff --git a/payroll_periods/models/hr_contract.py b/payroll_periods/models/hr_contract.py
new file mode 100644
index 00000000..e71b044c
--- /dev/null
+++ b/payroll_periods/models/hr_contract.py
@@ -0,0 +1,12 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import fields, models
+
+
+class Contract(models.Model):
+    _inherit = "hr.contract"
+
+    pps_id = fields.Many2one(
+        "hr.payroll.period.schedule", "Payroll Period Schedule", required=False
+    )
diff --git a/payroll_periods/models/hr_payroll_period.py b/payroll_periods/models/hr_payroll_period.py
new file mode 100644
index 00000000..99538e59
--- /dev/null
+++ b/payroll_periods/models/hr_payroll_period.py
@@ -0,0 +1,369 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import datetime, timedelta
+
+from dateutil.relativedelta import relativedelta
+from pytz import timezone
+
+from odoo import _, api, exceptions, fields, models
+
+from .hr_payroll_period_schedule import get_period_year
+
+
+class HrPayrollPeriod(models.Model):
+
+    _name = "hr.payroll.period"
+    _description = "Payroll Periods"
+    _inherit = ["mail.thread", "mail.activity.mixin"]
+    _order = "date_start, name desc"
+
+    name = fields.Char(string="Description", required=True)
+    period_name = fields.Char()
+    schedule_id = fields.Many2one(
+        string="Payroll Period Schedule",
+        comodel_name="hr.payroll.period.schedule",
+        required=True,
+        check_company=True,
+    )
+    date_start = fields.Datetime(string="Start Date", required=True)
+    date_end = fields.Datetime(string="End Date", required=True)
+    state = fields.Selection(
+        selection=[
+            ("open", "Open"),
+            ("ended", "End of Period Processing"),
+            ("generate", "Generating Payslips"),
+            ("payment", "Payment"),
+            ("closed", "Closed"),
+        ],
+        default="open",
+        index=True,
+        readonly=True,
+    )
+    company_id = fields.Many2one(
+        string="Company",
+        comodel_name="res.company",
+        default=lambda self: self.env.company,
+        required=True,
+    )
+    run_ids = fields.One2many(
+        comodel_name="hr.payslip.run",
+        inverse_name="period_id",
+        string="Payslip Batches",
+    )
+    exception_ids = fields.Many2many(
+        string="Pay Slip Exceptions",
+        comodel_name="hr.payslip.exception",
+        compute="_compute_pex_all",
+    )
+
+    def _get_pex(self, severity):
+
+        self.ensure_one()
+        PayslipException = self.env["hr.payslip.exception"]
+
+        slip_ids = []
+        for run in self.run_ids:
+            [slip_ids.append(slip.id) for slip in run.slip_ids]
+        ex = PayslipException.search(
+            [("severity", "=", severity), ("slip_id", "in", slip_ids)]
+        )
+        return ex.ids
+
+    @api.depends("run_ids.slip_ids")
+    def _compute_pex_all(self):
+
+        for period in self:
+            res = period._get_pex("critical")
+            res += period._get_pex("medium")
+            res += period._get_pex(
+                "low",
+            )
+            period.exception_ids = [(6, 0, res)]
+
+    def _track_subtype(self, init_values):
+        self.ensure_one()
+        if "state" in init_values:
+            if self.state == "open":
+                return self.env.ref("payroll_periods.mt_state_open")
+            elif self.state == "end":
+                return self.env.ref("payroll_periods.mt_state_end")
+            elif self.state == "lock":
+                return self.env.ref("payroll_periods.mt_state_lock")
+            elif self.state == "generate":
+                return self.env.ref("payroll_periods.mt_state_generate")
+            elif self.state == "payment":
+                return self.env.ref("payroll_periods.mt_state_payment")
+            elif self.state == "close":
+                return self.env.ref("payroll_periods.mt_state_close")
+        return super(HrPayrollPeriod, self)._track_subtype(init_values)
+
+    @api.model
+    def is_ended(self):
+
+        #
+        # XXX - Someone who cares about DST should update this code to handle it.
+        #
+
+        self.ensure_one()
+        utc_tz = timezone("UTC")
+        utcDtNow = utc_tz.localize(datetime.now(), is_dst=False)
+        dtEnd = self.date_end
+        utcDtEnd = utc_tz.localize(dtEnd, is_dst=False)
+        if utcDtNow > utcDtEnd + timedelta(
+            minutes=(self.schedule_id.ot_max_rollover_hours * 60)
+        ):
+            return True
+        return False
+
+    @api.model
+    def try_signal_end_period(self):
+        """Method called, usually by cron, to transition any payroll periods
+        that are past their end date.
+        """
+
+        #
+        # XXX - Someone who cares about DST should update this code to handle it.
+        #
+
+        utc_tz = timezone("UTC")
+        utcDtNow = utc_tz.localize(datetime.now(), is_dst=False)
+        period_ids = self.search(
+            [
+                ("state", "in", ["open"]),
+                ("date_end", "<=", utcDtNow.strftime("%Y-%m-%d %H:%M:%S")),
+            ]
+        )
+        period_ids.set_state_ended()
+
+    @api.model
+    def get_utc_times(self, period):
+
+        #
+        # XXX - Someone who cares about DST should update this code to handle it.
+        #
+
+        utc_tz = timezone("UTC")
+        utcDtStart = utc_tz.localize(period.date_start, is_dst=False)
+        utcDtEnd = utc_tz.localize(period.date_end, is_dst=False)
+
+        return (utcDtStart, utcDtEnd)
+
+    def set_state_ended(self):
+
+        self.write({"state": "ended"})
+
+    def set_state_payment(self):
+
+        for period in self:
+            for ex in period.exception_ids:
+                if ex.severity == "critical" and not ex.ignore:
+                    raise exceptions.ValidationError(
+                        _("Validation Error")
+                        + "\n"
+                        + _(
+                            "Critical exceptions remain in %s. If you wish to \
+                            proceed you must resolve or ignore them."
+                        )
+                        % (period.name)
+                    )
+        self.write({"state": "payment"})
+
+    def set_state_generate(self):
+
+        self.write({"state": "generate"})
+
+    def set_state_closed(self):
+
+        # When we close a pay period, also de-activate related attendances
+        Attendance = self.env["hr.attendance"]
+
+        for period in self:
+            #
+            # XXX - Someone who cares about DST should update this code to handle it.
+            #
+            utc_tz = timezone("UTC")
+            utcDtStart = utc_tz.localize(period.date_start, is_dst=False)
+            dt = period.date_end + relativedelta(
+                hours=period.sched_id.ot_max_rollover_hours
+            )
+            utcDtEnd = utc_tz.localize(dt, is_dst=False)
+            dtStart = utcDtStart.replace(tzinfo=None)
+            dtEnd = utcDtEnd.replace(tzinfo=None)
+            for contract in period.schedule_id.contract_ids:
+                employee = contract.employee_id
+
+                # De-activate sign-in and sign-out attendance records
+                punch_ids = Attendance.search(
+                    [
+                        ("employee_id", "=", employee.id),
+                        "&",
+                        ("checkin", ">=", dtStart),
+                        ("check_out", "<=", dtEnd),
+                    ],
+                )
+                punch_ids.write({"active": False})
+
+        return self.write({"state": "closed"})
+
+    @api.model
+    def get_contracts_hook(self, ee, dPeriodStart, dPeriodEnd):
+        found_contracts = []
+        dEarliestContractStart = False
+        dLastContractEnd = False
+        open_contract = False
+        for contract in ee.contract_ids:
+
+            # Does employee have a contract in this pay period?
+            #
+            dContractStart = contract.date_start
+            dContractEnd = False
+            if contract.date_end:
+                dContractEnd = contract.date_end
+            if dContractStart > dPeriodEnd or (
+                dContractEnd and dContractEnd < dPeriodStart
+            ):
+                continue
+            else:
+                found_contracts.append(contract)
+                if (
+                    not dEarliestContractStart
+                    or dContractStart < dEarliestContractStart
+                ):
+                    dEarliestContractStart = dContractStart
+                if not dContractEnd:
+                    dLastContractEnd = False
+                    open_contract = True
+                elif (
+                    not open_contract
+                    and dContractEnd
+                    and (not dLastContractEnd or dContractEnd > dLastContractEnd)
+                ):
+                    dLastContractEnd = dContractEnd
+        return (dEarliestContractStart, dLastContractEnd, found_contracts)
+
+    @api.model
+    def payslip_create_hook(self, dictCreate):
+        return dictCreate
+
+    def create_payslip(self, employee_id, run_id=False):
+
+        self.ensure_one()
+        local_tz = timezone(self.schedule_id.tz)
+        utc_pstart, utc_pend = self.get_utc_times(self)
+        tz_pstart = utc_pstart.astimezone(local_tz)
+        tz_pend = utc_pend.astimezone(local_tz)
+        annual_pay_periods = self.schedule_id.annual_pay_periods
+        dPeriodStart = tz_pstart.date()
+        dPeriodEnd = tz_pend.date()
+        Payslip = self.env["hr.payslip"]
+        ee = self.env["hr.employee"].browse(employee_id)
+        (
+            dEarliestContractStart,
+            dLastContractEnd,
+            found_contracts,
+        ) = self.get_contracts_hook(ee, dPeriodStart, dPeriodEnd)
+
+        if len(found_contracts) == 0:
+            return False
+
+        # If the contract doesn't cover the full pay period use the contract
+        # dates as start/end dates instead of the full period.
+        #
+        period_start_date = dPeriodStart
+        period_end_date = dPeriodEnd
+        temp_date_start = period_start_date
+        temp_date_end = period_end_date
+        if dEarliestContractStart > period_start_date:
+            temp_date_start = dEarliestContractStart
+        if dLastContractEnd and dLastContractEnd < period_end_date:
+            temp_date_end = dLastContractEnd
+
+        # If termination procedures have begun within the contract period, use the
+        # effective date of the termination as the end date.
+        #
+        Termination = self.env["hr.employee.termination"]
+        term_ids = Termination.search(
+            [
+                ("employee_id", "=", found_contracts[0].employee_id.id),
+                ("employee_id.status", "in", ["pending_inactive", "inactive"]),
+                ("state", "in", ["draft", "done"]),
+            ]
+        )
+        if len(term_ids) > 0:
+            for term in term_ids:
+                if term.name >= temp_date_start and term.name < temp_date_end:
+                    temp_date_end = term.name
+
+        month_name, month_no, year_no = get_period_year(
+            dPeriodStart, annual_pay_periods
+        )
+        slip_name = _("Pay Slip for %s for %s/%s") % (ee.name, year_no, month_name)
+        res = {
+            "employee_id": ee.id,
+            "name": slip_name,
+            "payslip_run_id": run_id,
+            "date_from": temp_date_start,
+            "date_to": temp_date_end,
+        }
+        # allow other modules to modify payslip creation values dict
+        res = self.payslip_create_hook(res)
+
+        slip = Payslip.create(res)
+        slip.onchange_employee()
+        return slip
+
+    def print_contribution_registers(self):
+
+        data = (
+            self.env["hr.payroll.period"]
+            .browse(self.ids[0])
+            .read(["date_start", "date_end"])
+        )
+        register_ids = self.env["hr.contribution.register"].search([]).ids
+
+        form = {"date_from": data["date_start"], "date_to": data["date_end"]}
+
+        return {
+            "type": "ir.actions.report.xml",
+            "report_name": "contribution.register.lines",
+            "datas": {
+                "ids": register_ids,
+                "form": form,
+                "model": "hr.contribution.register",
+            },
+        }
+
+    def rerun_payslip(self, slip):
+
+        self.ensure_one()
+        run = slip.payslip_run_id
+        ee = slip.employee_id
+
+        if self.state in ["payment", "closed"]:
+            raise exceptions.UserError(
+                _(
+                    "Invalid Action"
+                    "You cannot modify a pay slip once the period it is in has been "
+                    "marked for payment."
+                )
+            )
+
+        # Remove any pre-existing pay slip
+        slip.unlink()
+        slip = None
+
+        # Create a pay slip
+        slip = self.create_payslip(ee.id, run.id)
+
+        # Calculate payroll for all the pay slips in this batch (run)
+        slip.compute_sheet()
+
+        return slip
+
+    def process_employee(self, employee_id):
+        """Hook method to allow subclasses to override creation of a payslip
+        for an employee."""
+
+        return True
diff --git a/payroll_periods/models/hr_payroll_period_schedule.py b/payroll_periods/models/hr_payroll_period_schedule.py
new file mode 100644
index 00000000..f28ad4bc
--- /dev/null
+++ b/payroll_periods/models/hr_payroll_period_schedule.py
@@ -0,0 +1,342 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+
+import calendar
+from datetime import date, datetime, timedelta
+
+from dateutil.relativedelta import relativedelta
+from pytz import common_timezones, timezone, utc
+
+from odoo import _, api, fields, models
+from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT as OE_DTFORMAT
+
+
+# http://stackoverflow.com/questions/4130922/how-to-increment-datetime-month-in-python
+#
+def add_months(sourcedate, months):
+    month = sourcedate.month - 1 + months
+    year = sourcedate.year + month // 12
+    month = month % 12 + 1
+    day = min(sourcedate.day, calendar.monthrange(year, month)[1])
+    return date(year, month, day)
+
+
+def get_period_year(dt, annual_pay_periods):
+
+    month_number = 0
+    year_number = 0
+    if dt.day < 15:
+        month_name = dt.strftime("%B")
+        month_number = dt.strftime("%m")
+        year_number = dt.year
+    else:
+        dtTmp = add_months(dt, 1)
+        if annual_pay_periods > 12:
+            # Maybe bi-weekly?
+            month_name = dt.strftime("%B")
+        else:
+            month_name = dtTmp.strftime("%B")
+        month_number = dtTmp.strftime("%m")
+        year_number = dtTmp.year
+    return month_name, month_number, year_number
+
+
+class HrPayperiodSchedule(models.Model):
+
+    _name = "hr.payroll.period.schedule"
+    _description = "Payroll Period Schedule"
+    _check_company_auto = True
+
+    @api.model
+    def _tz_list(self):
+
+        res = tuple()
+        for name in common_timezones:
+            res += ((name, name),)
+        return res
+
+    def _compute_annual_periods(self):
+
+        for pps in self:
+            if pps.type == "manual":
+                pps.annual_pay_periods = 0
+            elif pps.type == "monthly":
+                pps.annual_pay_periods = 12
+
+    name = fields.Char(string="Description", required=True)
+    tz = fields.Selection(selection=_tz_list, string="Time Zone", required=True)
+    paydate_biz_day = fields.Boolean(string="Pay Date on a Business Day")
+    ot_week_startday = fields.Selection(
+        string="Start of Week",
+        selection=[
+            ("0", _("Sunday")),
+            ("1", _("Monday")),
+            ("2", _("Tuesday")),
+            ("3", _("Wednesday")),
+            ("4", _("Thursday")),
+            ("5", _("Friday")),
+            ("6", _("Saturday")),
+        ],
+        default="1",
+        required=True,
+    )
+    ot_max_rollover_hours = fields.Integer(
+        string="OT Max. Continous Hours", required=True, default=6
+    )
+    ot_max_rollover_gap = fields.Integer(
+        string="OT Max. Continuous Hours Gap (in Min.)", required=True, default=60
+    )
+    type = fields.Selection(
+        selection=[
+            ("manual", "Manual"),
+            ("monthly", "Monthly"),
+        ],
+        required=True,
+        default="monthly",
+    )
+    annual_pay_periods = fields.Integer(compute=_compute_annual_periods)
+    mo_firstday = fields.Selection(
+        string="Start Day",
+        selection=[
+            ("1", "1"),
+            ("2", "2"),
+            ("3", "3"),
+            ("4", "4"),
+            ("5", "5"),
+            ("6", "6"),
+            ("7", "7"),
+            ("8", "8"),
+            ("9", "9"),
+            ("10", "10"),
+            ("11", "11"),
+            ("12", "12"),
+            ("13", "13"),
+            ("14", "14"),
+            ("15", "15"),
+            ("16", "16"),
+            ("17", "17"),
+            ("18", "18"),
+            ("19", "19"),
+            ("20", "20"),
+            ("21", "21"),
+            ("22", "22"),
+            ("23", "23"),
+            ("24", "24"),
+            ("25", "25"),
+            ("26", "26"),
+            ("27", "27"),
+            ("28", "28"),
+            ("29", "29"),
+            ("30", "30"),
+            ("31", "31"),
+        ],
+        default="1",
+    )
+    mo_paydate = fields.Selection(
+        string="Pay Date",
+        selection=[
+            ("1", "1"),
+            ("2", "2"),
+            ("3", "3"),
+            ("4", "4"),
+            ("5", "5"),
+            ("6", "6"),
+            ("7", "7"),
+            ("8", "8"),
+            ("9", "9"),
+            ("10", "10"),
+            ("11", "11"),
+            ("12", "12"),
+            ("13", "13"),
+            ("14", "14"),
+            ("15", "15"),
+            ("16", "16"),
+            ("17", "17"),
+            ("18", "18"),
+            ("19", "19"),
+            ("20", "20"),
+            ("21", "21"),
+            ("22", "22"),
+            ("23", "23"),
+            ("24", "24"),
+            ("25", "25"),
+            ("26", "26"),
+            ("27", "27"),
+            ("28", "28"),
+            ("29", "29"),
+            ("30", "30"),
+            ("31", "31"),
+        ],
+        default="3",
+    )
+    contract_ids = fields.One2many(
+        string="Contracts", comodel_name="hr.contract", inverse_name="pps_id"
+    )
+    pay_period_ids = fields.One2many(
+        string="Pay Periods",
+        comodel_name="hr.payroll.period",
+        inverse_name="schedule_id",
+        check_company=True,
+    )
+    initial_period_date = fields.Date(string="Initial Period Start Date", required=True)
+    active = fields.Boolean(default=True)
+    company_id = fields.Many2one(
+        string="Company",
+        comodel_name="res.company",
+        required=True,
+        default=lambda self: self.env.company,
+    )
+
+    def button_add_pay_periods(self):
+
+        for sched in self:
+            sched.add_pay_period()
+
+    def add_pay_period(self):
+
+        #
+        # XXX - Someone who cares about DST should update this code to handle it.
+        #
+
+        self.ensure_one()
+        data = None
+        month_name = month_number = year_number = ""
+        latest = self._get_latest_period(self.id)
+        local_tz = timezone(self.tz)
+        if not latest:
+            # No pay periods have been defined yet for this pay period schedule.
+            if self.type == "monthly":
+                dtStart = False
+                dStart = self.initial_period_date
+                if dStart.day > int(self.mo_firstday):
+                    dStart = add_months(dStart, 1)
+                    dtStart = datetime(
+                        dStart.year, dStart.month, int(self.mo_firstday), 0, 0, 0
+                    )
+                elif dStart.day < int(self.mo_firstday):
+                    dtStart = datetime(
+                        dStart.year, dStart.month, int(self.mo_firstday), 0, 0, 0
+                    )
+                else:
+                    dtStart = datetime(dStart.year, dStart.month, dStart.day, 0, 0, 0)
+                dtEnd = add_months(dtStart, 1) - timedelta(days=1)
+                dtEnd = datetime(dtEnd.year, dtEnd.month, dtEnd.day, 23, 59, 59)
+                month_name, month_number, year_number = get_period_year(dtStart, 12)
+
+                # Convert from time zone of punches to UTC for storage
+                ltzStart = local_tz.localize(dtStart, is_dst=None)
+                utcStart = ltzStart.astimezone(utc)
+                ltzEnd = local_tz.localize(dtEnd, is_dst=None)
+                utcEnd = ltzEnd.astimezone(utc)
+                dtStart = utcStart.replace(tzinfo=None)
+                dtEnd = utcEnd.replace(tzinfo=None)
+
+                data = {
+                    "name": _("{}/{} {}").format(
+                        str(year_number), str(month_number), str(month_name)
+                    ),
+                    "period_name": _("{}/{} {}").format(
+                        str(year_number), str(month_number), str(month_name)
+                    ),
+                    "schedule_id": self.id,
+                    "date_start": dtStart,
+                    "date_end": dtEnd,
+                }
+        else:
+            if self.type == "monthly":
+                # Convert from UTC to timezone of punches
+                dtStart = latest.date_end
+                utcStart = utc.localize(dtStart, is_dst=None)
+                utcStart += timedelta(seconds=1)
+                ltzStart = utcStart.astimezone(local_tz)
+
+                # Roll forward to the next pay period start and end times
+                dEnd = add_months(ltzStart.replace(tzinfo=None), 1) - timedelta(days=1)
+                ltzEnd = local_tz.localize(
+                    datetime(dEnd.year, dEnd.month, dEnd.day, 23, 59, 59)
+                )
+                month_name, month_number, year_number = get_period_year(ltzStart, 12)
+
+                # Convert from time zone of punches to UTC for storage
+                utcStart = ltzStart.astimezone(utc)
+                utcEnd = ltzEnd.astimezone(utc)
+                dtStart = utcStart.replace(tzinfo=None)
+                dtEnd = utcEnd.replace(tzinfo=None)
+
+                data = {
+                    "name": _("{}/{} {}").format(
+                        str(year_number), str(month_number), str(month_name)
+                    ),
+                    "period_name": _("{}/{} {}").format(
+                        str(year_number), str(month_number), str(month_name)
+                    ),
+                    "schedule_id": self.id,
+                    "date_start": dtStart,
+                    "date_end": dtEnd,
+                }
+
+        # Run hook method to give other modules a chance to edit the data
+        data = self.payroll_period_data_hook(
+            data, month_name, month_number, year_number
+        )
+        self.write({"pay_period_ids": [(0, 0, data)]})
+
+    def payroll_period_data_hook(
+        self, _data=None, mo_name=False, mo_num=False, yearno=False
+    ):
+        self.ensure_one()
+        if _data is None:
+            _data = {}
+        return _data
+
+    @api.model
+    def _get_latest_period(self, sched_id):
+
+        PayrollPeriod = self.env["hr.payroll.period"]
+        srch_domain = [("schedule_id", "=", sched_id)]
+
+        pp_ids = PayrollPeriod.search(srch_domain)
+        latest_period = False
+        for period in pp_ids:
+            if not latest_period:
+                latest_period = period
+                continue
+            if period.date_end > latest_period.date_end:
+                latest_period = period
+
+        return latest_period
+
+    @api.model
+    def try_create_new_period(self):
+        """Try and create pay periods for up to 3 months from now."""
+
+        #
+        # XXX - Someone who cares about DST should update this code to handle it.
+        #
+
+        dtNow = datetime.now()
+        dtNow = datetime.strptime(dtNow.strftime("%Y-%m-1 00:00:00"), OE_DTFORMAT)
+        sched_ids = self.env["hr.payroll.period.schedule"].search([])
+
+        for sched in sched_ids:
+
+            # Add up to three periods from now. If there are not periods in
+            # the database start from the configured initial date.
+            #
+            latest_period = self._get_latest_period(sched.id)
+            loclDTNow = timezone(sched.tz).localize(dtNow, is_dst=False)
+            utcDTFuture = loclDTNow.astimezone(utc) + relativedelta(months=2)
+
+            # 53 because we want to support weekly pay periods (52 weeks/year)
+            for _i in range(53):
+                # Don't go any further than 3 months (including this month)
+                latest_period = self._get_latest_period(sched.id)
+                if latest_period:
+                    utcdtPeriod = utc.localize(latest_period.date_start, is_dst=False)
+                    if utcdtPeriod >= utcDTFuture:
+                        break
+                    sched.add_pay_period()
+                else:
+                    sched.add_pay_period()
diff --git a/payroll_periods/models/hr_payslip.py b/payroll_periods/models/hr_payslip.py
new file mode 100644
index 00000000..e511fbcf
--- /dev/null
+++ b/payroll_periods/models/hr_payslip.py
@@ -0,0 +1,146 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+
+import logging
+
+from odoo import fields, models
+
+from odoo.addons.payroll.models.hr_payslip import (
+    BrowsableObject,
+    InputLine,
+    Payslips,
+    WorkedDays,
+)
+
+_logger = logging.getLogger(__name__)
+
+
+class HrPayslip(models.Model):
+    _name = "hr.payslip"
+    _inherit = "hr.payslip"
+
+    exception_ids = fields.One2many(
+        string="Exceptions",
+        comodel_name="hr.payslip.exception",
+        inverse_name="slip_id",
+        readonly=True,
+    )
+
+    def _get_baselocaldict_hook(self):
+        """
+        @return: returns a dictionary of objects for use in payslip exception rules
+        """
+
+        self.ensure_one()
+        rules_dict = {}
+        worked_days_dict = {}
+        inputs_dict = {}
+        categories_dict = self.get_categories_dict()
+        for worked_days_line in self.worked_days_line_ids:
+            worked_days_dict[worked_days_line.code] = worked_days_line
+        for input_line in self.input_line_ids:
+            inputs_dict[input_line.code] = input_line
+
+        categories = BrowsableObject(self.employee_id.id, categories_dict, self.env)
+        inputs = InputLine(self.employee_id.id, inputs_dict, self.env)
+        worked_days = WorkedDays(self.employee_id.id, worked_days_dict, self.env)
+        payslips = Payslips(self.employee_id.id, self, self.env)
+        rules = BrowsableObject(self.employee_id.id, rules_dict, self.env)
+        # XXX - breakout into separate module
+        # temp_dict = {}
+        # utils_dict = self.get_utilities_dict(self.contract_id, self)
+        # for k, v in utils_dict.iteritems():
+        #     k_obj = BrowsableObject(self.employee_id.id, v, self.env)
+        #     temp_dict.update({k: k_obj})
+        # utils = BrowsableObject(
+        #   self.env, self.env.cr, self.env.user.id, self.employee_id.id, temp_dict)
+
+        return {
+            "categories": categories,
+            "rules": rules,
+            "payslip": payslips,
+            "worked_days": worked_days,
+            "inputs": inputs,
+            # 'utils': utils,
+        }
+
+    def get_categories_dict(self):
+        def _sum_salary_rule_category(_dict, category, amount):
+            if category.parent_id:
+                _dict = _sum_salary_rule_category(_dict, category.parent_id, amount)
+
+            if category.code in _dict.keys():
+                _dict[category.code] += amount
+            else:
+                _dict[category.code] = amount
+
+            return _dict
+
+        self.ensure_one()
+
+        # Get all the rules for all the payroll structures associated
+        # with all the contracts for this employee for this period
+        #
+        contracts = self.employee_id._get_contracts(
+            date_from=self.date_from, date_to=self.date_to
+        )
+        structure_ids = contracts.get_all_structures()
+        tupleList = (
+            self.env["hr.payroll.structure"].browse(structure_ids).get_all_rules()
+        )
+        rule_ids = [i for i, _s in tupleList]
+        rules = self.env["hr.salary.rule"].browse(rule_ids).sorted("sequence")
+
+        # Setup categories dict with all possible categories
+        #
+        categories = {}
+        for rule in rules:
+            if rule.category_id.code not in categories.keys():
+                categories.update({rule.category_id.code: 0})
+        if not categories:
+            _logger.warning(
+                f"Payslip {self.number}: could not get salary rule categories."
+            )
+            return categories
+
+        # Populate the dict with the sum of all the salary lines for that
+        # category and its children
+        for line in self.line_ids:
+            idCateg = line.salary_rule_id.category_id.code
+            prev_amount = 0
+            if not fields.Float.is_zero(categories[idCateg], precision_rounding=2):
+                prev_amount = categories[idCateg]
+            categories = _sum_salary_rule_category(
+                categories, line.salary_rule_id.category_id, line.total - prev_amount
+            )
+
+        return categories
+
+    def compute_sheet(self):
+
+        res = super(HrPayslip, self).compute_sheet()
+
+        sorted_rules = (
+            self.env["hr.payslip.exception.rule"].search([]).sorted("sequence")
+        )
+
+        for payslip in self:
+
+            baselocaldict = payslip._get_baselocaldict_hook()
+            employee = payslip.employee_id
+            contract = employee.contract_id
+            localdict = dict(baselocaldict, employee=employee, contract=contract)
+
+            for rule in sorted_rules:
+                localdict["result"] = False
+                if rule.satisfy_condition(localdict):
+                    val = {
+                        "name": rule.name,
+                        "slip_id": payslip.id,
+                        "rule_id": rule.id,
+                    }
+                    payslip.env["hr.payslip.exception"].create(val)
+
+        return res
diff --git a/payroll_periods/models/hr_payslip_exception.py b/payroll_periods/models/hr_payslip_exception.py
new file mode 100644
index 00000000..e3f97673
--- /dev/null
+++ b/payroll_periods/models/hr_payslip_exception.py
@@ -0,0 +1,32 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import fields, models
+
+
+class HrPayslipException(models.Model):
+
+    _name = "hr.payslip.exception"
+    _description = "Payroll Exception"
+
+    name = fields.Char(required=True, readonly=True)
+    rule_id = fields.Many2one(
+        comodel_name="hr.payslip.exception.rule",
+        string="Rule",
+        ondelete="cascade",
+        readonly=True,
+    )
+    slip_id = fields.Many2one(
+        comodel_name="hr.payslip", string="Pay Slip", ondelete="cascade", readonly=True
+    )
+    severity = fields.Selection(related="rule_id.severity", store=True, readonly=True)
+    ignore = fields.Boolean(string="Ignore", default=False)
+
+    def button_ignore(self):
+
+        self.write({"ignore": True})
+
+    def button_unignore(self):
+
+        self.write({"ignore": False})
diff --git a/payroll_periods/models/hr_payslip_exception_rule.py b/payroll_periods/models/hr_payslip_exception_rule.py
new file mode 100644
index 00000000..4b6f1d30
--- /dev/null
+++ b/payroll_periods/models/hr_payslip_exception_rule.py
@@ -0,0 +1,88 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import _, exceptions, fields, models
+from odoo.tools.safe_eval import safe_eval
+
+
+# This is almost 100% lifted from hr_payroll/hr.salary.rule
+# I ommitted the parts I don't use.
+#
+class HrPayslipExceptionRule(models.Model):
+
+    _name = "hr.payslip.exception.rule"
+    _description = "Rules describing pay slips in an abnormal state"
+    _order = "sequence, code"
+
+    def _generate_condition_str(self):
+        conditions = """
+# Available variables:
+#----------------------
+# payslip: object containing the payslips
+# contract: hr.contract object
+# categories: object containing sum of the amount of all rules belonging to a category
+# worked_days: object containing the computed worked days
+# inputs: object containing the computed inputs
+
+# Note: returned value have to be set in the variable 'result'
+
+result = categories.GROSS.amount > categories.NET.amount"""
+        return conditions
+
+    name = fields.Char(required=True)
+    code = fields.Char(required=True)
+    sequence = fields.Integer(
+        required=True, help="Use to arrange calculation sequence", index=True
+    )
+    active = fields.Boolean(
+        help="If the active field is set to false,"
+        " it will allow you to hide the rule without removing it.",
+        default=True,
+    )
+    company_id = fields.Many2one(
+        string="Company",
+        comodel_name="res.company",
+        default=lambda self: self.env.company,
+    )
+    condition_select = fields.Selection(
+        string="Condition Based on",
+        selection=[("none", "Always True"), ("python", "Python Expression")],
+        default="none",
+        required=True,
+    )
+    condition_python = fields.Text(
+        string="Python Condition",
+        readonly=False,
+        help="The condition that triggers the exception.",
+        default=_generate_condition_str,
+    )
+    severity = fields.Selection(
+        selection=[("low", "Low"), ("medium", "Medium"), ("critical", "Critical")],
+        default="low",
+        required=True,
+    )
+    note = fields.Text(string="Description")
+
+    def satisfy_condition(self, localdict):
+        """
+        @return: returns True if the given rule matches the condition for
+        the given contract. Return False otherwise.
+        """
+
+        self.ensure_one()
+        if self.condition_select == "none":
+            return True
+        else:  # python code
+            try:
+                safe_eval(self.condition_python, localdict, mode="exec", nocopy=True)
+                return "result" in localdict and localdict["result"] or False
+            except Exception:
+                raise exceptions.UserError(
+                    _("Error!")
+                    + "\n"
+                    + _(
+                        "Wrong python condition defined for payroll exception rule %s (%s)."
+                    )
+                    % (self.name, self.code)
+                )
diff --git a/payroll_periods/models/hr_payslip_run.py b/payroll_periods/models/hr_payslip_run.py
new file mode 100644
index 00000000..fbc3fa81
--- /dev/null
+++ b/payroll_periods/models/hr_payslip_run.py
@@ -0,0 +1,200 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import datetime
+
+from pytz import timezone, utc
+
+from odoo import _, api, exceptions, fields, models
+from odoo.tools import (
+    DEFAULT_SERVER_DATE_FORMAT as OE_DFORMAT,
+    DEFAULT_SERVER_DATETIME_FORMAT as OE_DTFORMAT,
+)
+
+
+class HrPayslipRun(models.Model):
+
+    _inherit = "hr.payslip.run"
+
+    period_id = fields.Many2one("hr.payroll.period", "Payroll Period")
+
+    @api.model
+    def _get_confirmed_amendments(self, period_id):
+
+        psa_ids = self.env["hr.payslip.amendment"].search(
+            [
+                ("pay_period_id", "=", period_id),
+                ("state", "in", ["validate"]),
+            ]
+        )
+        return psa_ids
+
+    def recalculate(self):
+
+        Payslip = self.env["hr.payslip"]
+        PayrollPeriod = self.env["hr.payroll.period"]
+
+        run = self.browse(self.ids[0])
+        register_id = run.register_id.id
+        period_id = run.register_id.period_id.id
+        dept_ids = [d.id for d in run.department_ids]
+
+        # Get relevant data from the period object
+        p_data = PayrollPeriod.browse(period_id).read(
+            ["name", "date_start", "date_end", "schedule_id", "register_id", "state"],
+        )
+
+        if p_data["state"] not in ["open", "ended", "locked", "generate"]:
+            raise exceptions.UserError(
+                _("Invalid Action")
+                + "\n"
+                + _("You must lock the payroll period first.")
+            )
+
+        s_data = (
+            self.env["hr.payroll.period.schedule"]
+            .browse(p_data["schedule_id"][0])
+            .read(["annual_pay_periods", "contract_ids", "tz"])
+        )
+
+        # DateTime in db is stored as naive UTC. Convert it to explicit UTC and then convert
+        # that into the time zone of the pay period schedule.
+        #
+        local_tz = timezone(s_data["tz"])
+        utcDTStart = utc.localize(datetime.strptime(p_data["date_start"], OE_DTFORMAT))
+        loclDTStart = utcDTStart.astimezone(local_tz)
+        utcDTEnd = utc.localize(datetime.strptime(p_data["date_end"], OE_DTFORMAT))
+        loclDTEnd = utcDTEnd.astimezone(local_tz)
+
+        # Create payslips for employees, in all departments, that have a contract in this
+        # pay period's schedule
+        # Remove any pre-existing payroll registers
+        for run in self:
+            run_data = run.read(["slip_ids"])
+            Payslip.browse(run_data["slip_ids"]).unlink()
+            self.create_payslip_runs(
+                period_id,
+                run.id,
+                register_id,
+                dept_ids,
+                s_data["contract_ids"],
+                loclDTStart.date(),
+                loclDTEnd.date(),
+                s_data["annual_pay_periods"],
+            )
+
+        return True
+
+    @api.model
+    def create_payslip_runs(
+        self,
+        period_id,
+        run_id,
+        register_id,
+        dept_ids,
+        contract_ids,
+        date_start,
+        date_end,
+        annual_pay_periods,
+    ):
+
+        Contract = self.env["hr.contract"]
+        Department = self.env["hr.department"]
+        Employee = self.env["hr.employee"]
+        PayslipRun = self.env["hr.payslip.run"]
+        PayrollPeriod = self.env["hr.payroll.period"]
+
+        # Get Pay Slip Amendments, Employee ID, and the amount of the amendment
+        #
+        psa_codes = []
+        psa_ids = self._get_confirmed_amendments(period_id)
+        for psa in self.env["hr.payslip.amendment"].browse(psa_ids):
+            psa_codes.append((psa.employee_id.id, psa.input_id.code, psa.amount))
+
+        # Keep track of employees that have already been included
+        seen_ee_ids = []
+
+        # Create payslip batch (run) for each department
+        #
+        for dept in Department.browse(dept_ids):
+            ee_ids = []
+            c_ids = Contract.search(
+                [
+                    ("id", "in", contract_ids),
+                    ("date_start", "<=", date_end.strftime(OE_DFORMAT)),
+                    "|",
+                    ("date_end", "=", False),
+                    ("date_end", ">=", date_start.strftime(OE_DFORMAT)),
+                    "|",
+                    ("department_id.id", "=", dept.id),
+                    ("employee_id.department_id.id", "=", dept.id),
+                ]
+            )
+            c2_ids = Contract.search(
+                [
+                    ("id", "in", contract_ids),
+                    ("date_start", "<=", date_end.strftime(OE_DFORMAT)),
+                    "|",
+                    ("date_end", "=", False),
+                    ("date_end", ">=", date_start.strftime(OE_DFORMAT)),
+                    ("employee_id.status", "in", ["pending_inactive", "inactive"]),
+                    "|",
+                    ("job_id.department_id.id", "=", dept.id),
+                    ("end_job_id.department_id.id", "=", dept.id),
+                ]
+            )
+            for i in c2_ids:
+                if i not in c_ids:
+                    c_ids.append(i)
+
+            c_data = c_ids.read(["employee_id"])
+            for data in c_data:
+                if data["employee_id"][0] not in ee_ids:
+                    ee_ids.append(data["employee_id"][0])
+
+            if len(ee_ids) == 0:
+                continue
+
+            # Alphabetize
+            ee_ids = Employee.search(
+                [
+                    ("id", "in", ee_ids),
+                    "|",
+                    ("active", "=", False),
+                    ("active", "=", True),
+                ],
+            )
+
+            period = PayrollPeriod.browse(period_id)
+            run_res = {
+                "name": dept.complete_name,
+                "date_start": date_start,
+                "date_end": date_end,
+                "register_id": register_id,
+                "journal_id": period.journal_id.id,
+            }
+            PayslipRun.browse(run_id).write(run_res)
+
+            # Create a pay slip for each employee in each department that has
+            # a contract in the pay period schedule of this pay period
+            #
+            slip_ids = []
+            for ee in ee_ids:
+
+                if ee.id in seen_ee_ids:
+                    continue
+
+                # _logger.warning('Employee: %s', ee.name)
+                slip_id = PayrollPeriod.create_payslip(
+                    ee.id, date_start, date_end, psa_codes, run_id, annual_pay_periods
+                )
+                if slip_id is not False:
+                    slip_ids.append(slip_id)
+
+                seen_ee_ids.append(ee.id)
+
+            # Calculate payroll for all the pay slips in this batch (run)
+            slip_ids.compute_sheet()
+
+        return
diff --git a/payroll_periods/readme/CONFIGURE.rst b/payroll_periods/readme/CONFIGURE.rst
new file mode 100644
index 00000000..096f7549
--- /dev/null
+++ b/payroll_periods/readme/CONFIGURE.rst
@@ -0,0 +1,9 @@
+To configure payroll periods, you need to:
+
+#. Go to Payroll -> Configuration -> Payroll Period Schedules
+#. Click on the "Create" button to create a new schedule
+
+To configure payslip exception rules, you need to:
+
+#. Go to Payroll -> Configuration -> Payslip Exception Rules
+#. Click on the "Create" button to create a new rule
diff --git a/payroll_periods/readme/CREDITS.rst b/payroll_periods/readme/CREDITS.rst
new file mode 100644
index 00000000..d264bc7e
--- /dev/null
+++ b/payroll_periods/readme/CREDITS.rst
@@ -0,0 +1 @@
+* Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/payroll_periods/readme/DESCRIPTION.rst b/payroll_periods/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..1c51fe0c
--- /dev/null
+++ b/payroll_periods/readme/DESCRIPTION.rst
@@ -0,0 +1,3 @@
+Easy Payroll Management
+-----------------------
+This module implements a more formal payroll cycle. This cycle is based on payroll period schedules configured by the user. Based on the configured schedule payroll periods are periodicaly created in advance. When a payroll period ends the state is automatically set to 'Ended'. A manual schedule can also be created, in which case the payroll manager must create payroll periods individually.
diff --git a/payroll_periods/readme/HISTORY.rst b/payroll_periods/readme/HISTORY.rst
new file mode 100644
index 00000000..0769a027
--- /dev/null
+++ b/payroll_periods/readme/HISTORY.rst
@@ -0,0 +1,20 @@
+14.0.1.1.4 (2022-08-11)
+~~~~~~~~~~~~~~~~~~~~~~~
+* [FIX] A bug when creating pay slips that didn't change the period's start/end times to the local timezone
+
+14.0.1.1.3 (2022-04-10)
+~~~~~~~~~~~~~~~~~~~~~~~
+* [FIX] Fixed a bug that prevented multiple payslips being computed at once
+
+14.0.1.1.2 (2022-01-12)
+~~~~~~~~~~~~~~~~~~~~~~~
+* [ADD] Allow users to view their own (and subordinates) payslips
+
+14.0.1.1.1 (2021-10-07)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* [ADD] Additional access rules
+* [FIX] Replace broken gtk-icons with font-awesome icons in payslip exception buttons in form view
+* [FIX] Properly spell out Payroll period schedule field name in hr.contract
+* [ADD] Change the severity of the NETZERO payslip exception rule from 'low' to 'critical'
+* [FIX] Payroll Period cron jobs did not complete running because of a programming error
diff --git a/payroll_periods/readme/ROADMAP.rst b/payroll_periods/readme/ROADMAP.rst
new file mode 100644
index 00000000..a0fe6f8f
--- /dev/null
+++ b/payroll_periods/readme/ROADMAP.rst
@@ -0,0 +1,2 @@
+* Currently only monthly schedules are implemented
+* The option to make payment on a business day is not yet implemented
diff --git a/payroll_periods/security/ir.model.access.csv b/payroll_periods/security/ir.model.access.csv
new file mode 100644
index 00000000..2be206ec
--- /dev/null
+++ b/payroll_periods/security/ir.model.access.csv
@@ -0,0 +1,14 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_payroll_period_user,access_hr_payroll_period,model_hr_payroll_period,base.group_user,1,0,0,0
+access_hr_payroll_period_puser,access_hr_payroll_period,model_hr_payroll_period,payroll.group_payroll_user,1,1,0,0
+access_hr_payroll_period_manager,access_hr_payroll_period,model_hr_payroll_period,payroll.group_payroll_manager,1,1,1,1
+access_hr_payroll_period_schedule_user,access_hr_payroll_period_schedule,model_hr_payroll_period_schedule,payroll.group_payroll_user,1,0,0,0
+access_hr_payroll_period_schedule_manager,access_hr_payroll_period_schedule,model_hr_payroll_period_schedule,payroll.group_payroll_manager,1,1,1,1
+access_hr_payslip_exception_hrm,access_hr_payslip_exception,model_hr_payslip_exception,hr.group_hr_manager,1,0,0,0
+access_hr_payslip_exception_rule_hrm,access_hr_payslip_exception_rule,model_hr_payslip_exception_rule,hr.group_hr_manager,1,0,0,0
+access_hr_payslip_exception_pm,access_hr_payslip_exception,model_hr_payslip_exception,payroll.group_payroll_manager,1,1,1,1
+access_hr_payslip_exception_rule_pm,access_hr_payslip_exception_rule,model_hr_payslip_exception_rule,payroll.group_payroll_manager,1,1,1,1
+access_hr_payslip_exception_pu,access_hr_payslip_exception,model_hr_payslip_exception,payroll.group_payroll_user,1,1,1,1
+access_hr_payslip_exception_rule_pu,access_hr_payslip_exception_rule,model_hr_payslip_exception_rule,payroll.group_payroll_user,1,0,0,0
+access_hr_contract_pm,access_hr_contract,model_hr_contract,payroll.group_payroll_manager,1,0,0,0
+access_hr_payslip,hr.payslip,payroll.model_hr_payslip,base.group_user,1,0,0,0
diff --git a/payroll_periods/security/ir_rule.xml b/payroll_periods/security/ir_rule.xml
new file mode 100644
index 00000000..d691726c
--- /dev/null
+++ b/payroll_periods/security/ir_rule.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data noupdate="1">
+
+        <!-- Allow users to access own (and subordinates) Pay Slips -->
+        <record id="property_rule_payslip_own" model="ir.rule">
+            <field name="name">Own and Subordinates: Pay Slips</field>
+            <field name="model_id" ref="payroll.model_hr_payslip" />
+            <field name="domain_force">
+                ['|',('employee_id.user_id', '=', user.id),
+                ('employee_id.department_id.manager_id.user_id', '=', user.id)]
+            </field>
+            <field name="groups" eval="[(4, ref('base.group_user'))]" />
+        </record>
+
+        <!-- Allow HR Officer to access Pay Slips -->
+        <record id="property_rule_payslip_hro" model="ir.rule">
+            <field name="name">HR Officer: Pay Slips</field>
+            <field name="model_id" ref="payroll.model_hr_payslip" />
+            <field name="domain_force">[(1,'=',1)]</field>
+            <field name="groups" eval="[(4,ref('hr.group_hr_user'))]" />
+            <field name="perm_create" eval="False" />
+            <field name="perm_read" eval="True" />
+            <field name="perm_write" eval="False" />
+            <field name="perm_unlink" eval="False" />
+        </record>
+
+    </data>
+</odoo>
diff --git a/payroll_periods/static/description/icon.png b/payroll_periods/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/payroll_periods/static/description/icon.png differ
diff --git a/payroll_periods/static/description/index.html b/payroll_periods/static/description/index.html
new file mode 100644
index 00000000..67e978da
--- /dev/null
+++ b/payroll_periods/static/description/index.html
@@ -0,0 +1,480 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Payroll Period</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="payroll-period">
+<h1 class="title">Payroll Period</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:4c971f072ccfe55f578956e3e55c52d767148f350fbe8325dfd83521b0c5eb1e
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_periods"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<div class="section" id="easy-payroll-management">
+<h1>Easy Payroll Management</h1>
+<p>This module implements a more formal payroll cycle. This cycle is based on payroll period schedules configured by the user. Based on the configured schedule payroll periods are periodicaly created in advance. When a payroll period ends the state is automatically set to ‘Ended’. A manual schedule can also be created, in which case the payroll manager must create payroll periods individually.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#configuration" id="toc-entry-1">Configuration</a></li>
+<li><a class="reference internal" href="#known-issues-roadmap" id="toc-entry-2">Known issues / Roadmap</a></li>
+<li><a class="reference internal" href="#changelog" id="toc-entry-3">Changelog</a><ul>
+<li><a class="reference internal" href="#section-1" id="toc-entry-4">14.0.1.1.4 (2022-08-11)</a></li>
+<li><a class="reference internal" href="#section-2" id="toc-entry-5">14.0.1.1.3 (2022-04-10)</a></li>
+<li><a class="reference internal" href="#section-3" id="toc-entry-6">14.0.1.1.2 (2022-01-12)</a></li>
+<li><a class="reference internal" href="#section-4" id="toc-entry-7">14.0.1.1.1 (2021-10-07)</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-8">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-9">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-10">Authors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-11">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-12">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="configuration">
+<h2><a class="toc-backref" href="#toc-entry-1">Configuration</a></h2>
+<p>To configure payroll periods, you need to:</p>
+<ol class="arabic simple">
+<li>Go to Payroll -&gt; Configuration -&gt; Payroll Period Schedules</li>
+<li>Click on the “Create” button to create a new schedule</li>
+</ol>
+<p>To configure payslip exception rules, you need to:</p>
+<ol class="arabic simple">
+<li>Go to Payroll -&gt; Configuration -&gt; Payslip Exception Rules</li>
+<li>Click on the “Create” button to create a new rule</li>
+</ol>
+</div>
+<div class="section" id="known-issues-roadmap">
+<h2><a class="toc-backref" href="#toc-entry-2">Known issues / Roadmap</a></h2>
+<ul class="simple">
+<li>Currently only monthly schedules are implemented</li>
+<li>The option to make payment on a business day is not yet implemented</li>
+</ul>
+</div>
+<div class="section" id="changelog">
+<h2><a class="toc-backref" href="#toc-entry-3">Changelog</a></h2>
+<div class="section" id="section-1">
+<h3><a class="toc-backref" href="#toc-entry-4">14.0.1.1.4 (2022-08-11)</a></h3>
+<ul class="simple">
+<li>[FIX] A bug when creating pay slips that didn’t change the period’s start/end times to the local timezone</li>
+</ul>
+</div>
+<div class="section" id="section-2">
+<h3><a class="toc-backref" href="#toc-entry-5">14.0.1.1.3 (2022-04-10)</a></h3>
+<ul class="simple">
+<li>[FIX] Fixed a bug that prevented multiple payslips being computed at once</li>
+</ul>
+</div>
+<div class="section" id="section-3">
+<h3><a class="toc-backref" href="#toc-entry-6">14.0.1.1.2 (2022-01-12)</a></h3>
+<ul class="simple">
+<li>[ADD] Allow users to view their own (and subordinates) payslips</li>
+</ul>
+</div>
+<div class="section" id="section-4">
+<h3><a class="toc-backref" href="#toc-entry-7">14.0.1.1.1 (2021-10-07)</a></h3>
+<ul class="simple">
+<li>[ADD] Additional access rules</li>
+<li>[FIX] Replace broken gtk-icons with font-awesome icons in payslip exception buttons in form view</li>
+<li>[FIX] Properly spell out Payroll period schedule field name in hr.contract</li>
+<li>[ADD] Change the severity of the NETZERO payslip exception rule from ‘low’ to ‘critical’</li>
+<li>[FIX] Payroll Period cron jobs did not complete running because of a programming error</li>
+</ul>
+</div>
+</div>
+<div class="section" id="bug-tracker">
+<h2><a class="toc-backref" href="#toc-entry-8">Bug Tracker</a></h2>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_periods%0Aversion:%2014.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">
+<h2><a class="toc-backref" href="#toc-entry-9">Credits</a></h2>
+<div class="section" id="authors">
+<h3><a class="toc-backref" href="#toc-entry-10">Authors</a></h3>
+<ul class="simple">
+<li>TREVI Software</li>
+<li>Michael Telahun Makonnen</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h3><a class="toc-backref" href="#toc-entry-11">Other credits</a></h3>
+<ul class="simple">
+<li>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h3><a class="toc-backref" href="#toc-entry-12">Maintainers</a></h3>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_periods">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/payroll_periods/static/src/img/main_screenshot.png b/payroll_periods/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/payroll_periods/static/src/img/main_screenshot.png differ
diff --git a/payroll_periods/tests/__init__.py b/payroll_periods/tests/__init__.py
new file mode 100644
index 00000000..b641ee63
--- /dev/null
+++ b/payroll_periods/tests/__init__.py
@@ -0,0 +1,6 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import test_hr_payslip
+from . import test_payroll_period
+from . import test_payroll_period_schedule
diff --git a/payroll_periods/tests/test_hr_payslip.py b/payroll_periods/tests/test_hr_payslip.py
new file mode 100644
index 00000000..6dd15c4a
--- /dev/null
+++ b/payroll_periods/tests/test_hr_payslip.py
@@ -0,0 +1,26 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+
+from odoo.tests import Form
+
+from odoo.addons.payroll.tests.common import TestPayslipBase
+
+
+class TestPayslip(TestPayslipBase):
+    def test_get_categories_dict(self):
+
+        # I create an employee Payslip
+        frm = Form(self.Payslip)
+        frm.employee_id = self.richard_emp
+        richard_payslip = frm.save()
+        richard_payslip.compute_sheet()
+        richard_payslip.write({"number": "SLIP/1000"})
+
+        categories = richard_payslip.get_categories_dict()
+        self.assertEqual(
+            categories,
+            {},
+            "Salary rule categories dictionary is empty because "
+            "no contracts have been approved yet",
+        )
diff --git a/payroll_periods/tests/test_payroll_period.py b/payroll_periods/tests/test_payroll_period.py
new file mode 100644
index 00000000..9d972541
--- /dev/null
+++ b/payroll_periods/tests/test_payroll_period.py
@@ -0,0 +1,381 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import date, datetime
+
+from dateutil.relativedelta import relativedelta
+from pytz import timezone, utc
+
+from odoo.exceptions import ValidationError
+from odoo.tests import common, new_test_user
+
+
+class TestSchedule(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super(TestSchedule, cls).setUpClass()
+
+        cls.Period = cls.env["hr.payroll.period"]
+        cls.Schedule = cls.env["hr.payroll.period.schedule"]
+        cls.Run = cls.env["hr.payslip.run"]
+        cls.Payslip = cls.env["hr.payslip"]
+        cls.Exception = cls.env["hr.payslip.exception"]
+        cls.exRuleCrit = cls.env.ref("payroll_periods.payslip_exception_third")
+        cls.eeJohn = cls.env["hr.employee"].create({"name": "EE John"})
+        cls.eeSally = cls.env["hr.employee"].create({"name": "EE Sally"})
+        # Payroll Manager user
+        cls.userPM = new_test_user(
+            cls.env,
+            login="hel",
+            groups="base.group_user,payroll.group_payroll_manager",
+            name="Payroll manager",
+            email="ric@example.com",
+        )
+
+        cls.rule_commision = cls.env["hr.salary.rule"].create(
+            {
+                "name": "Commission",
+                "code": "COMM",
+                "category_id": cls.env.ref("payroll.ALW").id,
+                "sequence": 17,
+                "amount_select": "code",
+                "amount_python_compute": "result = inputs.SALECOM.amount",
+            }
+        )
+        cls.input_commision = cls.env["hr.rule.input"].create(
+            {
+                "name": "Sales Commission Input",
+                "code": "SALECOM",
+                "input_id": cls.rule_commision.id,
+            }
+        )
+
+        cls.pay_struct = cls.env.ref("payroll.structure_base")
+        cls.pay_struct.write({"rule_ids": [(4, cls.rule_commision.id)]})
+
+    def create_payroll_schedule(self, stype=False, initial_date=False):
+        return self.Schedule.create(
+            {
+                "name": "PPS",
+                "tz": "Africa/Addis_Ababa",
+                "type": stype,
+                "initial_period_date": initial_date,
+            }
+        )
+
+    def create_payroll_period(self, sched_id, start, end):
+        return self.Period.create(
+            {
+                "name": "Period 1",
+                "schedule_id": sched_id,
+                "date_start": start,
+                "date_end": end,
+            }
+        )
+
+    def create_contract(
+        self, eid, state, kanban_state, start, end=None, trial_end=None, pps_id=None
+    ):
+        return self.env["hr.contract"].create(
+            {
+                "name": "Contract",
+                "employee_id": eid,
+                "state": state,
+                "kanban_state": kanban_state,
+                "wage": 1,
+                "date_start": start,
+                "trial_date_end": trial_end,
+                "date_end": end,
+                "struct_id": self.pay_struct.id,
+                "pps_id": pps_id,
+            }
+        )
+
+    def apply_end_cron(self):
+        self.env.ref(
+            "payroll_periods.hr_payroll_period_ended_cron"
+        ).method_direct_trigger()
+
+    def test_newly_created_period(self):
+        """Newly created period should be in 'open' state"""
+
+        pps = self.create_payroll_schedule("monthly", date.today())
+        for pp in pps.pay_period_ids:
+            self.assertEqual("open", pp.state)
+
+    def test_state_ended(self):
+        """Ended state should have state: ended"""
+
+        start = datetime(2021, 1, 1)
+        end = datetime(2021, 1, 31, 23, 59, 59)
+        pps = self.create_payroll_schedule("manual", start.date())
+        pp = self.create_payroll_period(pps.id, start, end)
+
+        pp.set_state_ended()
+        self.assertEqual("ended", pp.state)
+
+    def test_cron_set_ended(self):
+        """Set periods past their end date to state: ended"""
+
+        d = date.today() - relativedelta(year=1)
+        start = datetime(d.year, 1, 1)
+        pps = self.create_payroll_schedule("monthly", start.date())
+
+        self.apply_end_cron()
+
+        for pp in pps.pay_period_ids:
+            self.assertEqual("ended", pp.state)
+
+    def test_is_ended(self):
+        """If period is past date_end + max roll-over hours it is ended"""
+
+        dt = datetime.now()
+        dtStart = dt - relativedelta(days=10)
+        dtEnd = dt - relativedelta(hours=6, seconds=1)
+        pps = self.create_payroll_schedule("manual", dtStart.date())
+        pp = self.create_payroll_period(pps.id, dtStart, dtEnd)
+
+        self.assertTrue(pp.is_ended())
+
+    def test_is_not_ended(self):
+        """If period is *NOT* past date_end + max roll-over hours it has not ended"""
+
+        dt = datetime.now()
+        dtStart = dt - relativedelta(days=10)
+        dtEnd = dt - relativedelta(hours=5, seconds=55)
+        pps = self.create_payroll_schedule("manual", dtStart.date())
+        pp = self.create_payroll_period(pps.id, dtStart, dtEnd)
+
+        self.assertFalse(pp.is_ended())
+
+    def test_state_payment(self):
+        """Periods in payment stage should have state: ended"""
+
+        start = datetime(2021, 1, 1)
+        end = datetime(2021, 1, 31, 23, 59, 59)
+        pps = self.create_payroll_schedule("manual", start.date())
+        pp = self.create_payroll_period(pps.id, start, end)
+
+        pp.set_state_payment()
+        self.assertEqual("payment", pp.state)
+
+    def test_state_payment_with_unignored_exceptions(self):
+        """Periods going to payment stage with *UN*-ignored exceptions should *fail*"""
+
+        start = datetime(2021, 1, 1)
+        end = datetime(2021, 1, 31, 23, 59, 59)
+        pps = self.create_payroll_schedule("manual", start.date())
+        pp = self.create_payroll_period(pps.id, start, end)
+        run = self.Run.create(
+            {
+                "name": "Run A",
+                "date_start": start.date(),
+                "date_end": end.date(),
+                "period_id": pp.id,
+            }
+        )
+        slip = self.Payslip.create(
+            {
+                "name": "A Payslip",
+                "employee_id": self.eeJohn.id,
+                "payslip_run_id": run.id,
+            }
+        )
+        self.Exception.create(
+            {
+                "name": "Net salary less than 1/3 of GROSS",
+                "rule_id": self.exRuleCrit.id,
+                "slip_id": slip.id,
+            }
+        )
+
+        self.assertEqual(1, len(pp.exception_ids))
+        with self.assertRaises(ValidationError):
+            pp.set_state_payment()
+
+    def test_state_payment_with_ignored_exceptions(self):
+        """Periods going to payment stage with ignored exceptions should *succeed*"""
+
+        start = datetime(2021, 1, 1)
+        end = datetime(2021, 1, 31, 23, 59, 59)
+        pps = self.create_payroll_schedule("manual", start.date())
+        pp = self.create_payroll_period(pps.id, start, end)
+        run = self.Run.create(
+            {
+                "name": "Run A",
+                "date_start": start.date(),
+                "date_end": end.date(),
+                "period_id": pp.id,
+            }
+        )
+        slip = self.Payslip.create(
+            {
+                "name": "A Payslip",
+                "employee_id": self.eeJohn.id,
+                "payslip_run_id": run.id,
+            }
+        )
+        self.Exception.create(
+            {
+                "name": "Net salary less than 1/3 of GROSS",
+                "rule_id": self.exRuleCrit.id,
+                "slip_id": slip.id,
+                "ignore": True,
+            }
+        )
+
+        self.assertEqual(1, len(pp.exception_ids))
+        try:
+            pp.set_state_payment()
+        except ValidationError:
+            self.fail("An unexpected Exception was raised")
+        self.assertEqual("payment", pp.state)
+
+    def test_create_payslip_dates(self):
+        """Payslip date_from -> date_to = same as payroll period adj. for tz"""
+
+        start = datetime(2021, 1, 1)
+        end = datetime(2021, 1, 31, 23, 59, 59)
+        self.create_contract(self.eeJohn.id, "draft", "done", start)
+        pps = self.create_payroll_schedule("manual", start.date())
+        tz_local = timezone(pps.tz)
+        tz_start = tz_local.localize(start, is_dst=False)
+        tz_end = tz_local.localize(end, is_dst=False)
+        utc_start = tz_start.astimezone(utc)
+        utc_end = tz_end.astimezone(utc)
+        pp = self.create_payroll_period(
+            pps.id, utc_start.replace(tzinfo=None), utc_end.replace(tzinfo=None)
+        )
+
+        run = self.Run.create(
+            {
+                "name": "Run A",
+                "date_start": start.date(),
+                "date_end": end.date(),
+                "period_id": pp.id,
+            }
+        )
+        slip = pp.create_payslip(self.eeJohn.id, run_id=run.id)
+
+        self.assertEqual(pp.date_start.date(), date(2020, 12, 31))
+        self.assertEqual(pp.date_end.date(), date(2021, 1, 31))
+        self.assertEqual(slip.date_from, date(2021, 1, 1))
+        self.assertEqual(slip.date_to, date(2021, 1, 31))
+
+    def test_create_payslip_dates_two_contract(self):
+        """Payslip with 2 contracts: date_from -> date_to = sum of both"""
+
+        start = datetime(2021, 1, 1)
+        end = datetime(2021, 1, 31, 23, 59, 59)
+        c2End = start + relativedelta(days=20)
+        self.create_contract(
+            self.eeJohn.id, "close", "normal", start, start + relativedelta(days=10)
+        )
+        self.create_contract(
+            self.eeJohn.id, "draft", "done", start + relativedelta(days=11), c2End
+        )
+        pps = self.create_payroll_schedule("manual", start.date())
+        pp = self.create_payroll_period(pps.id, start, end)
+        run = self.Run.create(
+            {
+                "name": "Run A",
+                "date_start": start.date(),
+                "date_end": end.date(),
+                "period_id": pp.id,
+            }
+        )
+        slip = pp.create_payslip(self.eeJohn.id, run_id=run.id)
+
+        self.assertEqual(pp.date_start.date(), slip.date_from)
+        self.assertEqual(c2End.date(), slip.date_to)
+
+    def test_payslip_input_line(self):
+        """After creation the payslip contains configured input lines"""
+
+        start = datetime(2021, 1, 1)
+        end = datetime(2021, 1, 31, 23, 59, 59)
+        pps = self.create_payroll_schedule("manual", start.date())
+        cc = self.create_contract(
+            self.eeJohn.id, "draft", "done", start.date(), pps_id=pps.id
+        )
+        cc.signal_confirm()
+        pp = self.create_payroll_period(pps.id, start, end)
+        run = self.Run.create(
+            {
+                "name": "Run A",
+                "date_start": start.date(),
+                "date_end": end.date(),
+                "period_id": pp.id,
+            }
+        )
+        self.assertEqual("open", cc.state)
+        self.assertIn(self.rule_commision, cc.struct_id.rule_ids)
+        slip = pp.create_payslip(self.eeJohn.id, run_id=run.id)
+
+        payslip_input = self.env["hr.payslip.input"].search(
+            [("payslip_id", "=", slip.id)]
+        )
+        self.assertEqual(cc, slip.contract_id)
+        self.assertEqual(1, len(payslip_input))
+        self.assertIn("SALECOM", slip.input_line_ids.mapped("code"))
+
+    def test_rerun_payslip(self):
+        """Re-running the payslip should create a new payslip and re-compute it"""
+
+        start = datetime(2021, 1, 1)
+        end = datetime(2021, 1, 31, 23, 59, 59)
+        pps = self.create_payroll_schedule("manual", start.date())
+        cc = self.create_contract(
+            self.eeJohn.id, "draft", "done", start.date(), pps_id=pps.id
+        )
+        cc.signal_confirm()
+        pp = self.create_payroll_period(pps.id, start, end)
+        run = self.Run.create(
+            {
+                "name": "Run A",
+                "date_start": start.date(),
+                "date_end": end.date(),
+                "period_id": pp.id,
+            }
+        )
+        slip = pp.create_payslip(self.eeJohn.id, run_id=run.id)
+        slip.compute_sheet()
+        id_old = slip.id
+        self.assertEqual(1, slip.get_salary_line_total("NET"))
+
+        slip.action_payslip_cancel()
+        slip = pp.rerun_payslip(slip)
+
+        self.assertEqual(1, slip.get_salary_line_total("NET"))
+        self.assertNotEqual(id_old, slip.id)
+
+    def test_run_multiple_payslips(self):
+        """Running more than one payslip at a time"""
+
+        start = datetime(2021, 1, 1)
+        end = datetime(2021, 1, 31, 23, 59, 59)
+        pps = self.create_payroll_schedule("manual", start.date())
+        cc = self.create_contract(
+            self.eeJohn.id, "draft", "done", start.date(), pps_id=pps.id
+        )
+        cc.signal_confirm()
+        cc2 = self.create_contract(
+            self.eeSally.id, "draft", "done", start.date(), pps_id=pps.id
+        )
+        cc2.signal_confirm()
+        pp = self.create_payroll_period(pps.id, start, end)
+        run = self.Run.create(
+            {
+                "name": "Run A",
+                "date_start": start.date(),
+                "date_end": end.date(),
+                "period_id": pp.id,
+            }
+        )
+        slip = pp.create_payslip(self.eeJohn.id, run_id=run.id)
+        slip2 = pp.create_payslip(self.eeSally.id, run_id=run.id)
+        slips = slip + slip2
+        slips.compute_sheet()
+
+        self.assertEqual(1, slip.get_salary_line_total("NET"))
+        self.assertEqual(1, slip2.get_salary_line_total("NET"))
diff --git a/payroll_periods/tests/test_payroll_period_schedule.py b/payroll_periods/tests/test_payroll_period_schedule.py
new file mode 100644
index 00000000..f3741beb
--- /dev/null
+++ b/payroll_periods/tests/test_payroll_period_schedule.py
@@ -0,0 +1,117 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import date, datetime
+
+from dateutil.relativedelta import relativedelta
+from pytz import timezone, utc
+
+from odoo.tests import common, new_test_user
+
+from ..models.hr_payroll_period_schedule import add_months
+
+
+class TestSchedule(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super(TestSchedule, cls).setUpClass()
+
+        cls.Period = cls.env["hr.payroll.period"]
+        cls.Schedule = cls.env["hr.payroll.period.schedule"]
+        # Payroll Manager user
+        cls.userPM = new_test_user(
+            cls.env,
+            login="hel",
+            groups="base.group_user,payroll.group_payroll_manager",
+            name="Payroll manager",
+            email="ric@example.com",
+        )
+
+    def create_payroll_schedule(self, stype=False, initial_date=False):
+        return self.Schedule.create(
+            {
+                "name": "PPS",
+                "tz": "Africa/Addis_Ababa",
+                "type": stype,
+                "initial_period_date": initial_date,
+            }
+        )
+
+    def apply_create_cron(self):
+        self.env.ref(
+            "payroll_periods.hr_payroll_period_create_cron"
+        ).method_direct_trigger()
+
+    def test_annual_period_no(self):
+        """There are 12 annual periods for monthly schedule"""
+
+        pps = self.create_payroll_schedule("monthly", date.today())
+        self.assertEqual(12, pps.annual_pay_periods)
+
+    def test_initial_periods_creation_button(self):
+        """One period is created from initial start date"""
+
+        pps = self.create_payroll_schedule("monthly", date(2021, 1, 1))
+        pps.button_add_pay_periods()
+
+        listPP = self.Period.search([])
+        self.assertEqual(1, len(listPP))
+        self.assertEqual("2021/01 January", listPP[0].name)
+        # utc is -3:00 hours
+        self.assertEqual(datetime(2020, 12, 31, 21, 0, 0), listPP[0].date_start)
+        self.assertEqual(datetime(2021, 1, 31, 20, 59, 59), listPP[0].date_end)
+
+    def convert_local_to_utc(self, tz_str, lyear, lmonth, lday, lh=0, lm=0, ls=0):
+
+        ltz = timezone(tz_str)
+        ltzdtToday = ltz.localize(
+            datetime(lyear, lmonth, lday, lh, lm, ls), is_dst=None
+        )
+        utcdtToday = ltzdtToday.astimezone(utc)
+        return utcdtToday.replace(tzinfo=None)
+
+    def test_initial_periods_creation_cron(self):
+        """Three periods are created from initial start date"""
+
+        today = date.today()
+        today = date(today.year, today.month, 1)
+
+        # Africa/Addis_Ababa is +3:00 UTC (00:00:00 -> 21:00:00)
+        #
+        mo1 = self.convert_local_to_utc(
+            "Africa/Addis_Ababa", today.year, today.month, 1
+        )
+        mo1end = add_months(today, 1) - relativedelta(days=1)
+        mo1end = self.convert_local_to_utc(
+            "Africa/Addis_Ababa", mo1end.year, mo1end.month, mo1end.day, 23, 59, 59
+        )
+
+        mo2 = add_months(today, 1)
+        mo2 = self.convert_local_to_utc("Africa/Addis_Ababa", mo2.year, mo2.month, 1)
+
+        mo2end = add_months(today, 2) - relativedelta(days=1)
+        mo2end = self.convert_local_to_utc(
+            "Africa/Addis_Ababa", mo2end.year, mo2end.month, mo2end.day, 23, 59, 59
+        )
+
+        mo3 = add_months(today, 2)
+        mo3 = self.convert_local_to_utc("Africa/Addis_Ababa", mo3.year, mo3.month, 1)
+
+        mo3end = add_months(today, 3) - relativedelta(days=1)
+        mo3end = self.convert_local_to_utc(
+            "Africa/Addis_Ababa", mo3end.year, mo3end.month, mo3end.day, 23, 59, 59
+        )
+
+        # Create schedule and run cron to create the first periods
+        pps = self.create_payroll_schedule("monthly", today)
+        self.apply_create_cron()
+
+        listPP = self.Period.search([]).filtered(lambda p: p.schedule_id == pps)
+        self.assertEqual(3, len(listPP))
+
+        self.assertEqual(mo1, listPP[0].date_start)
+        self.assertEqual(mo1end, listPP[0].date_end)
+        self.assertEqual(mo2, listPP[1].date_start)
+        self.assertEqual(mo2end, listPP[1].date_end)
+        self.assertEqual(mo3, listPP[2].date_start)
+        self.assertEqual(mo3end, listPP[2].date_end)
diff --git a/payroll_periods/views/hr_contract_view.xml b/payroll_periods/views/hr_contract_view.xml
new file mode 100644
index 00000000..9c3d116d
--- /dev/null
+++ b/payroll_periods/views/hr_contract_view.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+
+        <!-- Employment Contracts -->
+        <record id="view_hr_contract_form_inherit" model="ir.ui.view">
+            <field name="name">hr.contract.form.inherit.payrollperiod</field>
+            <field name="model">hr.contract</field>
+            <field name="inherit_id" ref="payroll.hr_contract_view_form" />
+            <field name="priority">99</field>
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="//field[@name='struct_id']" position="after">
+                        <field name="pps_id" required="1" />
+                    </xpath>
+                    <xpath expr="//field[@name='schedule_pay']" position="replace" />
+                </data>
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/payroll_periods/views/hr_payroll_period_schedule_view.xml b/payroll_periods/views/hr_payroll_period_schedule_view.xml
new file mode 100644
index 00000000..32773c27
--- /dev/null
+++ b/payroll_periods/views/hr_payroll_period_schedule_view.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+
+        <!-- Payroll Period Schedule -->
+        <record id="view_payperiod_schedule_tree" model="ir.ui.view">
+            <field name="name">hr.payroll.period.schedule.tree</field>
+            <field name="model">hr.payroll.period.schedule</field>
+            <field name="arch" type="xml">
+                <tree string="Pay Period Schedules">
+                    <field name="name" />
+                    <field name="type" />
+                    <field name="tz" />
+                    <field name="ot_week_startday" />
+                    <field name="ot_max_rollover_hours" />
+                    <field name="ot_max_rollover_gap" />
+                    <field name="active" />
+                </tree>
+            </field>
+        </record>
+        <record id="view_payperiod_schedule_form" model="ir.ui.view">
+            <field name="name">hr.payroll.period.schedule.form</field>
+            <field name="model">hr.payroll.period.schedule</field>
+            <field name="arch" type="xml">
+                <form string="Pay Period Schedule" version="7.0">
+                    <group>
+                        <group>
+                            <field name="name" />
+                            <field name="tz" />
+                            <field name="ot_week_startday" />
+                            <field name="ot_max_rollover_hours" />
+                            <field name="ot_max_rollover_gap" />
+                            <field name="paydate_biz_day" />
+                        </group>
+                        <group>
+                            <field name="type" />
+                            <field
+                                name="mo_firstday"
+                                attrs="{'invisible': [('type','!=','monthly')]}"
+                            />
+                            <field
+                                name="mo_paydate"
+                                attrs="{'invisible': [('type','!=','monthly')]}"
+                            />
+                            <newline />
+                            <field
+                                name="initial_period_date"
+                                attrs="{'invisible': [('type','!=','monthly')], 'required': [('type','=','monthly')]}"
+                            />
+                            <field name="active" />
+                            <field
+                                name="company_id"
+                                groups="base.group_multi_company"
+                            />
+                        </group>
+                    </group>
+                    <group string="Pay Periods" colspan="4" col="1">
+                        <button
+                            name="button_add_pay_periods"
+                            type="object"
+                            string="Add"
+                        />
+                        <field name="pay_period_ids" nolabel="1" />
+                    </group>
+                    <group string="Contracts" colspan="4" col="1">
+                        <field name="contract_ids" nolabel="1" />
+                    </group>
+                </form>
+            </field>
+        </record>
+        <record id="open_payroll_period_schedule_view" model="ir.actions.act_window">
+            <field name="name">Payroll Period Schedules</field>
+            <field name="res_model">hr.payroll.period.schedule</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem
+            action="open_payroll_period_schedule_view"
+            id="menu_payroll_period_schedule_view"
+            parent="payroll.payroll_menu_configuration"
+            groups="payroll.group_payroll_manager"
+            sequence="20"
+        />
+
+    </data>
+</odoo>
diff --git a/payroll_periods/views/hr_payroll_period_view.xml b/payroll_periods/views/hr_payroll_period_view.xml
new file mode 100644
index 00000000..78429eb2
--- /dev/null
+++ b/payroll_periods/views/hr_payroll_period_view.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+
+        <!-- Payroll Period -->
+        <record id="view_payroll_period_filter" model="ir.ui.view">
+            <field name="name">Payroll Periods</field>
+            <field name="model">hr.payroll.period</field>
+            <field name="arch" type="xml">
+                <search string="Payroll Periods">
+                    <field name="name" />
+                    <field name="company_id" groups="base.group_multi_company" />
+                    <separator />
+                    <filter
+                        name="is_ended"
+                        string="Ended Periods"
+                        domain="[('state','in',['ended','locked','generate','payment'])]"
+                    />
+                    <group expand="0" string="Group By...">
+                        <filter
+                            name="group_company"
+                            string="Company"
+                            icon="terp-go-home"
+                            domain="[]"
+                            context="{'group_by':'company_id'}"
+                            groups="base.group_multi_company"
+                        />
+                    </group>
+                </search>
+            </field>
+        </record>
+        <record id="view_payroll_period_tree" model="ir.ui.view">
+            <field name="name">hr.payroll.period.tree</field>
+            <field name="model">hr.payroll.period</field>
+            <field name="arch" type="xml">
+                <tree string="Payroll Periods">
+                    <field name="name" />
+                    <field name="period_name" />
+                    <field name="date_start" />
+                    <field name="date_end" />
+                    <field name="state" />
+                    <field name="company_id" groups="base.group_multi_company" />
+                </tree>
+            </field>
+        </record>
+        <record id="view_payroll_period_form" model="ir.ui.view">
+            <field name="name">hr.payroll.period.form</field>
+            <field name="model">hr.payroll.period</field>
+            <field name="arch" type="xml">
+                <form string="Payroll Period">
+                    <sheet>
+                        <header>
+                            <button
+                                name="set_state_payment"
+                                type="object"
+                                string="Start Payment"
+                                class="oe_highlight"
+                                states="ended,locked,generate"
+                                confirm="Are you sure? Once you start payment you cannot make any more modifications to the pay slip."
+                            />
+                            <field name="state" widget="statusbar" />
+                        </header>
+                        <group name="row1">
+                            <group>
+                                <field name="schedule_id" />
+                                <label for="date_start" string="Interval" />
+                                <div>
+                                    <field
+                                        name="date_start"
+                                        nolabel="1"
+                                        class="oe_inline"
+                                    /> -
+                                    <field
+                                        name="date_end"
+                                        nolabel="1"
+                                        class="oe_inline"
+                                    />
+                                </div>
+                                <field name="name" />
+                                <newline />
+                                <field
+                                    name="company_id"
+                                    groups="base.group_multi_company"
+                                />
+                            </group>
+                            <group>
+                                <field name="period_name" />
+                            </group>
+                        </group>
+                        <notebook>
+                            <page name="general" string="General">
+                                <group name="exceptions" string="Pay Slip Exceptions">
+                                    <field
+                                        name="exception_ids"
+                                        nolabel="1"
+                                        options="{'reload_on_button': true}"
+                                    >
+                                        <tree
+                                            string="Payroll Exceptions in Period"
+                                            default_order="severity"
+                                            colors="red:severity == 'critical';orange:severity == 'high';blue:severity == 'medium'"
+                                        >
+                                            <field name="name" />
+                                            <field name="slip_id" />
+                                            <field name="severity" />
+                                            <field name="ignore" />
+                                            <button
+                                                name="button_ignore"
+                                                type="object"
+                                                icon="fa-check"
+                                                attrs="{'invisible': ['|', ('severity', '!=', 'critical'), '&amp;', ('severity', '=', 'critical'), ('ignore', '=', True)]}"
+                                            />
+                                            <button
+                                                name="button_unignore"
+                                                type="object"
+                                                icon="fa-close"
+                                                attrs="{'invisible': ['|', ('severity', '!=', 'critical'), '&amp;', ('severity', '=', 'critical'), ('ignore', '=', False)]}"
+                                            />
+                                        </tree>
+                                    </field>
+                                </group>
+                            </page>
+                            <page name="slips" string="Payslips">
+                                <group string="Payslip Batches">
+                                    <field name="run_ids" nolabel="1" />
+                                </group>
+                            </page>
+                        </notebook>
+                        <div class="oe_chatter">
+                            <field
+                                name="message_follower_ids"
+                                widget="mail_followers"
+                            />
+                            <field name="activity_ids" widget="mail_activity" />
+                            <field name="message_ids" widget="mail_thread" />
+                        </div>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+        <record id="open_payroll_period_view" model="ir.actions.act_window">
+            <field name="name">Payroll Periods</field>
+            <field name="res_model">hr.payroll.period</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'search_default_is_ended': 1}</field>
+            <field name="help" type="html">
+                <p
+                >                There are no current pay periods that are past their end date.              </p>
+            </field>
+        </record>
+        <menuitem
+            action="open_payroll_period_view"
+            id="menu_payroll_period_view"
+            parent="payroll.payroll_menu_root"
+            groups="payroll.group_payroll_user,hr.group_hr_manager"
+            sequence="40"
+        />
+    </data>
+</odoo>
diff --git a/payroll_periods/views/hr_payslip_exception_rule_view.xml b/payroll_periods/views/hr_payslip_exception_rule_view.xml
new file mode 100644
index 00000000..10288f7d
--- /dev/null
+++ b/payroll_periods/views/hr_payslip_exception_rule_view.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+
+        <!-- Payroll Exception Rule -->
+        <record id="view_exception_rule_tree" model="ir.ui.view">
+            <field name="name">hr.payslip.exception.rule.tree</field>
+            <field name="model">hr.payslip.exception.rule</field>
+            <field name="arch" type="xml">
+                <tree string="Payroll Exception Rules">
+                    <field name="name" />
+                    <field name="code" />
+                    <field name="severity" />
+                    <field name="sequence" />
+                </tree>
+            </field>
+        </record>
+        <record id="view_exception_rule_form" model="ir.ui.view">
+            <field name="name">hr.payslip.exception.rule.form</field>
+            <field name="model">hr.payslip.exception.rule</field>
+            <field name="arch" type="xml">
+                <form string="Payroll Exception Rule" version="7.0">
+                    <div class="oe_title">
+                        <label for="name" class="oe_edit_only" />
+                        <h1>
+                            <field name="name" />
+                        </h1>
+                        <label for="code" class="oe_edit_only" string="Code" />
+                        <h2>
+                            <field name="code" />
+                        </h2>
+                    </div>
+                    <group>
+                        <group>
+                            <field name="severity" />
+                            <field name="condition_select" />
+                        </group>
+                        <group>
+                            <field name="active" />
+                            <field name="sequence" />
+                            <field
+                                name="company_id"
+                                widget="selection"
+                                groups="base.group_multi_company"
+                            />
+                        </group>
+                    </group>
+                    <group string="Conditions" colspan="4">
+                        <field
+                            name="condition_python"
+                            nolabel="1"
+                            colspan="4"
+                            attrs="{'invisible':[('condition_select','&lt;&gt;','python')], 'required': [('condition_select','=','python')]}"
+                        />
+                    </group>
+                    <group string="Note" colspan="4">
+                        <field name="note" nolabel="1" />
+                    </group>
+                </form>
+            </field>
+        </record>
+        <record id="open_payroll_exception_rule_view" model="ir.actions.act_window">
+            <field name="name">Payroll Exception Rules</field>
+            <field name="res_model">hr.payslip.exception.rule</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem
+            action="open_payroll_exception_rule_view"
+            id="menu_payroll_exception_rule_view"
+            parent="payroll.payroll_menu_configuration"
+            groups="payroll.group_payroll_manager"
+            sequence="30"
+        />
+
+    </data>
+</odoo>
diff --git a/payroll_periods/views/hr_payslip_exception_view.xml b/payroll_periods/views/hr_payslip_exception_view.xml
new file mode 100644
index 00000000..2760eabb
--- /dev/null
+++ b/payroll_periods/views/hr_payslip_exception_view.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+
+        <!-- Payroll Exception -->
+        <record id="view_payroll_exception_tree" model="ir.ui.view">
+            <field name="name">hr.payslip.exception.tree</field>
+            <field name="model">hr.payslip.exception</field>
+            <field name="arch" type="xml">
+                <tree
+                    string="Payroll Exceptions"
+                    decoration-danger="severity == 'critical'"
+                    decoration-warning="severity == 'medium'"
+                >
+                        <field name="name" />
+                        <field name="slip_id" />
+                        <field name="severity" />
+                        <field name="ignore" />
+                </tree>
+            </field>
+        </record>
+        <record id="view_payroll_exception_form" model="ir.ui.view">
+            <field name="name">hr.payslip.exception.form</field>
+            <field name="model">hr.payslip.exception</field>
+            <field name="arch" type="xml">
+                <form string="Payroll Exception">
+                    <sheet>
+                        <div class="oe_title">
+                            <label for="name" class="oe_edit_only" />
+                            <h1>
+                                <field name="name" />
+                            </h1>
+                        </div>
+                        <group>
+                            <group>
+                                <field name="rule_id" />
+                                <field name="slip_id" />
+                                <field name="severity" />
+                                <field name="ignore" />
+                            </group>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+        <record id="open_payroll_exception_view" model="ir.actions.act_window">
+            <field name="name">Exceptions</field>
+            <field name="res_model">hr.payslip.exception</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem
+            action="open_payroll_exception_view"
+            id="menu_payroll_exception_view"
+            parent="payroll.payroll_menu_root"
+            groups="payroll.group_payroll_user"
+            sequence="40"
+        />
+
+    </data>
+</odoo>
diff --git a/payroll_periods/views/hr_payslip_view.xml b/payroll_periods/views/hr_payslip_view.xml
new file mode 100644
index 00000000..160d0c52
--- /dev/null
+++ b/payroll_periods/views/hr_payslip_view.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+
+        <!-- Pay Slips -->
+        <record id="view_payslip_form" model="ir.ui.view">
+            <field name="name">hr.payslip.form.exception</field>
+            <field name="model">hr.payslip</field>
+            <field name="inherit_id" ref="payroll.hr_payslip_view_form" />
+            <field name="arch" type="xml">
+                <xpath expr="//notebook" position="inside">
+                    <page name="exceptions" string="Exceptions">
+                        <group name="exceptions" string="Payroll Exceptions">
+                            <field name="exception_ids" nolabel="1">
+                                <tree
+                                    string="Payroll Exceptions"
+                                    decoration-danger="severity == 'critical'"
+                                    decoration-warning="severity == 'medium'"
+                                >
+                                    <field name="name" />
+                                    <field name="severity" />
+                                </tree>
+                            </field>
+                        </group>
+                    </page>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/payroll_policy_absence/README.rst b/payroll_policy_absence/README.rst
new file mode 100644
index 00000000..3eb440c3
--- /dev/null
+++ b/payroll_policy_absence/README.rst
@@ -0,0 +1,65 @@
+======================
+Payroll Absence Policy
+======================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:f01ae8364d604757d347e6571d019372216fe53a660ff1f55135e467b2bbc3c2
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_policy_absence
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+Define Absence Policies
+========================
+Define properties of an absence policy, such as:
+    * Type (paid, unpaid)
+    * Rate (multiplier of base wage)
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_policy_absence%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+* Michael Telahun Makonnen
+
+Other credits
+~~~~~~~~~~~~~
+
+* Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_policy_absence>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/payroll_policy_absence/__init__.py b/payroll_policy_absence/__init__.py
new file mode 100644
index 00000000..1cc5116e
--- /dev/null
+++ b/payroll_policy_absence/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import models
diff --git a/payroll_policy_absence/__manifest__.py b/payroll_policy_absence/__manifest__.py
new file mode 100644
index 00000000..196414f6
--- /dev/null
+++ b/payroll_policy_absence/__manifest__.py
@@ -0,0 +1,23 @@
+# Copyright (C) 2021 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    "name": "Payroll Absence Policy",
+    "summary": "Define properties of an employee absense policy for payroll.",
+    "version": "15.0.1.0.0",
+    "category": "Payroll",
+    "author": "TREVI Software, Michael Telahun Makonnen",
+    "license": "AGPL-3",
+    "images": ["static/src/img/main_screenshot.png"],
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "hr_holidays",
+        "payroll_policy_group",
+    ],
+    "data": [
+        "security/ir.model.access.csv",
+        "views/hr_policy_absence_view.xml",
+    ],
+    "installable": True,
+}
diff --git a/payroll_policy_absence/i18n/payroll_policy_absence.pot b/payroll_policy_absence/i18n/payroll_policy_absence.pot
new file mode 100644
index 00000000..34861681
--- /dev/null
+++ b/payroll_policy_absence/i18n/payroll_policy_absence.pot
@@ -0,0 +1,179 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* payroll_policy_absence
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: payroll_policy_absence
+#: model_terms:ir.ui.view,arch_db:payroll_policy_absence.absence_policy_line_tree_view
+#: model_terms:ir.ui.view,arch_db:payroll_policy_absence.absence_policy_view_form
+msgid "Absence Lines"
+msgstr ""
+
+#. module: payroll_policy_absence
+#: model:ir.actions.act_window,name:payroll_policy_absence.open_absence_policy
+#: model:ir.ui.menu,name:payroll_policy_absence.menu_hr_absence_policy
+#: model_terms:ir.ui.view,arch_db:payroll_policy_absence.absence_policy_view_tree
+msgid "Absence Policies"
+msgstr ""
+
+#. module: payroll_policy_absence
+#: model:ir.model.fields,field_description:payroll_policy_absence.field_hr_policy_group__absence_policy_ids
+#: model_terms:ir.ui.view,arch_db:payroll_policy_absence.absence_policy_line_form_view
+#: model_terms:ir.ui.view,arch_db:payroll_policy_absence.absence_policy_view_form
+msgid "Absence Policy"
+msgstr ""
+
+#. module: payroll_policy_absence
+#: model:ir.model,name:payroll_policy_absence.model_hr_policy_absence
+msgid "Absence payroll policy"
+msgstr ""
+
+#. module: payroll_policy_absence
+#: model:ir.model,name:payroll_policy_absence.model_hr_policy_line_absence
+msgid "Absence payroll policy line"
+msgstr ""
+
+#. module: payroll_policy_absence
+#: model:ir.model.fields,field_description:payroll_policy_absence.field_hr_policy_line_absence__use_awol
+msgid "Absent Without Leave"
+msgstr ""
+
+#. module: payroll_policy_absence
+#: model:ir.model.fields,field_description:payroll_policy_absence.field_hr_policy_line_absence__code
+msgid "Code"
+msgstr ""
+
+#. module: payroll_policy_absence
+#: model:ir.model.fields,field_description:payroll_policy_absence.field_hr_policy_absence__create_uid
+#: model:ir.model.fields,field_description:payroll_policy_absence.field_hr_policy_line_absence__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: payroll_policy_absence
+#: model:ir.model.fields,field_description:payroll_policy_absence.field_hr_policy_absence__create_date
+#: model:ir.model.fields,field_description:payroll_policy_absence.field_hr_policy_line_absence__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: payroll_policy_absence
+#: model:ir.model.fields,help:payroll_policy_absence.field_hr_policy_line_absence__type
+msgid ""
+"Determines how the absence will be treated in payroll. The 'Dock Salary' "
+"type will deduct money (usefull for salaried employees)."
+msgstr ""
+
+#. module: payroll_policy_absence
+#: model:ir.model.fields,field_description:payroll_policy_absence.field_hr_policy_absence__display_name
+#: model:ir.model.fields,field_description:payroll_policy_absence.field_hr_policy_group__display_name
+#: model:ir.model.fields,field_description:payroll_policy_absence.field_hr_policy_line_absence__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: payroll_policy_absence
+#: model:ir.model.fields.selection,name:payroll_policy_absence.selection__hr_policy_line_absence__type__dock
+msgid "Dock"
+msgstr ""
+
+#. module: payroll_policy_absence
+#: model:ir.model.fields,field_description:payroll_policy_absence.field_hr_policy_absence__date
+msgid "Effective Date"
+msgstr ""
+
+#. module: payroll_policy_absence
+#: model:ir.model,name:payroll_policy_absence.model_hr_policy_group
+msgid "HR Policy Group"
+msgstr ""
+
+#. module: payroll_policy_absence
+#: model:ir.model.fields,field_description:payroll_policy_absence.field_hr_policy_absence__id
+#: model:ir.model.fields,field_description:payroll_policy_absence.field_hr_policy_group__id
+#: model:ir.model.fields,field_description:payroll_policy_absence.field_hr_policy_line_absence__id
+msgid "ID"
+msgstr ""
+
+#. module: payroll_policy_absence
+#: model:ir.model.fields,field_description:payroll_policy_absence.field_hr_policy_absence____last_update
+#: model:ir.model.fields,field_description:payroll_policy_absence.field_hr_policy_group____last_update
+#: model:ir.model.fields,field_description:payroll_policy_absence.field_hr_policy_line_absence____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: payroll_policy_absence
+#: model:ir.model.fields,field_description:payroll_policy_absence.field_hr_policy_absence__write_uid
+#: model:ir.model.fields,field_description:payroll_policy_absence.field_hr_policy_line_absence__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: payroll_policy_absence
+#: model:ir.model.fields,field_description:payroll_policy_absence.field_hr_policy_absence__write_date
+#: model:ir.model.fields,field_description:payroll_policy_absence.field_hr_policy_line_absence__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: payroll_policy_absence
+#: model:ir.model.fields,field_description:payroll_policy_absence.field_hr_policy_line_absence__holiday_status_id
+msgid "Leave"
+msgstr ""
+
+#. module: payroll_policy_absence
+#: model:ir.model.fields,help:payroll_policy_absence.field_hr_policy_line_absence__rate
+msgid "Multiplier of employee wage."
+msgstr ""
+
+#. module: payroll_policy_absence
+#: model:ir.model.fields,field_description:payroll_policy_absence.field_hr_policy_absence__name
+#: model:ir.model.fields,field_description:payroll_policy_absence.field_hr_policy_line_absence__name
+#: model_terms:ir.ui.view,arch_db:payroll_policy_absence.absence_policy_view_form
+msgid "Name"
+msgstr ""
+
+#. module: payroll_policy_absence
+#: model:ir.model.fields.selection,name:payroll_policy_absence.selection__hr_policy_line_absence__type__paid
+msgid "Paid"
+msgstr ""
+
+#. module: payroll_policy_absence
+#: model:ir.model.fields,field_description:payroll_policy_absence.field_hr_policy_line_absence__policy_id
+msgid "Policy"
+msgstr ""
+
+#. module: payroll_policy_absence
+#: model:ir.model.fields,field_description:payroll_policy_absence.field_hr_policy_absence__line_ids
+msgid "Policy Lines"
+msgstr ""
+
+#. module: payroll_policy_absence
+#: model:ir.model.fields,field_description:payroll_policy_absence.field_hr_policy_line_absence__rate
+msgid "Rate"
+msgstr ""
+
+#. module: payroll_policy_absence
+#: model:ir.model.fields,field_description:payroll_policy_absence.field_hr_policy_line_absence__type
+msgid "Type"
+msgstr ""
+
+#. module: payroll_policy_absence
+#: model:ir.model.fields.selection,name:payroll_policy_absence.selection__hr_policy_line_absence__type__unpaid
+msgid "Unpaid"
+msgstr ""
+
+#. module: payroll_policy_absence
+#: model:ir.model.fields,help:payroll_policy_absence.field_hr_policy_line_absence__code
+msgid "Use this code in the salary rules."
+msgstr ""
+
+#. module: payroll_policy_absence
+#: model:ir.model.fields,help:payroll_policy_absence.field_hr_policy_line_absence__use_awol
+msgid ""
+"Use this policy to record employee time absence not covered by other leaves."
+msgstr ""
diff --git a/payroll_policy_absence/models/__init__.py b/payroll_policy_absence/models/__init__.py
new file mode 100644
index 00000000..1520faa3
--- /dev/null
+++ b/payroll_policy_absence/models/__init__.py
@@ -0,0 +1,7 @@
+# Copyright (C) 2021 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import hr_policy_absence
+from . import hr_policy_group
+from . import hr_policy_line_absence
diff --git a/payroll_policy_absence/models/hr_policy_absence.py b/payroll_policy_absence/models/hr_policy_absence.py
new file mode 100644
index 00000000..60c1bbe9
--- /dev/null
+++ b/payroll_policy_absence/models/hr_policy_absence.py
@@ -0,0 +1,54 @@
+# Copyright (C) 2021 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class PolicyAbsence(models.Model):
+
+    _name = "hr.policy.absence"
+    _description = "Absence payroll policy"
+    _order = "date desc"
+
+    name = fields.Char(size=128, required=True)
+    date = fields.Date(string="Effective Date", required=True)
+    line_ids = fields.One2many(
+        string="Policy Lines",
+        comodel_name="hr.policy.line.absence",
+        inverse_name="policy_id",
+    )
+
+    def get_codes(self):
+
+        res = []
+        for policy in self:
+            [
+                res.append((line.code, line.name, line.type, line.rate, line.use_awol))
+                for line in policy.line_ids
+            ]
+        return res
+
+    def paid_codes(self):
+
+        res = {}
+        for policy in self:
+            res[policy.id] = []
+            [
+                res[policy.id].append((line.code, line.name))
+                for line in policy.line_ids
+                if line.type == "paid"
+            ]
+        return res
+
+    def unpaid_codes(self):
+
+        res = {}
+        for policy in self:
+            res[policy.id] = []
+            [
+                res[policy.id].append((line.code, line.name))
+                for line in policy.line_ids
+                if line.type == "unpaid"
+            ]
+        return res
diff --git a/payroll_policy_absence/models/hr_policy_group.py b/payroll_policy_absence/models/hr_policy_group.py
new file mode 100644
index 00000000..80995bc7
--- /dev/null
+++ b/payroll_policy_absence/models/hr_policy_group.py
@@ -0,0 +1,18 @@
+# Copyright (C) 2021 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class PolicyGroup(models.Model):
+
+    _inherit = "hr.policy.group"
+
+    absence_policy_ids = fields.Many2many(
+        comodel_name="hr.policy.absence",
+        relation="hr_policy_group_absence_rel",
+        column1="group_id",
+        column2="absence_id",
+        string="Absence Policy",
+    )
diff --git a/payroll_policy_absence/models/hr_policy_line_absence.py b/payroll_policy_absence/models/hr_policy_line_absence.py
new file mode 100644
index 00000000..fcd42e4f
--- /dev/null
+++ b/payroll_policy_absence/models/hr_policy_line_absence.py
@@ -0,0 +1,36 @@
+# Copyright (C) 2021 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class PolicyLineAbsence(models.Model):
+
+    _name = "hr.policy.line.absence"
+    _description = "Absence payroll policy line"
+
+    name = fields.Char(required=True)
+    code = fields.Char(required=True, help="Use this code in the salary rules.")
+    holiday_status_id = fields.Many2one(
+        comodel_name="hr.leave.type", string="Leave", required=True
+    )
+    policy_id = fields.Many2one(comodel_name="hr.policy.absence", string="Policy")
+    type = fields.Selection(
+        selection=[("paid", "Paid"), ("unpaid", "Unpaid"), ("dock", "Dock")],
+        required=True,
+        help="Determines how the absence will be treated in payroll."
+        " The 'Dock Salary' type will deduct money (usefull for salaried employees).",
+    )
+    rate = fields.Float(required=True, default=1.0, help="Multiplier of employee wage.")
+    use_awol = fields.Boolean(
+        string="Absent Without Leave",
+        help="Use this policy to record employee time absence not covered by other leaves.",
+    )
+
+    @api.onchange("holiday_status_id")
+    def onchange_holiday(self):
+
+        if self.holiday_status_id:
+            self.name = self.holiday_status_id.name
+            self.code = self.holiday_status_id.code
diff --git a/payroll_policy_absence/readme/CREDITS.rst b/payroll_policy_absence/readme/CREDITS.rst
new file mode 100644
index 00000000..d264bc7e
--- /dev/null
+++ b/payroll_policy_absence/readme/CREDITS.rst
@@ -0,0 +1 @@
+* Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/payroll_policy_absence/readme/DESCRIPTION.rst b/payroll_policy_absence/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..beec0253
--- /dev/null
+++ b/payroll_policy_absence/readme/DESCRIPTION.rst
@@ -0,0 +1,5 @@
+Define Absence Policies
+========================
+Define properties of an absence policy, such as:
+    * Type (paid, unpaid)
+    * Rate (multiplier of base wage)
diff --git a/payroll_policy_absence/security/ir.model.access.csv b/payroll_policy_absence/security/ir.model.access.csv
new file mode 100644
index 00000000..3101939f
--- /dev/null
+++ b/payroll_policy_absence/security/ir.model.access.csv
@@ -0,0 +1,7 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_policy_line_ot_hro,access_hr_policy_line_absence,model_hr_policy_line_absence,hr.group_hr_user,1,0,0,0
+access_hr_policy_line_ot_hrm,access_hr_policy_line_absence,model_hr_policy_line_absence,payroll.group_payroll_user,1,0,0,0
+access_hr_policy_line_ot_payroll,access_hr_policy_line_absence,model_hr_policy_line_absence,payroll.group_payroll_manager,1,1,1,1
+access_hr_policy_ot_hro,access_hr_policy_absence,model_hr_policy_absence,hr.group_hr_user,1,0,0,0
+access_hr_policy_ot_hrm,access_hr_policy_absence,model_hr_policy_absence,payroll.group_payroll_user,1,0,0,0
+access_hr_policy_ot_payroll,access_hr_policy_absence,model_hr_policy_absence,payroll.group_payroll_manager,1,1,1,1
diff --git a/payroll_policy_absence/static/description/icon.png b/payroll_policy_absence/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/payroll_policy_absence/static/description/icon.png differ
diff --git a/payroll_policy_absence/static/description/index.html b/payroll_policy_absence/static/description/index.html
new file mode 100644
index 00000000..edea1d9f
--- /dev/null
+++ b/payroll_policy_absence/static/description/index.html
@@ -0,0 +1,416 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Payroll Absence Policy</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="payroll-absence-policy">
+<h1 class="title">Payroll Absence Policy</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:f01ae8364d604757d347e6571d019372216fe53a660ff1f55135e467b2bbc3c2
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_policy_absence"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<div class="section" id="define-absence-policies">
+<h1>Define Absence Policies</h1>
+<dl class="docutils">
+<dt>Define properties of an absence policy, such as:</dt>
+<dd><ul class="first last simple">
+<li>Type (paid, unpaid)</li>
+<li>Rate (multiplier of base wage)</li>
+</ul>
+</dd>
+</dl>
+<p><strong>Table of contents</strong></p>
+</div>
+<div class="section" id="bug-tracker">
+<h1>Bug Tracker</h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_policy_absence%0Aversion:%2014.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>Credits</h1>
+<div class="section" id="authors">
+<h2>Authors</h2>
+<ul class="simple">
+<li>TREVI Software</li>
+<li>Michael Telahun Makonnen</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2>Other credits</h2>
+<ul class="simple">
+<li>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2>Maintainers</h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_policy_absence">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/payroll_policy_absence/static/src/img/main_screenshot.png b/payroll_policy_absence/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/payroll_policy_absence/static/src/img/main_screenshot.png differ
diff --git a/payroll_policy_absence/tests/__init__.py b/payroll_policy_absence/tests/__init__.py
new file mode 100644
index 00000000..7498bd5e
--- /dev/null
+++ b/payroll_policy_absence/tests/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2021 TREVI Software
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import test_payroll_policy_access
diff --git a/payroll_policy_absence/tests/test_payroll_policy_access.py b/payroll_policy_absence/tests/test_payroll_policy_access.py
new file mode 100644
index 00000000..27ee7dde
--- /dev/null
+++ b/payroll_policy_absence/tests/test_payroll_policy_access.py
@@ -0,0 +1,167 @@
+# Copyright (C) 2021 TREVI Software
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from datetime import date
+
+from odoo.exceptions import AccessError
+from odoo.tests import common, new_test_user
+
+
+class TestPolicyAccess(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super(TestPolicyAccess, cls).setUpClass()
+
+        cls.Policy = cls.env["hr.policy.absence"]
+        cls.PolicyLine = cls.env["hr.policy.line.absence"]
+        cls.leave_type = cls.env.ref("hr_holidays.holiday_status_cl")
+        cls.policy = cls.Policy.create({"name": "POLICY1", "date": date.today()})
+        cls.line = cls.PolicyLine.create(
+            {
+                "name": "Line1",
+                "code": "L1",
+                "type": "paid",
+                "holiday_status_id": cls.leave_type.id,
+                "policy_id": cls.policy.id,
+            }
+        )
+        # Payroll Manager user
+        cls.userPM = new_test_user(
+            cls.env,
+            login="pm",
+            groups="base.group_user,payroll.group_payroll_manager",
+            name="Payroll manager",
+            email="pm@example.com",
+        )
+        # Payroll user
+        cls.userPU = new_test_user(
+            cls.env,
+            login="pu",
+            groups="base.group_user,payroll.group_payroll_user",
+            name="Payroll manager",
+            email="pu@example.com",
+        )
+        # HR Manager
+        cls.userHRM = new_test_user(
+            cls.env,
+            login="hrm",
+            groups="base.group_user,hr.group_hr_manager",
+            name="Payroll manager",
+            email="hrm@example.com",
+        )
+
+    def test_hrm_access(self):
+        """HRM only has read access"""
+
+        # Create fails
+        with self.assertRaises(AccessError):
+            self.Policy.with_user(self.userHRM).create(
+                {"name": "POLICY2", "date": date.today()}
+            )
+            self.OtPolicyLine.with_user(self.userHRM).create(
+                {"name": "line2", "type": "daily"}
+            )
+        # Unlink fails
+        with self.assertRaises(AccessError):
+            self.policy.with_user(self.userHRM).unlink()
+            self.line.with_user(self.userHRM).unlink()
+        # Read succeeds
+        try:
+            self.Policy.with_user(self.userHRM).browse(self.policy.id)
+        except AccessError:
+            self.fail("Caught an unexpected exception reading hr.policy.presence")
+        try:
+            self.PolicyLine.with_user(self.userHRM).browse(self.policy.id)
+        except AccessError:
+            self.fail("Caught an unexpected exception reading hr.policy.line.presence")
+        # Write fails
+        with self.assertRaises(AccessError):
+            self.Policy.with_user(self.userHRM).browse(self.policy.id).write(
+                {"name": "POLICY3"}
+            )
+            self.PolicyLine.with_user(self.userHRM).browse(self.line.id).write(
+                {"name": "line3"}
+            )
+
+    def test_payroll_user_access(self):
+        """Payroll User only has read access"""
+
+        # Create fails
+        with self.assertRaises(AccessError):
+            self.Policy.with_user(self.userPU).create(
+                {"name": "POL2", "date": date.today()}
+            )
+            self.PolicyLine.with_user(self.userPU).create(
+                {"name": "line2", "type": "daily"}
+            )
+        # Unlink fails
+        with self.assertRaises(AccessError):
+            self.policy.with_user(self.userPU).unlink()
+            self.line.with_user(self.userPU).unlink()
+        # Read succeeds
+        try:
+            self.Policy.with_user(self.userPU).browse(self.policy.id)
+        except AccessError:
+            self.fail("Caught an unexpected exception reading hr.policy.presence")
+        try:
+            self.PolicyLine.with_user(self.userPU).browse(self.policy.id)
+        except AccessError:
+            self.fail("Caught an unexpected exception reading hr.policy.line.presence")
+        # Write fails
+        with self.assertRaises(AccessError):
+            self.Policy.with_user(self.userPU).browse(self.policy.id).write(
+                {"name": "POL3"}
+            )
+            self.PolicyLine.with_user(self.userPU).browse(self.line.id).write(
+                {"name": "line3"}
+            )
+
+    def test_payroll_manager_access(self):
+        """Payroll Manager has complete access"""
+
+        # Read succeeds
+        try:
+            self.Policy.with_user(self.userPM).browse(self.policy.id)
+        except AccessError:
+            self.fail("Caught an unexpected exception reading hr.policy.presence")
+        try:
+            self.PolicyLine.with_user(self.userPM).browse(self.line.id)
+        except AccessError:
+            self.fail("Caught an unexpected exception reading hr.policy.line.presence")
+        # Write succeeds
+        try:
+            self.Policy.with_user(self.userPM).browse(self.policy.id).write(
+                {"name": "XX"}
+            )
+        except AccessError:
+            self.fail("Caught an unexpected exception writing hr.policy.presence")
+        try:
+            self.PolicyLine.with_user(self.userPM).browse(self.line.id).write(
+                {"name": "XX"}
+            )
+        except AccessError:
+            self.fail("Caught an unexpected exception writing hr.policy.line.presence")
+        # Create/Unlink succeeds
+        try:
+            pol = self.Policy.with_user(self.userPM).create(
+                {"name": "Policy test pm", "date": date.today()}
+            )
+            pol.unlink()
+        except AccessError:
+            self.fail(
+                "Caught unexpected exception creating/unlinking hr.policy.presence"
+            )
+        try:
+            line = self.PolicyLine.with_user(self.userPM).create(
+                {
+                    "name": "line test pm",
+                    "code": "A",
+                    "type": "paid",
+                    "holiday_status_id": self.leave_type.id,
+                }
+            )
+            line.unlink()
+        except AccessError:
+            self.fail(
+                "Caught unexpected exception creating/unlinking hr.policy.line.presence"
+            )
diff --git a/payroll_policy_absence/views/hr_policy_absence_view.xml b/payroll_policy_absence/views/hr_policy_absence_view.xml
new file mode 100644
index 00000000..8865b7ab
--- /dev/null
+++ b/payroll_policy_absence/views/hr_policy_absence_view.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+
+        <!-- Policy Lines -->
+
+        <record id="absence_policy_line_tree_view" model="ir.ui.view">
+            <field name="name">hr.policy.line.absence.tree</field>
+            <field name="model">hr.policy.line.absence</field>
+            <field name="arch" type="xml">
+                <tree string="Absence Lines">
+                    <field name="name" />
+                    <field name="code" />
+                    <field name="type" />
+                    <field name="rate" />
+                    <field name="holiday_status_id" />
+                </tree>
+            </field>
+        </record>
+
+        <record id="absence_policy_line_form_view" model="ir.ui.view">
+            <field name="name">hr.policy.line.absence.form</field>
+            <field name="model">hr.policy.line.absence</field>
+            <field name="arch" type="xml">
+                <form string="Absence Policy">
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="holiday_status_id" />
+                                <field name="rate" />
+                                <field name="type" />
+                                <field name="use_awol" />
+                            </group>
+                            <group>
+                                <field name="name" />
+                                <field name="code" />
+                                <field name="policy_id" />
+                            </group>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <!-- Absence Policy -->
+        <record id="absence_policy_view_tree" model="ir.ui.view">
+            <field name="name">hr.policy.absence.tree</field>
+            <field name="model">hr.policy.absence</field>
+            <field name="arch" type="xml">
+                <tree string="Absence Policies">
+                    <field name="name" />
+                    <field name="date" />
+                </tree>
+            </field>
+        </record>
+
+        <record id="absence_policy_view_form" model="ir.ui.view">
+            <field name="name">hr.policy.absence.form</field>
+            <field name="model">hr.policy.absence</field>
+            <field name="arch" type="xml">
+                <form string="Absence Policy">
+                    <sheet>
+                        <h1>
+                            <label for="name" string="Name" class="oe_edit_only" />
+                            <field name="name" />
+                        </h1>
+                        <group>
+                            <group>
+                                <field name="date" />
+                            </group>
+                            <group />
+                        </group>
+                        <group string="Absence Lines">
+                            <field name="line_ids" nolabel="1" editable="top" />
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="open_absence_policy" model="ir.actions.act_window">
+            <field name="name">Absence Policies</field>
+            <field name="res_model">hr.policy.absence</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem
+            action="open_absence_policy"
+            id="menu_hr_absence_policy"
+            parent="payroll_policy_group.menu_hr_policy_configuration"
+            sequence="15"
+        />
+
+        <!-- Policy Group -->
+
+        <record id="policy_group_view_form" model="ir.ui.view">
+            <field name="name">hr.policy.group.form.absenceinherit</field>
+            <field name="model">hr.policy.group</field>
+            <field
+                name="inherit_id"
+                ref="payroll_policy_group.policy_group_view_form"
+            />
+            <field name="arch" type="xml">
+                <xpath expr="//group[@name='left']" position="inside">
+                    <field name="absence_policy_ids" />
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/payroll_policy_accrual/README.rst b/payroll_policy_accrual/README.rst
new file mode 100644
index 00000000..988db930
--- /dev/null
+++ b/payroll_policy_accrual/README.rst
@@ -0,0 +1,68 @@
+===================
+Time Accrual Policy
+===================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:b179d23d71f497934b2f080d4549d849b63340105e4e5ce627cf42d71482ad4b
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_policy_accrual
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+Define Time Bank Accrual Policies
+=================================
+Define properties of a leave accrual policy. The accrued time is calculated
+based on the length of service of the employee. An additional premium may be
+added on the base rate based on additional months of service. This policy is ideal
+for annual leave accruals. If the type of accrual is 'Standard' time is accrued and
+withdrawn manually. However, if the type is 'Calendar' the time is accrued (and recorded)
+at a fixed frequency.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_policy_accrual%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+* Michael Telahun Makonnen
+
+Other credits
+~~~~~~~~~~~~~
+
+* Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_policy_accrual>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/payroll_policy_accrual/__init__.py b/payroll_policy_accrual/__init__.py
new file mode 100644
index 00000000..1cc5116e
--- /dev/null
+++ b/payroll_policy_accrual/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import models
diff --git a/payroll_policy_accrual/__manifest__.py b/payroll_policy_accrual/__manifest__.py
new file mode 100644
index 00000000..f795983f
--- /dev/null
+++ b/payroll_policy_accrual/__manifest__.py
@@ -0,0 +1,26 @@
+# Copyright (C) 2021 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    "name": "Time Accrual Policy",
+    "summary": "Automatically or manually accrue to time banks to be withdrawn later",
+    "version": "15.0.1.0.0",
+    "category": "Payroll",
+    "author": "TREVI Software, Michael Telahun Makonnen",
+    "license": "AGPL-3",
+    "images": ["static/src/img/main_screenshot.png"],
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "hr_accrual_bank",
+        "hr_contract_status",
+        "hr_employee_seniority_months",
+        "payroll_policy_group",
+    ],
+    "data": [
+        "security/ir.model.access.csv",
+        "data/hr_policy_accrual_cron.xml",
+        "views/hr_policy_accrual_view.xml",
+    ],
+    "installable": True,
+}
diff --git a/payroll_policy_accrual/data/hr_policy_accrual_cron.xml b/payroll_policy_accrual/data/hr_policy_accrual_cron.xml
new file mode 100644
index 00000000..f90609d2
--- /dev/null
+++ b/payroll_policy_accrual/data/hr_policy_accrual_cron.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+
+        <record model="ir.cron" id="hr_accrual_policy_cron">
+            <field name="name">Accrual Policies: Update</field>
+            <field name="model_id" ref="model_hr_policy_accrual" />
+            <field name="type">ir.actions.server</field>
+            <field name="doall" eval="True" />
+            <field name="state">code</field>
+            <field name="code">model.try_calculate_accruals()</field>
+            <field
+                name="nextcall"
+                eval="(DateTime.now() + timedelta(hours= +(24-DateTime.now().hour))).strftime('%Y-%m-%d %H:%M:%S')"
+            />
+            <field name="interval_number">1</field>
+            <field name="interval_type">days</field>
+            <field name="numbercall">-1</field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/payroll_policy_accrual/i18n/payroll_policy_accrual.pot b/payroll_policy_accrual/i18n/payroll_policy_accrual.pot
new file mode 100644
index 00000000..83d535d8
--- /dev/null
+++ b/payroll_policy_accrual/i18n/payroll_policy_accrual.pot
@@ -0,0 +1,605 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* payroll_policy_accrual
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_annual_day__10
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_month_day__10
+msgid "10"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_annual_day__11
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_month_day__11
+msgid "11"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_annual_day__12
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_month_day__12
+msgid "12"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_annual_day__13
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_month_day__13
+msgid "13"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_annual_day__14
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_month_day__14
+msgid "14"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_annual_day__15
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_month_day__15
+msgid "15"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_annual_day__16
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_month_day__16
+msgid "16"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_annual_day__17
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_month_day__17
+msgid "17"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_annual_day__18
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_month_day__18
+msgid "18"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_annual_day__19
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_month_day__19
+msgid "19"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_annual_day__20
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_month_day__20
+msgid "20"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_annual_day__21
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_month_day__21
+msgid "21"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_annual_day__22
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_month_day__22
+msgid "22"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_annual_day__23
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_month_day__23
+msgid "23"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_annual_day__24
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_month_day__24
+msgid "24"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_annual_day__25
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_month_day__25
+msgid "25"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_annual_day__26
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_month_day__26
+msgid "26"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_annual_day__27
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_month_day__27
+msgid "27"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_annual_day__28
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_month_day__28
+msgid "28"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_annual_day__29
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_month_day__29
+msgid "29"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_annual_day__30
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_month_day__30
+msgid "30"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_annual_day__31
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_month_day__31
+msgid "31"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual__accrual_id
+msgid "Accrual Account"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model_terms:ir.ui.view,arch_db:payroll_policy_accrual.accrual_line_job_form_view
+msgid "Accrual Line Job"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual_job__accrual_line_ids
+#: model_terms:ir.ui.view,arch_db:payroll_policy_accrual.accr_policy_view_form
+#: model_terms:ir.ui.view,arch_db:payroll_policy_accrual.accrual_line_job_form_view
+msgid "Accrual Lines"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model_terms:ir.ui.view,arch_db:payroll_policy_accrual.accr_policy_view_tree
+msgid "Accrual Policies"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.actions.server,name:payroll_policy_accrual.hr_accrual_policy_cron_ir_actions_server
+#: model:ir.cron,cron_name:payroll_policy_accrual.hr_accrual_policy_cron
+#: model:ir.cron,name:payroll_policy_accrual.hr_accrual_policy_cron
+msgid "Accrual Policies: Update"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model,name:payroll_policy_accrual.model_hr_policy_accrual
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_group__accr_policy_ids
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual__policy_id
+#: model_terms:ir.ui.view,arch_db:payroll_policy_accrual.accr_policy_view_form
+msgid "Accrual Policy"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model,name:payroll_policy_accrual.model_hr_policy_line_accrual
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual_job__policy_line_id
+#: model_terms:ir.ui.view,arch_db:payroll_policy_accrual.accr_policy_line_form_view
+msgid "Accrual Policy Line"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model,name:payroll_policy_accrual.model_hr_policy_line_accrual_job
+msgid "Accrual Policy Line Job Run"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model_terms:ir.ui.view,arch_db:payroll_policy_accrual.accr_policy_line_tree_view
+msgid "Accrual Policy Lines"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual__accrual_rate_premium_milestone
+msgid "Accrual Premium Milestone"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual__accrual_rate
+msgid "Accrual Rate"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual__accrual_rate_premium
+msgid "Accrual Rate Premium"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual__accrual_rate_hour
+msgid "Accrual Rate/Hour"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__calculation_frequency__annual
+msgid "Annual"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model_terms:ir.ui.view,arch_db:payroll_policy_accrual.accr_policy_line_form_view
+msgid "Annual Frequency"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_annual_month__4
+msgid "April"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_annual_month__8
+msgid "August"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual__calculation_frequency
+msgid "Calculation Frequency"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__type__calendar
+msgid "Calendar"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: code:addons/payroll_policy_accrual/models/hr_policy_line_accrual.py:0
+#, python-format
+msgid "Calendar based accrual (%s)"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual__code
+#: model_terms:ir.ui.view,arch_db:payroll_policy_accrual.accr_policy_line_form_view
+msgid "Code"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_accrual__create_uid
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual__create_uid
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual_job__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_accrual__create_date
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual__create_date
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual_job__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual_job__name
+msgid "Date"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual__frequency_annual_day
+msgid "Day of Month"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual__frequency_month_day
+msgid "Day of month"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_annual_month__12
+msgid "December"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual__balance_on_payslip
+msgid "Display Balance on Pay Slip"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_accrual__display_name
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_group__display_name
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual__display_name
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual_job__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_accrual__date
+msgid "Effective Date"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual_job__end_time
+msgid "End Time"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual_job__execution_time
+msgid "Execution Time"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_annual_month__2
+msgid "February"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual__frequency_on_hire_date
+msgid "Frequency Based on Hire Date"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_week_day__4
+msgid "Friday"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model_terms:ir.ui.view,arch_db:payroll_policy_accrual.accr_policy_line_form_view
+msgid "General"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model,name:payroll_policy_accrual.model_hr_policy_group
+msgid "HR Policy Group"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model_terms:ir.ui.view,arch_db:payroll_policy_accrual.accrual_line_job_form_view
+msgid "Holiday Allocation Requests"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model_terms:ir.ui.view,arch_db:payroll_policy_accrual.accrual_line_job_form_view
+msgid "Holidays"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__type__hour
+msgid "Hour Based"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_accrual__id
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_group__id
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual__id
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual_job__id
+msgid "ID"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_annual_month__1
+msgid "January"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual__job_ids
+#: model_terms:ir.ui.view,arch_db:payroll_policy_accrual.accr_policy_line_form_view
+msgid "Jobs"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_annual_month__7
+msgid "July"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_annual_month__6
+msgid "June"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_accrual____last_update
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_group____last_update
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual____last_update
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual_job____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_accrual__write_uid
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual__write_uid
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual_job__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_accrual__write_date
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual__write_date
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual_job__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual_job__holiday_ids
+msgid "Leave Allocation Requests"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model_terms:ir.ui.view,arch_db:payroll_policy_accrual.accr_policy_line_form_view
+msgid "List of Jobs"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_annual_month__3
+msgid "March"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual__accrual_rate_max
+msgid "Maximum Accrual Rate"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_annual_month__5
+msgid "May"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual__minimum_employed_days
+msgid "Minimum Employed Days"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,help:payroll_policy_accrual.field_hr_policy_line_accrual__accrual_rate_premium_minimum
+msgid ""
+"Minimum number of months the employee must be employed beforethe premium "
+"rate will start to accrue."
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_week_day__0
+msgid "Monday"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual__frequency_annual_month
+msgid "Month"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__calculation_frequency__monthly
+msgid "Monthly"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model_terms:ir.ui.view,arch_db:payroll_policy_accrual.accr_policy_line_form_view
+msgid "Monthly Frequency"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual__accrual_rate_premium_minimum
+msgid "Months of Employment Before Premium"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_accrual__name
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual__name
+#: model_terms:ir.ui.view,arch_db:payroll_policy_accrual.accr_policy_line_form_view
+#: model_terms:ir.ui.view,arch_db:payroll_policy_accrual.accr_policy_view_form
+msgid "Name"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_annual_month__11
+msgid "November"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,help:payroll_policy_accrual.field_hr_policy_line_accrual__accrual_rate_premium_milestone
+msgid "Number of milestone months after which the premium rate will be added."
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_annual_month__10
+msgid "October"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_accrual__line_ids
+msgid "Policy Lines"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_week_day__5
+msgid "Saturday"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_annual_month__9
+msgid "September"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__type__standard
+msgid "Standard"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_week_day__6
+msgid "Sunday"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,help:payroll_policy_accrual.field_hr_policy_line_accrual__accrual_rate_premium
+msgid ""
+"The additional amount of time (beyond the standard rate)accrued per Premium "
+"Milestone of service."
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,help:payroll_policy_accrual.field_hr_policy_line_accrual__accrual_rate_max
+msgid ""
+"The maximum amount of time that may accrue per year. Zero means theamount "
+"may keep increasing indefinitely."
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,help:payroll_policy_accrual.field_hr_policy_line_accrual__balance_on_payslip
+msgid ""
+"The pay slip report must be modified to display this accrual forthis setting"
+" to have any effect."
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,help:payroll_policy_accrual.field_hr_policy_line_accrual__accrual_rate
+msgid "The rate, in days, accrued per year."
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,help:payroll_policy_accrual.field_hr_policy_line_accrual__accrual_rate_hour
+msgid ""
+"The time accrued for every hour the employee works. Available only when the "
+"policy type is Hour Based."
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_week_day__3
+msgid "Thursday"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.actions.act_window,name:payroll_policy_accrual.open_accr_policy
+#: model:ir.ui.menu,name:payroll_policy_accrual.menu_hr_accr_policy
+msgid "Timebank Accrual Policies"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.actions.act_window,name:payroll_policy_accrual.open_accr_policy_line
+#: model:ir.ui.menu,name:payroll_policy_accrual.menu_hr_accr_policy_line
+msgid "Timebank Accrual Policy Lines"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_week_day__1
+msgid "Tuesday"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual__type
+msgid "Type"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__frequency_week_day__2
+msgid "Wednesday"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields,field_description:payroll_policy_accrual.field_hr_policy_line_accrual__frequency_week_day
+msgid "Week Day"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model:ir.model.fields.selection,name:payroll_policy_accrual.selection__hr_policy_line_accrual__calculation_frequency__weekly
+msgid "Weekly"
+msgstr ""
+
+#. module: payroll_policy_accrual
+#: model_terms:ir.ui.view,arch_db:payroll_policy_accrual.accr_policy_line_form_view
+msgid "Weekly Frequency"
+msgstr ""
diff --git a/payroll_policy_accrual/models/__init__.py b/payroll_policy_accrual/models/__init__.py
new file mode 100644
index 00000000..f16fce3e
--- /dev/null
+++ b/payroll_policy_accrual/models/__init__.py
@@ -0,0 +1,8 @@
+# Copyright (C) 2021 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import hr_policy_accrual
+from . import hr_policy_group
+from . import hr_policy_line_accrual
+from . import hr_policy_line_accrual_job
diff --git a/payroll_policy_accrual/models/hr_leave.py b/payroll_policy_accrual/models/hr_leave.py
new file mode 100644
index 00000000..0fa63df1
--- /dev/null
+++ b/payroll_policy_accrual/models/hr_leave.py
@@ -0,0 +1,81 @@
+# Copyright (C) 2021 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class HrHolidays(models.Model):
+
+    _inherit = "hr.leave.allocation"
+
+    def do_accrual(self, today, days):
+
+        self.ensure_one()
+        Accrual = self.env["hr.accrual"]
+        AccrualLine = self.env["hr.accrual.line"]
+
+        accrual_ids = Accrual.search(
+            [("holiday_status_id", "=", self.holiday_status_id.id)]
+        )
+
+        if len(accrual_ids) == 0:
+            return
+
+        # Deposit to the accrual account
+        #
+        accrual_line = {
+            "date": today,
+            "accrual_id": accrual_ids[0],
+            "employee_id": self.employee_id.id,
+            "amount": days,
+        }
+        line_id = AccrualLine.create(accrual_line)
+        accrual_ids[0].write({"line_ids": [(4, line_id)]})
+
+        return
+
+    def action_validate(self):
+
+        res = super(HrHolidays, self).action_validate()
+
+        today = fields.Date.today()
+        for record in self:
+            if record.holiday_type == "employee" and record.from_accrual:
+
+                record._do_accrual(
+                    today, record.employee_id.id, record.number_of_days_temp
+                )
+
+            if record.holiday_type == "employee":
+
+                record._do_accrual(
+                    today, record.employee_id.id, -record.number_of_days_temp
+                )
+
+        return res
+
+    def holidays_refuse(self):
+
+        today = fields.Date.today()
+        for record in self:
+            if record.state not in ["validate", "validate1"]:
+                continue
+
+            if record.holiday_type == "employee" and record.type == "add":
+                self._do_accrual(
+                    today,
+                    record.holiday_status_id.id,
+                    record.employee_id.id,
+                    -record.number_of_days_temp,
+                )
+
+            elif record.holiday_type == "employee" and record.type == "remove":
+                self._do_accrual(
+                    today,
+                    record.holiday_status_id.id,
+                    record.employee_id.id,
+                    record.number_of_days_temp,
+                )
+
+        return super(HrHolidays, self).holidays_refuse()
diff --git a/payroll_policy_accrual/models/hr_policy_accrual.py b/payroll_policy_accrual/models/hr_policy_accrual.py
new file mode 100644
index 00000000..77998990
--- /dev/null
+++ b/payroll_policy_accrual/models/hr_policy_accrual.py
@@ -0,0 +1,126 @@
+# Copyright (C) 2021 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from datetime import datetime, timedelta
+
+from odoo import api, fields, models
+
+
+class HrPolicy(models.Model):
+
+    _name = "hr.policy.accrual"
+    _description = "Accrual Policy"
+    _order = "date desc"
+
+    name = fields.Char(required=True)
+    date = fields.Date(string="Effective Date", required=True)
+    line_ids = fields.One2many(
+        comodel_name="hr.policy.line.accrual",
+        inverse_name="policy_id",
+        string="Policy Lines",
+    )
+
+    # Return records with latest date first
+    @api.model
+    def get_latest_policy(self, policy_group, dToday=None):
+        """
+        Return an accrual policy with an effective date before dToday but
+        greater than all the others
+        """
+
+        if not policy_group or not policy_group.accr_policy_ids or not dToday:
+            return None
+
+        res = None
+        for policy in policy_group.accr_policy_ids:
+            dPolicy = fields.Date.from_string(policy.date)
+            if dPolicy <= dToday:
+                if res is None:
+                    res = policy
+                elif dPolicy > fields.Date.from_string(res.date):
+                    res = policy
+
+        return res
+
+    @api.model
+    def try_calculate_accruals(self):
+
+        PolicyGroup = self.env["hr.policy.group"]
+        AccrualJob = self.env["hr.policy.line.accrual.job"]
+
+        dToday = fields.Date.from_string(fields.Date.today())
+
+        for pg in PolicyGroup.search([]):
+            accrual_policy = self.get_latest_policy(pg, dToday)
+            if accrual_policy is None:
+                continue
+
+            # Get the last time that an accrual job was run for each accrual line in
+            # the accrual policy. If there was no 'last time' assume this is the first
+            # time the job is being run and start it running from today. Otherwise,
+            # we must also run jobs for all the skipped dates.
+            #
+            line_jobs = {}
+            for line in accrual_policy.line_ids:
+                d = line.get_last_job_date()
+                if d is None:
+                    line_jobs[line.id] = [dToday]
+                else:
+                    line_jobs[line.id] = []
+                    while d < dToday:
+                        d += timedelta(days=1)
+                        line_jobs[line.id].append(d)
+
+            # For each accrual line in this accrual policy do a run for each day (beginning
+            # from the last date for which it was run) until today for each contract attached
+            # to the policy group.
+            #
+            for line in accrual_policy.line_ids:
+                if line.type not in ["calendar"]:
+                    continue
+
+                for dJob in line_jobs[line.id]:
+
+                    # Create a Job for the accrual line
+                    job_vals = {
+                        "name": dJob,
+                        "execution_time": fields.Datetime.now(),
+                        "policy_line_id": line.id,
+                    }
+                    job = AccrualJob.create(job_vals)
+
+                    employee_list = []
+                    for contract in pg.contract_ids:
+                        # employee already done or contract not in running state
+                        if (
+                            contract.employee_id.id in employee_list
+                            or contract.state in ["draft", "done"]
+                        ):
+                            continue
+                        # contract has already ended
+                        if contract.date_end and contract.date_end < dJob:
+                            continue
+                        line.calculate_and_deposit(
+                            contract.employee_id, job, dToday=dJob
+                        )
+
+                        # An employee may have multiple valid contracts. Don't double-count.
+                        employee_list.append(contract.employee_id.id)
+                    job.end_time = datetime.now()
+
+    @api.model
+    def do_accrual_by_period(self, policy_line, employee, dStart, dEnd, descr=None):
+
+        res = True
+        if not dStart or not dEnd or policy_line.type not in ["calendar"]:
+            return False
+
+        dToday = dStart
+        while dToday <= dEnd:
+            policy_line.calculate_and_deposit(
+                employee, job_id=False, dToday=dToday, descr=descr
+            )
+            dToday += timedelta(days=+1)
+
+        return res
diff --git a/payroll_policy_accrual/models/hr_policy_group.py b/payroll_policy_accrual/models/hr_policy_group.py
new file mode 100644
index 00000000..6f855d9d
--- /dev/null
+++ b/payroll_policy_accrual/models/hr_policy_group.py
@@ -0,0 +1,18 @@
+# Copyright (C) 2021 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class PolicyGroup(models.Model):
+
+    _inherit = "hr.policy.group"
+
+    accr_policy_ids = fields.Many2many(
+        string="Accrual Policy",
+        comodel_name="hr.policy.accrual",
+        relation="hr_policy_group_accr_rel",
+        column1="group_id",
+        column2="accr_id",
+    )
diff --git a/payroll_policy_accrual/models/hr_policy_line_accrual.py b/payroll_policy_accrual/models/hr_policy_line_accrual.py
new file mode 100644
index 00000000..b4b73f50
--- /dev/null
+++ b/payroll_policy_accrual/models/hr_policy_line_accrual.py
@@ -0,0 +1,348 @@
+# Copyright (C) 2021 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from datetime import date, timedelta
+
+from odoo import _, fields, models
+
+# Selection: day of month
+SELECTION_DOM = [
+    ("1", "1"),
+    ("2", "2"),
+    ("3", "3"),
+    ("4", "4"),
+    ("5", "5"),
+    ("6", "6"),
+    ("7", "7"),
+    ("8", "8"),
+    ("9", "9"),
+    ("10", "10"),
+    ("11", "11"),
+    ("12", "12"),
+    ("13", "13"),
+    ("14", "14"),
+    ("15", "15"),
+    ("16", "16"),
+    ("17", "17"),
+    ("18", "18"),
+    ("19", "19"),
+    ("20", "20"),
+    ("21", "21"),
+    ("22", "22"),
+    ("23", "23"),
+    ("24", "24"),
+    ("25", "25"),
+    ("26", "26"),
+    ("27", "27"),
+    ("28", "28"),
+    ("29", "29"),
+    ("30", "30"),
+    ("31", "31"),
+]
+
+
+class HrPolicyLine(models.Model):
+
+    _name = "hr.policy.line.accrual"
+    _description = "Accrual Policy Line"
+
+    name = fields.Char(required=True)
+    code = fields.Char(required=True)
+    policy_id = fields.Many2one(
+        comodel_name="hr.policy.accrual", string="Accrual Policy"
+    )
+    accrual_id = fields.Many2one(
+        comodel_name="hr.accrual", string="Accrual Account", required=True
+    )
+    type = fields.Selection(
+        selection=[
+            ("standard", "Standard"),
+            ("calendar", "Calendar"),
+            ("hour", "Hour Based"),
+        ],
+        default="calendar",
+        required=True,
+    )
+    balance_on_payslip = fields.Boolean(
+        string="Display Balance on Pay Slip",
+        help="The pay slip report must be modified to display this accrual for"
+        "this setting to have any effect.",
+    )
+    calculation_frequency = fields.Selection(
+        selection=[
+            ("weekly", "Weekly"),
+            ("monthly", "Monthly"),
+            ("annual", "Annual"),
+        ]
+    )
+    frequency_on_hire_date = fields.Boolean(string="Frequency Based on Hire Date")
+    frequency_week_day = fields.Selection(
+        string="Week Day",
+        selection=[
+            ("0", "Monday"),
+            ("1", "Tuesday"),
+            ("2", "Wednesday"),
+            ("3", "Thursday"),
+            ("4", "Friday"),
+            ("5", "Saturday"),
+            ("6", "Sunday"),
+        ],
+    )
+    frequency_month_day = fields.Selection(
+        string="Day of month",
+        selection=SELECTION_DOM,
+    )
+    frequency_annual_month = fields.Selection(
+        string="Month",
+        selection=[
+            ("1", "January"),
+            ("2", "February"),
+            ("3", "March"),
+            ("4", "April"),
+            ("5", "May"),
+            ("6", "June"),
+            ("7", "July"),
+            ("8", "August"),
+            ("9", "September"),
+            ("10", "October"),
+            ("11", "November"),
+            ("12", "December"),
+        ],
+    )
+    frequency_annual_day = fields.Selection(
+        string="Day of Month",
+        selection=SELECTION_DOM,
+    )
+    minimum_employed_days = fields.Integer()
+    accrual_rate = fields.Float(help="The rate, in days, accrued per year.")
+    accrual_rate_hour = fields.Float(
+        string="Accrual Rate/Hour",
+        default=0,
+        help="The time accrued for every hour the employee works."
+        " Available only when the policy type is Hour Based.",
+    )
+    accrual_rate_premium = fields.Float(
+        help="The additional amount of time (beyond the standard rate)"
+        "accrued per Premium Milestone of service."
+    )
+    accrual_rate_premium_minimum = fields.Integer(
+        string="Months of Employment Before Premium",
+        default=12,
+        help="Minimum number of months the employee must be employed before"
+        "the premium rate will start to accrue.",
+    )
+    accrual_rate_premium_milestone = fields.Integer(
+        string="Accrual Premium Milestone",
+        help="Number of milestone months after which the premium rate will be added.",
+    )
+    accrual_rate_max = fields.Float(
+        string="Maximum Accrual Rate",
+        required=True,
+        default=0.0,
+        help="The maximum amount of time that may accrue per year. Zero means the"
+        "amount may keep increasing indefinitely.",
+    )
+    job_ids = fields.One2many(
+        string="Jobs",
+        comodel_name="hr.policy.line.accrual.job",
+        inverse_name="policy_line_id",
+        readonly=True,
+        copy=False,
+    )
+
+    def pass_constraints(self, employee, dToday=None):
+
+        self.ensure_one()
+        if dToday is None:
+            dToday = date.today()
+
+        hireDate = employee.first_contract_date
+        delta = dToday - hireDate
+        if abs(delta.days) > self.minimum_employed_days:
+            return True
+        return False
+
+    def get_last_job_date(self):
+        """
+        @return: a datetime.date object representing the time the last job ran.
+        """
+
+        self.ensure_one()
+        job_ids = self.env["hr.policy.line.accrual.job"].search(
+            [("policy_line_id", "=", self.id)], order="name desc", limit=1
+        )
+        if len(job_ids) == 0:
+            return None
+
+        return job_ids[0].name
+
+    def calculate_and_deposit(self, employee, job=False, dToday=None, descr=None):
+
+        for rec in self:
+            amount = rec.do_calculation(employee, dToday)
+            if amount is False:
+                break
+            name = _("Calendar based accrual (%s)" % (self.name))
+            lines = self.accrual_id.deposit(employee.id, amount, date.today(), name)
+            if job:
+                for line in lines:
+                    job.write(
+                        {
+                            "accrual_line_ids": [(4, line.id)],
+                            "holiday_ids": [(4, line.leave_allocation_id.id)],
+                        }
+                    )
+
+    def do_calculation(self, employee, dToday=None):
+
+        self.ensure_one()
+
+        # The last day of the month for each month
+        month_last_day = {
+            1: 31,
+            2: 28,
+            3: 31,
+            4: 30,
+            5: 31,
+            6: 30,
+            7: 31,
+            8: 31,
+            9: 30,
+            10: 31,
+            11: 30,
+            12: 31,
+        }
+
+        if dToday is None:
+            dToday = date.today()
+        dHire = employee.first_contract_date
+        srvc_months = employee.get_months_service_to_date(dToday=dToday)
+        srvc_months = int(srvc_months)
+
+        if self.type != "calendar" or not self.pass_constraints(employee, dToday):
+            return False
+
+        if self.frequency_on_hire_date:
+            freq_week_day = dHire.weekday()
+            freq_month_day = dHire.day
+            freq_annual_month = dHire.month
+            freq_annual_day = dHire.day
+        else:
+            freq_week_day = self.frequency_week_day
+            freq_month_day = self.frequency_month_day
+            freq_annual_month = self.frequency_annual_month
+            freq_annual_day = self.frequency_annual_day
+
+        premium_amount = 0
+        if self.calculation_frequency == "weekly":
+            if dToday.weekday() != freq_week_day:
+                return False
+            freq_amount = float(self.accrual_rate) / 52.0
+            premium_amount = self._calculate_premium_weekly(srvc_months)
+        elif self.calculation_frequency == "monthly":
+            # When deciding to skip an employee account for actual month lengths if
+            # the frequency date is 31 and this month only has 30 days, go ahead and
+            # do the accrual on the last day of the month (i.e. the 30th). For
+            # February, on non-leap years execute accruals for the 29th on the 28th.
+            #
+            if (
+                dToday.day == month_last_day[dToday.month]
+                and freq_month_day > dToday.day
+            ):
+                if dToday.month != 2:
+                    freq_month_day = dToday.day
+                elif (
+                    dToday.month == 2
+                    and dToday.day == 28
+                    and (dToday + timedelta(days=+1)).day != 29
+                ):
+                    freq_month_day = dToday.day
+
+            if dToday.day != freq_month_day:
+                return False
+
+            freq_amount = float(self.accrual_rate) / 12.0
+            premium_amount = self._calculate_premium_monthly(srvc_months)
+        else:  # annual frequency
+            # On non-leap years execute Feb. 29 accruals on the 28th
+            #
+            if (
+                dToday.month == 2
+                and dToday.day == 28
+                and (dToday + timedelta(days=+1)).day != 29
+                and freq_annual_day > dToday.day
+            ):
+                freq_annual_day = dToday.day
+
+            if dToday.month != freq_annual_month and dToday.day != freq_annual_day:
+                return False
+
+            freq_amount = self.accrual_rate
+            premium_amount = self._calculate_premium_annual(srvc_months)
+
+        if self.accrual_rate_max == 0:
+            amount = freq_amount + premium_amount
+        else:
+            amount = min(freq_amount + premium_amount, self.accrual_rate_max)
+
+        return amount
+
+    def _calculate_premium_weekly(self, srvc_months):
+
+        self.ensure_one()
+        premium_amount = 0.0
+        if self.accrual_rate_premium_minimum <= srvc_months:
+            premium_amount = (
+                (
+                    max(
+                        0,
+                        srvc_months
+                        - self.accrual_rate_premium_minimum
+                        + self.accrual_rate_premium_milestone,
+                    )
+                )
+                // self.accrual_rate_premium_milestone
+                * self.accrual_rate_premium
+                / 52.0
+            )
+        return premium_amount
+
+    def _calculate_premium_monthly(self, srvc_months):
+
+        self.ensure_one()
+        premium_amount = 0.0
+        if self.accrual_rate_premium_minimum <= srvc_months:
+            premium_amount = (
+                (
+                    max(
+                        0,
+                        srvc_months
+                        - self.accrual_rate_premium_minimum
+                        + self.accrual_rate_premium_milestone,
+                    )
+                )
+                // self.accrual_rate_premium_milestone
+                * self.accrual_rate_premium
+                / 12.0
+            )
+        return premium_amount
+
+    def _calculate_premium_annual(self, srvc_months):
+
+        self.ensure_one()
+        premium_amount = 0.0
+        if self.accrual_rate_premium_minimum <= srvc_months:
+            premium_amount = (
+                (
+                    max(
+                        0,
+                        srvc_months
+                        - self.accrual_rate_premium_minimum
+                        + self.accrual_rate_premium_milestone,
+                    )
+                )
+                // self.accrual_rate_premium_milestone
+                * self.accrual_rate_premium
+            )
+        return premium_amount
diff --git a/payroll_policy_accrual/models/hr_policy_line_accrual_job.py b/payroll_policy_accrual/models/hr_policy_line_accrual_job.py
new file mode 100644
index 00000000..33fa53ac
--- /dev/null
+++ b/payroll_policy_accrual/models/hr_policy_line_accrual_job.py
@@ -0,0 +1,37 @@
+# Copyright (C) 2021 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class HrAccrualJob(models.Model):
+
+    _name = "hr.policy.line.accrual.job"
+    _description = "Accrual Policy Line Job Run"
+
+    name = fields.Date(string="Date", required=True, readonly=True)
+    execution_time = fields.Datetime(required=True, readonly=True)
+    end_time = fields.Datetime(readonly=True)
+    policy_line_id = fields.Many2one(
+        string="Accrual Policy Line",
+        comodel_name="hr.policy.line.accrual",
+        required=True,
+        readonly=True,
+    )
+    accrual_line_ids = fields.Many2many(
+        string="Accrual Lines",
+        comodel_name="hr.accrual.line",
+        relation="hr_policy_job_accrual_line_rel",
+        column1="job_id",
+        column2="accrual_line_id",
+        readonly=True,
+    )
+    holiday_ids = fields.Many2many(
+        string="Leave Allocation Requests",
+        comodel_name="hr.leave.allocation",
+        relation="hr_policy_job_holiday_rel",
+        column1="job_id",
+        column2="holiday_id",
+        readonly=True,
+    )
diff --git a/payroll_policy_accrual/readme/CREDITS.rst b/payroll_policy_accrual/readme/CREDITS.rst
new file mode 100644
index 00000000..d264bc7e
--- /dev/null
+++ b/payroll_policy_accrual/readme/CREDITS.rst
@@ -0,0 +1 @@
+* Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/payroll_policy_accrual/readme/DESCRIPTION.rst b/payroll_policy_accrual/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..c9e92a8c
--- /dev/null
+++ b/payroll_policy_accrual/readme/DESCRIPTION.rst
@@ -0,0 +1,8 @@
+Define Time Bank Accrual Policies
+=================================
+Define properties of a leave accrual policy. The accrued time is calculated
+based on the length of service of the employee. An additional premium may be
+added on the base rate based on additional months of service. This policy is ideal
+for annual leave accruals. If the type of accrual is 'Standard' time is accrued and
+withdrawn manually. However, if the type is 'Calendar' the time is accrued (and recorded)
+at a fixed frequency.
diff --git a/payroll_policy_accrual/security/ir.model.access.csv b/payroll_policy_accrual/security/ir.model.access.csv
new file mode 100644
index 00000000..d0f63809
--- /dev/null
+++ b/payroll_policy_accrual/security/ir.model.access.csv
@@ -0,0 +1,9 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_policy_accr_hr,access_hr_policy_accr,model_hr_policy_accrual,hr.group_hr_user,1,0,0,0
+access_hr_policy_line_accr_hr,access_hr_policy_line_accr,model_hr_policy_line_accrual,hr.group_hr_user,1,0,0,0
+access_hr_policy_accr_payroll,access_hr_policy_accr,model_hr_policy_accrual,payroll.group_payroll_user,1,0,0,0
+access_hr_policy_line_accr_payroll,access_hr_policy_line_accr,model_hr_policy_line_accrual,payroll.group_payroll_user,1,0,0,0
+access_hr_policy_accr_payrollm,access_hr_policy_accr,model_hr_policy_accrual,payroll.group_payroll_manager,1,1,1,1
+access_hr_policy_line_accr_payrollm,access_hr_policy_line_accr,model_hr_policy_line_accrual,payroll.group_payroll_manager,1,1,1,1
+access_hr_policy_line_accr_job_hr,access_hr_policy_line_accr_job,model_hr_policy_line_accrual_job,hr.group_hr_user,1,0,0,0
+access_hr_policy_line_accr_job_payroll,access_hr_policy_line_accr_job,model_hr_policy_line_accrual_job,payroll.group_payroll_user,1,0,0,0
diff --git a/payroll_policy_accrual/static/description/icon.png b/payroll_policy_accrual/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/payroll_policy_accrual/static/description/icon.png differ
diff --git a/payroll_policy_accrual/static/description/index.html b/payroll_policy_accrual/static/description/index.html
new file mode 100644
index 00000000..fe42b2fc
--- /dev/null
+++ b/payroll_policy_accrual/static/description/index.html
@@ -0,0 +1,414 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Time Accrual Policy</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="time-accrual-policy">
+<h1 class="title">Time Accrual Policy</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:b179d23d71f497934b2f080d4549d849b63340105e4e5ce627cf42d71482ad4b
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_policy_accrual"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<div class="section" id="define-time-bank-accrual-policies">
+<h1>Define Time Bank Accrual Policies</h1>
+<p>Define properties of a leave accrual policy. The accrued time is calculated
+based on the length of service of the employee. An additional premium may be
+added on the base rate based on additional months of service. This policy is ideal
+for annual leave accruals. If the type of accrual is ‘Standard’ time is accrued and
+withdrawn manually. However, if the type is ‘Calendar’ the time is accrued (and recorded)
+at a fixed frequency.</p>
+<p><strong>Table of contents</strong></p>
+</div>
+<div class="section" id="bug-tracker">
+<h1>Bug Tracker</h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_policy_accrual%0Aversion:%2014.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>Credits</h1>
+<div class="section" id="authors">
+<h2>Authors</h2>
+<ul class="simple">
+<li>TREVI Software</li>
+<li>Michael Telahun Makonnen</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2>Other credits</h2>
+<ul class="simple">
+<li>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2>Maintainers</h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_policy_accrual">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/payroll_policy_accrual/static/src/img/main_screenshot.png b/payroll_policy_accrual/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/payroll_policy_accrual/static/src/img/main_screenshot.png differ
diff --git a/payroll_policy_accrual/tests/__init__.py b/payroll_policy_accrual/tests/__init__.py
new file mode 100644
index 00000000..13476320
--- /dev/null
+++ b/payroll_policy_accrual/tests/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2021 TREVI Software
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import test_accrual_policy_line
diff --git a/payroll_policy_accrual/tests/test_accrual_policy_line.py b/payroll_policy_accrual/tests/test_accrual_policy_line.py
new file mode 100644
index 00000000..d4dc82a6
--- /dev/null
+++ b/payroll_policy_accrual/tests/test_accrual_policy_line.py
@@ -0,0 +1,178 @@
+# Copyright (C) 2021 TREVI Software
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from datetime import date, datetime, timedelta
+
+from dateutil.relativedelta import relativedelta
+
+from odoo import fields
+from odoo.tests import common
+
+
+class TestAccrualPolicy(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super(TestAccrualPolicy, cls).setUpClass()
+
+        cls.PolicyGroup = cls.env["hr.policy.group"]
+        cls.Policy = cls.env["hr.policy.accrual"]
+        cls.PolicyLine = cls.env["hr.policy.line.accrual"]
+        cls.AccrualJob = cls.env["hr.policy.line.accrual.job"]
+        cls.Accrual = cls.env["hr.accrual"]
+        cls.Employee = cls.env["hr.employee"]
+        cls.LeaveType = cls.env["hr.leave.type"]
+        cls.LeaveAlloction = cls.env["hr.leave.allocation"]
+
+    def create_contract(
+        self, eid, state, kanban_state, start, end=None, trial_end=None
+    ):
+        return self.env["hr.contract"].create(
+            {
+                "name": "Contract",
+                "employee_id": eid,
+                "state": state,
+                "kanban_state": kanban_state,
+                "wage": 1,
+                "date_start": start,
+                "trial_date_end": trial_end,
+                "date_end": end,
+            }
+        )
+
+    def apply_cron(self):
+        self.env.ref(
+            "payroll_policy_accrual.hr_accrual_policy_cron"
+        ).method_direct_trigger()
+
+    def test_get_latest_policy(self):
+        """Latest policy at given date should be returned"""
+
+        pMarch = self.Policy.create({"name": "P1", "date": date(2020, 3, 1)})
+        pDec = self.Policy.create({"name": "P1", "date": date(2020, 12, 1)})
+        pJan = self.Policy.create({"name": "P1", "date": date(2020, 1, 1)})
+        pg = self.PolicyGroup.create(
+            {
+                "name": "PGroup",
+                "accr_policy_ids": [(6, 0, [pMarch.id, pDec.id, pJan.id])],
+            }
+        )
+        ap = self.Policy.get_latest_policy(pg, date.today())
+
+        self.assertEqual(pDec, ap)
+
+    def test_get_latest_policy_with_future(self):
+        """Latest policy must not be in the future"""
+
+        pastDate = date.today() - relativedelta(days=5)
+        futureDate = date.today() + relativedelta(days=1)
+        pFuture = self.Policy.create({"name": "PF", "date": futureDate})
+        pPast = self.Policy.create({"name": "PP", "date": pastDate})
+        pg = self.PolicyGroup.create(
+            {
+                "name": "PGroup",
+                "accr_policy_ids": [(6, 0, [pFuture.id, pPast.id])],
+            }
+        )
+        ap = self.Policy.get_latest_policy(pg, date.today())
+
+        self.assertEqual(pPast, ap)
+
+    def test_constraint_employed_days(self):
+        """Verify correctly wheter an employee falls within employed days constraint"""
+
+        # Setup Employee past minimum days
+        start = date.today() - timedelta(days=100)
+        ee = self.Employee.create({"name": "John"})
+        cc = self.create_contract(ee.id, "draft", "done", start)
+        cc.signal_confirm()
+        # Setup Employee still in minimum days
+        start = date.today()
+        ee2 = self.Employee.create({"name": "Paul"})
+        cc2 = self.create_contract(ee2.id, "draft", "done", start)
+        cc2.signal_confirm()
+
+        # Create policy with minimum employed days = 30
+        aa = self.Accrual.create({"name": "ACCR"})
+        line = self.PolicyLine.create(
+            {
+                "name": "A",
+                "code": "A",
+                "accrual_id": aa.id,
+                "type": "standard",
+                "minimum_employed_days": 30,
+            }
+        )
+
+        # past min. days
+        self.assertTrue(line.pass_constraints(ee))
+        # still hasn't completed min days
+        self.assertFalse(line.pass_constraints(ee2))
+
+    def test_annual_accrual(self):
+        """Accrual created for employee after first month"""
+
+        # Setup Employee
+        start = date.today() - relativedelta(months=1)
+        dLastRun = date.today() - relativedelta(days=4)
+        dtLastRun = datetime.combine(dLastRun, datetime.min.time())
+        ee = self.Employee.create({"name": "John"})
+        cc = self.create_contract(ee.id, "draft", "done", start)
+        cc.signal_confirm()
+
+        # Create policy that accrues 24 days/year
+        lt = self.LeaveType.create({"name": "Leave type", "code": "LT"})
+        aa = self.Accrual.create({"name": "24 ANNUAL ACCR", "holiday_status_id": lt.id})
+        policy = self.Policy.create(
+            {
+                "name": "Annual leave",
+                "date": date.today(),
+            }
+        )
+        pl = self.PolicyLine.create(
+            {
+                "name": "Fixed",
+                "code": "FIX",
+                "accrual_id": aa.id,
+                "policy_id": policy.id,
+                "calculation_frequency": "monthly",
+                "frequency_on_hire_date": True,
+                "accrual_rate": 24,
+            }
+        )
+        pg = self.PolicyGroup.create(
+            {"name": "PG", "accr_policy_ids": [(6, 0, [policy.id])]}
+        )
+        cc.policy_group_id = pg.id
+
+        self.AccrualJob.create(
+            {"name": dLastRun, "execution_time": dtLastRun, "policy_line_id": pl.id}
+        )
+        self.assertEqual(0, len(aa.line_ids))
+
+        self.apply_cron()
+
+        self.assertEqual(1, len(aa.line_ids))
+        self.assertEqual(date.today(), aa.line_ids[0].date)
+        self.assertEqual(ee, aa.line_ids[0].employee_id)
+        self.assertEqual(
+            0, fields.Float.compare(aa.line_ids[0].amount, 2.0, precision_digits=2)
+        )
+        lva = self.LeaveAlloction.search(
+            [("employee_id", "=", ee.id), ("from_accrual", "=", True)]
+        )
+        self.assertEqual(1, len(lva))
+        self.assertEqual(
+            0,
+            fields.Float.compare(
+                aa.line_ids[0].amount, lva[0].number_of_days, precision_digits=2
+            ),
+        )
+        job = pl.job_ids.filtered(lambda j: j.name == start + relativedelta(months=1))
+        self.assertEqual(5, len(pl.job_ids))
+        self.assertEqual(1, len(job.accrual_line_ids))
+        self.assertEqual(1, len(job.holiday_ids))
+        self.assertEqual(job.holiday_ids[0], lva[0])
+        self.assertIn(job.holiday_ids[0].state, ["validate", "validate1"])
+        self.assertTrue(job.execution_time)
+        self.assertTrue(job.end_time)
+        self.assertGreater(job.end_time, pl.job_ids[0].execution_time)
diff --git a/payroll_policy_accrual/views/hr_policy_accrual_view.xml b/payroll_policy_accrual/views/hr_policy_accrual_view.xml
new file mode 100644
index 00000000..169feda1
--- /dev/null
+++ b/payroll_policy_accrual/views/hr_policy_accrual_view.xml
@@ -0,0 +1,248 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+
+        <!-- Policy Lines -->
+
+        <record id="accr_policy_line_tree_view" model="ir.ui.view">
+            <field name="name">hr.policy.line.accrual.tree</field>
+            <field name="model">hr.policy.line.accrual</field>
+            <field name="arch" type="xml">
+                <tree string="Accrual Policy Lines">
+                    <field name="name" />
+                    <field name="code" />
+                    <field name="type" />
+                    <field name="balance_on_payslip" />
+                    <field name="calculation_frequency" />
+                    <field name="accrual_rate" />
+                    <field name="accrual_rate_premium_minimum" />
+                    <field name="accrual_rate_premium" />
+                    <field name="accrual_rate_premium_milestone" />
+                </tree>
+            </field>
+        </record>
+
+        <record id="accr_policy_line_form_view" model="ir.ui.view">
+            <field name="name">hr.policy.line.accrual.form</field>
+            <field name="model">hr.policy.line.accrual</field>
+            <field name="arch" type="xml">
+                <form string="Accrual Policy Line">
+                    <sheet>
+                        <h1>
+                            <label for="name" string="Name" class="oe_edit_only" />
+                            <field name="name" />
+                        </h1>
+                        <h1>
+                            <label for="code" string="Code" class="oe_edit_only" />
+                            <field name="code" />
+                        </h1>
+                        <notebook>
+                            <page string="General">
+                                <group>
+                                    <group>
+                                        <field name="accrual_id" />
+                                        <field name="policy_id" />
+                                        <field name="type" />
+                                        <field name="balance_on_payslip" />
+                                        <field
+                                            name="calculation_frequency"
+                                            attrs="{'invisible': [('type', '!=', 'calendar')], 'required': [('type', '=', 'calendar')]}"
+                                        />
+                                        <field
+                                            name="frequency_on_hire_date"
+                                            attrs="{'invisible': [('type', '!=', 'calendar')]}"
+                                        />
+                                    </group>
+                                    <group>
+                                        <field name="minimum_employed_days" />
+                                        <field
+                                            name="accrual_rate"
+                                            attrs="{'invisible': [('type', '!=', 'calendar')], 'required': [('type', '=', 'calendar')]}"
+                                        />
+                                        <field
+                                            name="accrual_rate_hour"
+                                            attrs="{'invisible': [('type', '!=', 'hour')], 'required': [('type', '=', 'hour')]}"
+                                        />
+                                        <field
+                                            name="accrual_rate_premium_minimum"
+                                            attrs="{'invisible': [('type', '!=', 'calendar')]}"
+                                        />
+                                        <field
+                                            name="accrual_rate_premium"
+                                            attrs="{'invisible': [('type', '!=', 'calendar')]}"
+                                        />
+                                        <field
+                                            name="accrual_rate_premium_milestone"
+                                            attrs="{'invisible': [('type', '!=', 'calendar')]}"
+                                        />
+                                        <field name="accrual_rate_max" />
+                                    </group>
+                                </group>
+                                <group
+                                    string="Weekly Frequency"
+                                    attrs="{'invisible': ['|',('calculation_frequency','!=','weekly'),('frequency_on_hire_date','=',True)]}"
+                                >
+                                    <field
+                                        name="frequency_week_day"
+                                        attrs="{'invisible': [('calculation_frequency','!=','weekly')], 'required': [('calculation_frequency', '=','weekly')]}"
+                                    />
+                                </group>
+                                <group
+                                    string="Monthly Frequency"
+                                    attrs="{'invisible': ['|',('calculation_frequency','!=','monthly'),('frequency_on_hire_date','=',True)]}"
+                                >
+                                    <field
+                                        name="frequency_month_day"
+                                        attrs="{'invisible': [('calculation_frequency','!=','monthly')], 'required': [('calculation_frequency', '=','monthly'), ('frequency_on_hire_date', '=', False)]}"
+                                    />
+                                </group>
+                                <group
+                                    string="Annual Frequency"
+                                    attrs="{'invisible': ['|',('calculation_frequency','!=','annual'),('frequency_on_hire_date','=',True)]}"
+                                >
+                                    <field
+                                        name="frequency_annual_month"
+                                        attrs="{'invisible': [('calculation_frequency','!=','annual')], 'required': [('calculation_frequency', '=','annual')]}"
+                                    />
+                                    <field
+                                        name="frequency_annual_day"
+                                        attrs="{'invisible': [('calculation_frequency','!=','annual')], 'required': [('calculation_frequency', '=','annual')]}"
+                                    />
+                                </group>
+                            </page>
+                            <page string="Jobs">
+                                <group string="List of Jobs">
+                                    <field name="job_ids" nolabel="1">
+                                        <tree string="Jobs">
+                                            <field name="name" />
+                                            <field name="execution_time" />
+                                        </tree>
+                                    </field>
+                                </group>
+                            </page>
+                        </notebook>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="open_accr_policy_line" model="ir.actions.act_window">
+            <field name="name">Timebank Accrual Policy Lines</field>
+            <field name="res_model">hr.policy.line.accrual</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem
+            action="open_accr_policy_line"
+            id="menu_hr_accr_policy_line"
+            parent="payroll_policy_group.menu_hr_policy_configuration"
+            sequence="12"
+        />
+
+        <!-- Policy -->
+
+        <record id="accr_policy_view_tree" model="ir.ui.view">
+            <field name="name">hr.policy.accrual.tree</field>
+            <field name="model">hr.policy.accrual</field>
+            <field name="arch" type="xml">
+                <tree string="Accrual Policies">
+                    <field name="name" />
+                    <field name="date" />
+                </tree>
+            </field>
+        </record>
+
+        <record id="accr_policy_view_form" model="ir.ui.view">
+            <field name="name">hr.policy.accrual.form</field>
+            <field name="model">hr.policy.accrual</field>
+            <field name="arch" type="xml">
+                <form string="Accrual Policy">
+                    <sheet>
+                        <h1>
+                            <label for="name" string="Name" class="oe_edit_only" />
+                            <field name="name" />
+                        </h1>
+                        <group>
+                            <group>
+                                <field name="date" />
+                            </group>
+                            <group />
+                        </group>
+                        <group string="Accrual Lines">
+                            <field name="line_ids" nolabel="1" editable="top" />
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="open_accr_policy" model="ir.actions.act_window">
+            <field name="name">Timebank Accrual Policies</field>
+            <field name="res_model">hr.policy.accrual</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem
+            action="open_accr_policy"
+            id="menu_hr_accr_policy"
+            parent="payroll_policy_group.menu_hr_policy_configuration"
+            sequence="10"
+        />
+
+        <!-- Policy Group -->
+
+        <record id="policy_group_view_form" model="ir.ui.view">
+            <field name="name">hr.policy.group.form.accrinherit</field>
+            <field name="model">hr.policy.group</field>
+            <field
+                name="inherit_id"
+                ref="payroll_policy_group.policy_group_view_form"
+            />
+            <field name="arch" type="xml">
+                <xpath expr="//group[@name='right']" position="inside">
+                    <field name="accr_policy_ids" />
+                </xpath>
+            </field>
+        </record>
+
+        <!-- Accrual Line Job -->
+
+        <record id="accrual_line_job_form_view" model="ir.ui.view">
+            <field name="name">hr.policy.line.accrual.job.form</field>
+            <field name="model">hr.policy.line.accrual.job</field>
+            <field name="arch" type="xml">
+                <form string="Accrual Line Job">
+                    <group>
+                        <group>
+                            <field name="name" />
+                            <field name="policy_line_id" />
+                        </group>
+                        <group>
+                            <field name="execution_time" />
+                        </group>
+                    </group>
+                    <newline />
+                    <group>
+                        <group string="Accrual Lines">
+                            <field name="accrual_line_ids" nolabel="1">
+                                <tree string="Accrual Lines">
+                                    <field name="employee_id" />
+                                    <field name="amount" />
+                                </tree>
+                            </field>
+                        </group>
+                        <group string="Holiday Allocation Requests">
+                            <field name="holiday_ids" nolabel="1">
+                                <tree string="Holidays">
+                                    <field name="employee_id" />
+                                    <field name="holiday_status_id" />
+                                    <field name="number_of_days" />
+                                    <field name="state" />
+                                </tree>
+                            </field>
+                        </group>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/payroll_policy_group/README.rst b/payroll_policy_group/README.rst
new file mode 100644
index 00000000..1cc26cf2
--- /dev/null
+++ b/payroll_policy_group/README.rst
@@ -0,0 +1,68 @@
+=====================
+Payroll Policy Groups
+=====================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:f6e76a1eb73107beaed7e2f16234924e06aa1aa31d6f5da3cafc42bbd7269352
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_policy_group
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+Define a collection of policies, such as Overtime, Absence, and Accruals that are attached to an employee contract. These policies are applied during payroll processing.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Changelog
+=========
+
+14.0.1.0.1 (2022-04-10)
+~~~~~~~~~~~~~~~~~~~~~~~
+* [FIX] Fixed a visual artifact in contract form view of the Payroll Policy Group field
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_policy_group%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+* Michael Telahun Makonnen
+
+Other credits
+~~~~~~~~~~~~~
+
+* Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_policy_group>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/payroll_policy_group/__init__.py b/payroll_policy_group/__init__.py
new file mode 100644
index 00000000..1cc5116e
--- /dev/null
+++ b/payroll_policy_group/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import models
diff --git a/payroll_policy_group/__manifest__.py b/payroll_policy_group/__manifest__.py
new file mode 100644
index 00000000..c08603b7
--- /dev/null
+++ b/payroll_policy_group/__manifest__.py
@@ -0,0 +1,27 @@
+# Copyright (C) 2021 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    "name": "Payroll Policy Groups",
+    "summary": "Group payroll policies and assign them to contracts",
+    "version": "15.0.1.0.0",
+    "category": "Payroll",
+    "author": "TREVI Software, Michael Telahun Makonnen",
+    "license": "AGPL-3",
+    "images": ["static/src/img/main_screenshot.png"],
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "hr_contract",
+        "hr_contract_values_payroll",
+        "payroll",
+    ],
+    "data": [
+        "security/ir.model.access.csv",
+        "views/hr_policy_group_view.xml",
+    ],
+    "demo": [
+        "data/hr_payroll_policy_demo.xml",
+    ],
+    "installable": True,
+}
diff --git a/payroll_policy_group/data/hr_payroll_policy_demo.xml b/payroll_policy_group/data/hr_payroll_policy_demo.xml
new file mode 100644
index 00000000..8c6b6f02
--- /dev/null
+++ b/payroll_policy_group/data/hr_payroll_policy_demo.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+
+        <record id="policygroup_demo" model="hr.policy.group">
+            <field name="name">Demo group for all employees</field>
+        </record>
+
+        <!-- Amend demo contracts -->
+
+        <record id="hr_contract.hr_contract_admin" model="hr.contract">
+            <field name="policy_group_id" ref="policygroup_demo" />
+        </record>
+        <record id="hr_contract.hr_contract_al" model="hr.contract">
+            <field name="policy_group_id" ref="policygroup_demo" />
+        </record>
+        <record id="hr_contract.hr_contract_mit" model="hr.contract">
+            <field name="policy_group_id" ref="policygroup_demo" />
+        </record>
+        <record id="hr_contract.hr_contract_stw" model="hr.contract">
+            <field name="policy_group_id" ref="policygroup_demo" />
+        </record>
+        <record id="hr_contract.hr_contract_qdp" model="hr.contract">
+            <field name="policy_group_id" ref="policygroup_demo" />
+        </record>
+        <record id="hr_contract.hr_contract_han" model="hr.contract">
+            <field name="policy_group_id" ref="policygroup_demo" />
+        </record>
+        <record id="hr_contract.hr_contract_niv" model="hr.contract">
+            <field name="policy_group_id" ref="policygroup_demo" />
+        </record>
+        <record id="hr_contract.hr_contract_jth" model="hr.contract">
+            <field name="policy_group_id" ref="policygroup_demo" />
+        </record>
+        <record id="hr_contract.hr_contract_chs" model="hr.contract">
+            <field name="policy_group_id" ref="policygroup_demo" />
+        </record>
+        <record id="hr_contract.hr_contract_jve" model="hr.contract">
+            <field name="policy_group_id" ref="policygroup_demo" />
+        </record>
+        <record id="hr_contract.hr_contract_fme" model="hr.contract">
+            <field name="policy_group_id" ref="policygroup_demo" />
+        </record>
+        <record id="hr_contract.hr_contract_fpi" model="hr.contract">
+            <field name="policy_group_id" ref="policygroup_demo" />
+        </record>
+        <record id="hr_contract.hr_contract_vad" model="hr.contract">
+            <field name="policy_group_id" ref="policygroup_demo" />
+        </record>
+
+    </data>
+</odoo>
diff --git a/payroll_policy_group/i18n/payroll_policy_group.pot b/payroll_policy_group/i18n/payroll_policy_group.pot
new file mode 100644
index 00000000..f2b152a5
--- /dev/null
+++ b/payroll_policy_group/i18n/payroll_policy_group.pot
@@ -0,0 +1,100 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* payroll_policy_group
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: payroll_policy_group
+#: model:ir.model.fields,field_description:payroll_policy_group.field_hr_policy_group__contract_ids
+msgid "Contracts"
+msgstr ""
+
+#. module: payroll_policy_group
+#: model:ir.model.fields,field_description:payroll_policy_group.field_hr_policy_group__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: payroll_policy_group
+#: model:ir.model.fields,field_description:payroll_policy_group.field_hr_policy_group__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: payroll_policy_group
+#: model:ir.model.fields,field_description:payroll_policy_group.field_hr_contract__display_name
+#: model:ir.model.fields,field_description:payroll_policy_group.field_hr_contract_init__display_name
+#: model:ir.model.fields,field_description:payroll_policy_group.field_hr_policy_group__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: payroll_policy_group
+#: model:ir.model,name:payroll_policy_group.model_hr_contract
+msgid "Employee Contract"
+msgstr ""
+
+#. module: payroll_policy_group
+#: model:ir.model,name:payroll_policy_group.model_hr_policy_group
+msgid "HR Policy Group"
+msgstr ""
+
+#. module: payroll_policy_group
+#: model:ir.model.fields,field_description:payroll_policy_group.field_hr_contract__id
+#: model:ir.model.fields,field_description:payroll_policy_group.field_hr_contract_init__id
+#: model:ir.model.fields,field_description:payroll_policy_group.field_hr_policy_group__id
+msgid "ID"
+msgstr ""
+
+#. module: payroll_policy_group
+#: model:ir.model,name:payroll_policy_group.model_hr_contract_init
+msgid "Initial Contract Settings"
+msgstr ""
+
+#. module: payroll_policy_group
+#: model:ir.model.fields,field_description:payroll_policy_group.field_hr_contract____last_update
+#: model:ir.model.fields,field_description:payroll_policy_group.field_hr_contract_init____last_update
+#: model:ir.model.fields,field_description:payroll_policy_group.field_hr_policy_group____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: payroll_policy_group
+#: model:ir.model.fields,field_description:payroll_policy_group.field_hr_policy_group__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: payroll_policy_group
+#: model:ir.model.fields,field_description:payroll_policy_group.field_hr_policy_group__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: payroll_policy_group
+#: model:ir.model.fields,field_description:payroll_policy_group.field_hr_policy_group__name
+#: model_terms:ir.ui.view,arch_db:payroll_policy_group.policy_group_view_form
+msgid "Name"
+msgstr ""
+
+#. module: payroll_policy_group
+#: model:ir.ui.menu,name:payroll_policy_group.menu_hr_policy_configuration
+msgid "Policies"
+msgstr ""
+
+#. module: payroll_policy_group
+#: model:ir.model.fields,field_description:payroll_policy_group.field_hr_contract__policy_group_id
+#: model:ir.model.fields,field_description:payroll_policy_group.field_hr_contract_init__policy_group_id
+#: model_terms:ir.ui.view,arch_db:payroll_policy_group.policy_group_view_form
+msgid "Policy Group"
+msgstr ""
+
+#. module: payroll_policy_group
+#: model:ir.actions.act_window,name:payroll_policy_group.open_policy_group
+#: model:ir.ui.menu,name:payroll_policy_group.menu_hr_policy_group
+#: model_terms:ir.ui.view,arch_db:payroll_policy_group.policy_group_view_tree
+msgid "Policy Groups"
+msgstr ""
diff --git a/payroll_policy_group/models/__init__.py b/payroll_policy_group/models/__init__.py
new file mode 100644
index 00000000..ac8a7e34
--- /dev/null
+++ b/payroll_policy_group/models/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import hr_policy_group
diff --git a/payroll_policy_group/models/hr_policy_group.py b/payroll_policy_group/models/hr_policy_group.py
new file mode 100644
index 00000000..5eb823db
--- /dev/null
+++ b/payroll_policy_group/models/hr_policy_group.py
@@ -0,0 +1,46 @@
+# Copyright (C) 2021 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class PolicyGroup(models.Model):
+
+    _name = "hr.policy.group"
+    _description = "HR Policy Group"
+
+    name = fields.Char(required=True)
+    contract_ids = fields.One2many(
+        string="Contracts", comodel_name="hr.contract", inverse_name="policy_group_id"
+    )
+
+
+class ContractInit(models.Model):
+
+    _inherit = "hr.contract.init"
+
+    policy_group_id = fields.Many2one(
+        string="Policy Group",
+        comodel_name="hr.policy.group",
+    )
+
+
+class HrContract(models.Model):
+
+    _inherit = "hr.contract"
+
+    @api.model
+    def _get_policy_group(self):
+
+        res = False
+        init = self.get_latest_initial_values()
+        if init is not None and init.policy_group_id:
+            res = init.policy_group_id.id
+        return res
+
+    policy_group_id = fields.Many2one(
+        string="Policy Group",
+        comodel_name="hr.policy.group",
+        default=_get_policy_group,
+    )
diff --git a/payroll_policy_group/readme/CREDITS.rst b/payroll_policy_group/readme/CREDITS.rst
new file mode 100644
index 00000000..d264bc7e
--- /dev/null
+++ b/payroll_policy_group/readme/CREDITS.rst
@@ -0,0 +1 @@
+* Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/payroll_policy_group/readme/DESCRIPTION.rst b/payroll_policy_group/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..a3dd8039
--- /dev/null
+++ b/payroll_policy_group/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+Define a collection of policies, such as Overtime, Absence, and Accruals that are attached to an employee contract. These policies are applied during payroll processing.
diff --git a/payroll_policy_group/readme/HISTORY.rst b/payroll_policy_group/readme/HISTORY.rst
new file mode 100644
index 00000000..ed0c6875
--- /dev/null
+++ b/payroll_policy_group/readme/HISTORY.rst
@@ -0,0 +1,3 @@
+14.0.1.0.1 (2022-04-10)
+~~~~~~~~~~~~~~~~~~~~~~~
+* [FIX] Fixed a visual artifact in contract form view of the Payroll Policy Group field
diff --git a/payroll_policy_group/security/ir.model.access.csv b/payroll_policy_group/security/ir.model.access.csv
new file mode 100644
index 00000000..7e5dee66
--- /dev/null
+++ b/payroll_policy_group/security/ir.model.access.csv
@@ -0,0 +1,4 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_policy_group_hro,access_hr_policy_group,model_hr_policy_group,hr.group_hr_user,1,0,0,0
+access_hr_policy_group_payrolluser,access_hr_policy_group,model_hr_policy_group,payroll.group_payroll_user,1,0,0,0
+access_hr_policy_group_payroll,access_hr_policy_group,model_hr_policy_group,payroll.group_payroll_manager,1,1,1,1
diff --git a/payroll_policy_group/static/description/icon.png b/payroll_policy_group/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/payroll_policy_group/static/description/icon.png differ
diff --git a/payroll_policy_group/static/description/index.html b/payroll_policy_group/static/description/index.html
new file mode 100644
index 00000000..a7c593ed
--- /dev/null
+++ b/payroll_policy_group/static/description/index.html
@@ -0,0 +1,430 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Payroll Policy Groups</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="payroll-policy-groups">
+<h1 class="title">Payroll Policy Groups</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:f6e76a1eb73107beaed7e2f16234924e06aa1aa31d6f5da3cafc42bbd7269352
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_policy_group"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<p>Define a collection of policies, such as Overtime, Absence, and Accruals that are attached to an employee contract. These policies are applied during payroll processing.</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="toc-entry-1">Changelog</a><ul>
+<li><a class="reference internal" href="#section-1" id="toc-entry-2">14.0.1.0.1 (2022-04-10)</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-3">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-4">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-5">Authors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-6">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-7">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="changelog">
+<h1><a class="toc-backref" href="#toc-entry-1">Changelog</a></h1>
+<div class="section" id="section-1">
+<h2><a class="toc-backref" href="#toc-entry-2">14.0.1.0.1 (2022-04-10)</a></h2>
+<ul class="simple">
+<li>[FIX] Fixed a visual artifact in contract form view of the Payroll Policy Group field</li>
+</ul>
+</div>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_policy_group%0Aversion:%2014.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="#toc-entry-4">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-5">Authors</a></h2>
+<ul class="simple">
+<li>TREVI Software</li>
+<li>Michael Telahun Makonnen</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-6">Other credits</a></h2>
+<ul class="simple">
+<li>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_policy_group">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/payroll_policy_group/static/src/img/main_screenshot.png b/payroll_policy_group/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/payroll_policy_group/static/src/img/main_screenshot.png differ
diff --git a/payroll_policy_group/views/hr_policy_group_view.xml b/payroll_policy_group/views/hr_policy_group_view.xml
new file mode 100644
index 00000000..0ab2e370
--- /dev/null
+++ b/payroll_policy_group/views/hr_policy_group_view.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+
+        <!-- Policy Groups Configuration Submenu -->
+        <menuitem
+            id="menu_hr_policy_configuration"
+            name="Policies"
+            parent="payroll.payroll_menu_configuration"
+            groups="payroll.group_payroll_manager"
+            sequence="40"
+        />
+
+        <!-- Policy Group -->
+
+        <record id="policy_group_view_tree" model="ir.ui.view">
+            <field name="name">hr.policy.group.tree</field>
+            <field name="model">hr.policy.group</field>
+            <field name="arch" type="xml">
+                <tree string="Policy Groups">
+                    <field name="name" />
+                </tree>
+            </field>
+        </record>
+
+        <record id="policy_group_view_form" model="ir.ui.view">
+            <field name="name">hr.policy.group.form</field>
+            <field name="model">hr.policy.group</field>
+            <field name="arch" type="xml">
+                <form string="Policy Group">
+                    <h1>
+                        <label for="name" string="Name" class="oe_edit_only" />
+                        <field name="name" />
+                    </h1>
+                    <group>
+                        <group name="left" />
+                        <group name="right" />
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="open_policy_group" model="ir.actions.act_window">
+            <field name="name">Policy Groups</field>
+            <field name="res_model">hr.policy.group</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem
+            action="open_policy_group"
+            id="menu_hr_policy_group"
+            parent="menu_hr_policy_configuration"
+            sequence="5"
+        />
+
+        <!-- Contract -->
+
+        <record id="hr_contract_view_form" model="ir.ui.view">
+            <field name="name">hr.contract.form.inherit</field>
+            <field name="model">hr.contract</field>
+            <field name="inherit_id" ref="hr_contract.hr_contract_view_form" />
+            <field name="arch" type="xml">
+                <data>
+                    <xpath
+                        expr="//group[@name='salary_and_advantages']"
+                        position="inside"
+                    >
+                        <field name="policy_group_id" required="1" />
+                    </xpath>
+                </data>
+            </field>
+        </record>
+
+        <!-- Initial Contract Settings -->
+
+        <record id="view_contract_init_tree" model="ir.ui.view">
+            <field name="name">hr.contract.init.tree.policy_group</field>
+            <field name="model">hr.contract.init</field>
+            <field
+                name="inherit_id"
+                ref="hr_contract_values_payroll.view_contract_init_tree"
+            />
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='struct_id']" position="after">
+                    <field name="policy_group_id" />
+                </xpath>
+            </field>
+        </record>
+
+        <record id="view_contract_init_form" model="ir.ui.view">
+            <field name="name">hr.contract.init.form.policy_group</field>
+            <field name="model">hr.contract.init</field>
+            <field
+                name="inherit_id"
+                ref="hr_contract_values_payroll.view_contract_init_form"
+            />
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='struct_id']" position="after">
+                    <field name="policy_group_id" />
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/payroll_policy_ot/README.rst b/payroll_policy_ot/README.rst
new file mode 100644
index 00000000..d7cd2120
--- /dev/null
+++ b/payroll_policy_ot/README.rst
@@ -0,0 +1,65 @@
+===============
+Overtime Policy
+===============
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:eb3c8d6057c9e22602754dd39f2e69e772719407bf5eddd9b765990613458c02
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_policy_ot
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+This module defines properties of an overtime policy, such as:
+  * Type (daily, weekly, or holiday)
+  * Rate (multiplier of base wage)
+  * Active Hours
+  * Accrual to time bank
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_policy_ot%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+* Michael Telahun Makonnen
+
+Other credits
+~~~~~~~~~~~~~
+
+* Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_policy_ot>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/payroll_policy_ot/__init__.py b/payroll_policy_ot/__init__.py
new file mode 100644
index 00000000..1cc5116e
--- /dev/null
+++ b/payroll_policy_ot/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import models
diff --git a/payroll_policy_ot/__manifest__.py b/payroll_policy_ot/__manifest__.py
new file mode 100644
index 00000000..db281407
--- /dev/null
+++ b/payroll_policy_ot/__manifest__.py
@@ -0,0 +1,25 @@
+# Copyright (C) 2021 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    "name": "Overtime Policy",
+    "summary": "Assign over-time policies to a policy group",
+    "version": "15.0.1.0.0",
+    "category": "Generic Modules/Human Resources",
+    "author": "TREVI Software, Michael Telahun Makonnen",
+    "license": "AGPL-3",
+    "images": ["static/src/img/main_screenshot.png"],
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "hr",
+        "payroll_policy_accrual",
+        "payroll_policy_group",
+        "payroll",
+    ],
+    "data": [
+        "security/ir.model.access.csv",
+        "views/hr_policy_ot_view.xml",
+    ],
+    "installable": True,
+}
diff --git a/payroll_policy_ot/i18n/payroll_policy_ot.pot b/payroll_policy_ot/i18n/payroll_policy_ot.pot
new file mode 100644
index 00000000..2e1ad7e4
--- /dev/null
+++ b/payroll_policy_ot/i18n/payroll_policy_ot.pot
@@ -0,0 +1,224 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* payroll_policy_ot
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: payroll_policy_ot
+#: model_terms:ir.ui.view,arch_db:payroll_policy_ot.ot_policy_line_form_view
+msgid "Accrual"
+msgstr ""
+
+#. module: payroll_policy_ot
+#: model:ir.model.fields,field_description:payroll_policy_ot.field_hr_policy_line_ot__accrual_policy_line_id
+msgid "Accrual Policy Line"
+msgstr ""
+
+#. module: payroll_policy_ot
+#: model:ir.model.fields,field_description:payroll_policy_ot.field_hr_policy_line_ot__accrual_rate
+msgid "Accrual Rate"
+msgstr ""
+
+#. module: payroll_policy_ot
+#: model:ir.model.fields,field_description:payroll_policy_ot.field_hr_policy_line_ot__active_after
+msgid "Active After"
+msgstr ""
+
+#. module: payroll_policy_ot
+#: model:ir.model.fields,field_description:payroll_policy_ot.field_hr_policy_line_ot__active_end_time
+msgid "Active End Time"
+msgstr ""
+
+#. module: payroll_policy_ot
+#: model:ir.model.fields,field_description:payroll_policy_ot.field_hr_policy_line_ot__active_start_time
+msgid "Active Start Time"
+msgstr ""
+
+#. module: payroll_policy_ot
+#: model:ir.model.fields,field_description:payroll_policy_ot.field_hr_policy_line_ot__code
+#: model_terms:ir.ui.view,arch_db:payroll_policy_ot.ot_policy_line_form_view
+msgid "Code"
+msgstr ""
+
+#. module: payroll_policy_ot
+#: model:ir.model.fields,field_description:payroll_policy_ot.field_hr_policy_line_ot__create_uid
+#: model:ir.model.fields,field_description:payroll_policy_ot.field_hr_policy_ot__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: payroll_policy_ot
+#: model:ir.model.fields,field_description:payroll_policy_ot.field_hr_policy_line_ot__create_date
+#: model:ir.model.fields,field_description:payroll_policy_ot.field_hr_policy_ot__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: payroll_policy_ot
+#: model:ir.model.fields.selection,name:payroll_policy_ot.selection__hr_policy_line_ot__type__daily
+msgid "Daily"
+msgstr ""
+
+#. module: payroll_policy_ot
+#: model:ir.model.fields,field_description:payroll_policy_ot.field_hr_policy_group__display_name
+#: model:ir.model.fields,field_description:payroll_policy_ot.field_hr_policy_line_ot__display_name
+#: model:ir.model.fields,field_description:payroll_policy_ot.field_hr_policy_ot__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: payroll_policy_ot
+#: model:ir.model.fields,field_description:payroll_policy_ot.field_hr_policy_ot__date
+msgid "Effective Date"
+msgstr ""
+
+#. module: payroll_policy_ot
+#: model:ir.model,name:payroll_policy_ot.model_hr_policy_group
+msgid "HR Policy Group"
+msgstr ""
+
+#. module: payroll_policy_ot
+#: model:ir.model.fields,field_description:payroll_policy_ot.field_hr_policy_group__id
+#: model:ir.model.fields,field_description:payroll_policy_ot.field_hr_policy_line_ot__id
+#: model:ir.model.fields,field_description:payroll_policy_ot.field_hr_policy_ot__id
+msgid "ID"
+msgstr ""
+
+#. module: payroll_policy_ot
+#: model:ir.model.fields,field_description:payroll_policy_ot.field_hr_policy_group____last_update
+#: model:ir.model.fields,field_description:payroll_policy_ot.field_hr_policy_line_ot____last_update
+#: model:ir.model.fields,field_description:payroll_policy_ot.field_hr_policy_ot____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: payroll_policy_ot
+#: model:ir.model.fields,field_description:payroll_policy_ot.field_hr_policy_line_ot__write_uid
+#: model:ir.model.fields,field_description:payroll_policy_ot.field_hr_policy_ot__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: payroll_policy_ot
+#: model:ir.model.fields,field_description:payroll_policy_ot.field_hr_policy_line_ot__write_date
+#: model:ir.model.fields,field_description:payroll_policy_ot.field_hr_policy_ot__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: payroll_policy_ot
+#: model:ir.model.fields,field_description:payroll_policy_ot.field_hr_policy_line_ot__accrual_max
+msgid "Maximum Accrual"
+msgstr ""
+
+#. module: payroll_policy_ot
+#: model:ir.model.fields,field_description:payroll_policy_ot.field_hr_policy_line_ot__accrual_min
+msgid "Minimum Accrual"
+msgstr ""
+
+#. module: payroll_policy_ot
+#: model:ir.model.fields,help:payroll_policy_ot.field_hr_policy_line_ot__active_after
+msgid "Minutes after which this policy applies"
+msgstr ""
+
+#. module: payroll_policy_ot
+#: model:ir.model.fields,help:payroll_policy_ot.field_hr_policy_line_ot__rate
+msgid "Multiplier of employee wage."
+msgstr ""
+
+#. module: payroll_policy_ot
+#: model:ir.model.fields,field_description:payroll_policy_ot.field_hr_policy_line_ot__name
+#: model:ir.model.fields,field_description:payroll_policy_ot.field_hr_policy_ot__name
+#: model_terms:ir.ui.view,arch_db:payroll_policy_ot.ot_policy_line_form_view
+#: model_terms:ir.ui.view,arch_db:payroll_policy_ot.ot_policy_view_form
+msgid "Name"
+msgstr ""
+
+#. module: payroll_policy_ot
+#: model:ir.model,name:payroll_policy_ot.model_hr_policy_ot
+msgid "Over-time payroll policy"
+msgstr ""
+
+#. module: payroll_policy_ot
+#: model:ir.model,name:payroll_policy_ot.model_hr_policy_line_ot
+msgid "Over-time payroll policy line"
+msgstr ""
+
+#. module: payroll_policy_ot
+#: model_terms:ir.ui.view,arch_db:payroll_policy_ot.ot_policy_line_tree_view
+#: model_terms:ir.ui.view,arch_db:payroll_policy_ot.ot_policy_view_form
+msgid "Overtime Lines"
+msgstr ""
+
+#. module: payroll_policy_ot
+#: model:ir.actions.act_window,name:payroll_policy_ot.open_ot_policy
+#: model:ir.ui.menu,name:payroll_policy_ot.menu_hr_ot_policy
+#: model_terms:ir.ui.view,arch_db:payroll_policy_ot.ot_policy_view_tree
+msgid "Overtime Policies"
+msgstr ""
+
+#. module: payroll_policy_ot
+#: model:ir.model.fields,field_description:payroll_policy_ot.field_hr_policy_group__ot_policy_ids
+#: model_terms:ir.ui.view,arch_db:payroll_policy_ot.ot_policy_line_form_view
+#: model_terms:ir.ui.view,arch_db:payroll_policy_ot.ot_policy_view_form
+msgid "Overtime Policy"
+msgstr ""
+
+#. module: payroll_policy_ot
+#: model:ir.model.fields,field_description:payroll_policy_ot.field_hr_policy_line_ot__policy_id
+msgid "Policy"
+msgstr ""
+
+#. module: payroll_policy_ot
+#: model:ir.model.fields,field_description:payroll_policy_ot.field_hr_policy_ot__line_ids
+msgid "Policy Lines"
+msgstr ""
+
+#. module: payroll_policy_ot
+#: model:ir.model.fields.selection,name:payroll_policy_ot.selection__hr_policy_line_ot__type__holiday
+msgid "Public Holiday"
+msgstr ""
+
+#. module: payroll_policy_ot
+#: model:ir.model.fields,field_description:payroll_policy_ot.field_hr_policy_line_ot__rate
+msgid "Rate"
+msgstr ""
+
+#. module: payroll_policy_ot
+#: model:ir.model.fields.selection,name:payroll_policy_ot.selection__hr_policy_line_ot__type__restday
+msgid "Rest Day"
+msgstr ""
+
+#. module: payroll_policy_ot
+#: model:ir.model.fields,field_description:payroll_policy_ot.field_hr_policy_line_ot__tz
+msgid "Time Zone"
+msgstr ""
+
+#. module: payroll_policy_ot
+#: model:ir.model.fields,help:payroll_policy_ot.field_hr_policy_line_ot__active_end_time
+#: model:ir.model.fields,help:payroll_policy_ot.field_hr_policy_line_ot__active_start_time
+msgid "Time in 24 hour time format"
+msgstr ""
+
+#. module: payroll_policy_ot
+#: model:ir.model.fields,field_description:payroll_policy_ot.field_hr_policy_line_ot__type
+msgid "Type"
+msgstr ""
+
+#. module: payroll_policy_ot
+#: model:ir.model.fields,help:payroll_policy_ot.field_hr_policy_line_ot__code
+msgid "Use this code in the salary rules."
+msgstr ""
+
+#. module: payroll_policy_ot
+#: model:ir.model.fields.selection,name:payroll_policy_ot.selection__hr_policy_line_ot__type__weekly
+msgid "Weekly"
+msgstr ""
+
+#. module: payroll_policy_ot
+#: model:ir.model.fields,field_description:payroll_policy_ot.field_hr_policy_line_ot__weekly_working_days
+msgid "Weekly Working Days"
+msgstr ""
diff --git a/payroll_policy_ot/models/__init__.py b/payroll_policy_ot/models/__init__.py
new file mode 100644
index 00000000..594b9c02
--- /dev/null
+++ b/payroll_policy_ot/models/__init__.py
@@ -0,0 +1,7 @@
+# Copyright (C) 2021 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import hr_policy_ot
+from . import hr_policy_line_ot
+from . import hr_policy_group
diff --git a/payroll_policy_ot/models/hr_policy_group.py b/payroll_policy_ot/models/hr_policy_group.py
new file mode 100644
index 00000000..adaaf77f
--- /dev/null
+++ b/payroll_policy_ot/models/hr_policy_group.py
@@ -0,0 +1,19 @@
+# Copyright (C) 2021 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class PolicyGroup(models.Model):
+
+    _name = "hr.policy.group"
+    _inherit = "hr.policy.group"
+
+    ot_policy_ids = fields.Many2many(
+        string="Overtime Policy",
+        comodel_name="hr.policy.ot",
+        relation="hr_policy_group_ot_rel",
+        column1="group_id",
+        column2="ot_id",
+    )
diff --git a/payroll_policy_ot/models/hr_policy_line_ot.py b/payroll_policy_ot/models/hr_policy_line_ot.py
new file mode 100644
index 00000000..f471adec
--- /dev/null
+++ b/payroll_policy_ot/models/hr_policy_line_ot.py
@@ -0,0 +1,46 @@
+# Copyright (C) 2021 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from pytz import common_timezones
+
+from odoo import api, fields, models
+
+
+class PolicyLineOt(models.Model):
+
+    _name = "hr.policy.line.ot"
+    _description = "Over-time payroll policy line"
+
+    @api.model
+    def _tz_list(self):
+
+        res = tuple()
+        for name in common_timezones:
+            res += ((name, name),)
+        return res
+
+    name = fields.Char(size=64, required=True)
+    policy_id = fields.Many2one(comodel_name="hr.policy.ot", string="Policy")
+    type = fields.Selection(
+        selection=[
+            ("daily", "Daily"),
+            ("weekly", "Weekly"),
+            ("restday", "Rest Day"),
+            ("holiday", "Public Holiday"),
+        ],
+        required=True,
+    )
+    weekly_working_days = fields.Integer()
+    active_after = fields.Integer(help="Minutes after which this policy applies")
+    active_start_time = fields.Char(size=5, help="Time in 24 hour time format")
+    active_end_time = fields.Char(size=5, help="Time in 24 hour time format")
+    tz = fields.Selection(selection=_tz_list, string="Time Zone")
+    rate = fields.Float(required=True, default=1, help="Multiplier of employee wage.")
+    accrual_policy_line_id = fields.Many2one(
+        string="Accrual Policy Line", comodel_name="hr.policy.line.accrual"
+    )
+    accrual_rate = fields.Float(digits="Accruals")
+    accrual_min = fields.Float(string="Minimum Accrual", digits="Accruals")
+    accrual_max = fields.Float(string="Maximum Accrual", digits="Accruals")
+    code = fields.Char(required=True, help="Use this code in the salary rules.")
diff --git a/payroll_policy_ot/models/hr_policy_ot.py b/payroll_policy_ot/models/hr_policy_ot.py
new file mode 100644
index 00000000..4786b0be
--- /dev/null
+++ b/payroll_policy_ot/models/hr_policy_ot.py
@@ -0,0 +1,85 @@
+# Copyright (C) 2021 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class PolicyOt(models.Model):
+
+    _name = "hr.policy.ot"
+    _description = "Over-time payroll policy"
+    _order = "date desc"
+
+    name = fields.Char(size=128, required=True)
+    date = fields.Date(string="Effective Date", required=True)
+    line_ids = fields.One2many(
+        string="Policy Lines",
+        comodel_name="hr.policy.line.ot",
+        inverse_name="policy_id",
+    )
+
+    def get_codes(self):
+
+        res = []
+        for policy in self:
+            for line in policy.line_ids:
+                res.append(
+                    (
+                        line.code,
+                        line.name,
+                        line.type,
+                        line.rate,
+                        line.accrual_policy_line_id.id,
+                        line.accrual_policy_line_id.code,
+                        line.accrual_rate,
+                        line.accrual_min,
+                        line.accrual_max,
+                    )
+                )
+        return res
+
+    def daily_codes(self):
+
+        res = []
+        for policy in self:
+            for line in policy.line_ids:
+                if line.type == "daily":
+                    res.append((line.code, line.name))
+        return res
+
+    def restday_codes(self):
+
+        res = []
+        for policy in self:
+            for line in policy.line_ids:
+                if line.type == "weekly" and line.weekly_working_days > 0:
+                    res.append((line.code, line.name))
+        return res
+
+    def restday2_codes(self):
+
+        res = []
+        for policy in self:
+            for line in policy.line_ids:
+                if line.type == "restday":
+                    res.append((line.code, line.name))
+        return res
+
+    def weekly_codes(self):
+
+        res = []
+        for policy in self:
+            for line in policy.line_ids:
+                if line.type == "weekly" and line.weekly_working_days > 0:
+                    res.append((line.code, line.name))
+        return res
+
+    def holiday_codes(self):
+
+        res = []
+        for policy in self:
+            for line in policy.line_ids:
+                if line.type == "holiday":
+                    res.append((line.code, line.name))
+        return res
diff --git a/payroll_policy_ot/readme/CREDITS.rst b/payroll_policy_ot/readme/CREDITS.rst
new file mode 100644
index 00000000..d264bc7e
--- /dev/null
+++ b/payroll_policy_ot/readme/CREDITS.rst
@@ -0,0 +1 @@
+* Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/payroll_policy_ot/readme/DESCRIPTION.rst b/payroll_policy_ot/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..7edfc02d
--- /dev/null
+++ b/payroll_policy_ot/readme/DESCRIPTION.rst
@@ -0,0 +1,5 @@
+This module defines properties of an overtime policy, such as:
+  * Type (daily, weekly, or holiday)
+  * Rate (multiplier of base wage)
+  * Active Hours
+  * Accrual to time bank
diff --git a/payroll_policy_ot/security/ir.model.access.csv b/payroll_policy_ot/security/ir.model.access.csv
new file mode 100644
index 00000000..2e7753bb
--- /dev/null
+++ b/payroll_policy_ot/security/ir.model.access.csv
@@ -0,0 +1,7 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_policy_line_ot_hro,access_hr_policy_line_ot,model_hr_policy_line_ot,hr.group_hr_user,1,0,0,0
+access_hr_policy_line_ot_payrolluser,access_hr_policy_line_ot,model_hr_policy_line_ot,payroll.group_payroll_user,1,0,0,0
+access_hr_policy_line_ot_payroll,access_hr_policy_line_ot,model_hr_policy_line_ot,payroll.group_payroll_manager,1,1,1,1
+access_hr_policy_ot_hro,access_hr_policy_line_ot,model_hr_policy_ot,hr.group_hr_user,1,0,0,0
+access_hr_policy_ot_payrolluser,access_hr_policy_line_ot,model_hr_policy_ot,payroll.group_payroll_user,1,0,0,0
+access_hr_policy_ot_payroll,access_hr_policy_line_ot,model_hr_policy_ot,payroll.group_payroll_manager,1,1,1,1
diff --git a/payroll_policy_ot/static/description/icon.png b/payroll_policy_ot/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/payroll_policy_ot/static/description/icon.png differ
diff --git a/payroll_policy_ot/static/description/index.html b/payroll_policy_ot/static/description/index.html
new file mode 100644
index 00000000..8cac6173
--- /dev/null
+++ b/payroll_policy_ot/static/description/index.html
@@ -0,0 +1,426 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Overtime Policy</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="overtime-policy">
+<h1 class="title">Overtime Policy</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:eb3c8d6057c9e22602754dd39f2e69e772719407bf5eddd9b765990613458c02
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_policy_ot"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<dl class="docutils">
+<dt>This module defines properties of an overtime policy, such as:</dt>
+<dd><ul class="first last simple">
+<li>Type (daily, weekly, or holiday)</li>
+<li>Rate (multiplier of base wage)</li>
+<li>Active Hours</li>
+<li>Accrual to time bank</li>
+</ul>
+</dd>
+</dl>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-4">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_policy_ot%0Aversion:%2014.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="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>TREVI Software</li>
+<li>Michael Telahun Makonnen</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-4">Other credits</a></h2>
+<ul class="simple">
+<li>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_policy_ot">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/payroll_policy_ot/static/src/img/main_screenshot.png b/payroll_policy_ot/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/payroll_policy_ot/static/src/img/main_screenshot.png differ
diff --git a/payroll_policy_ot/tests/__init__.py b/payroll_policy_ot/tests/__init__.py
new file mode 100644
index 00000000..7498bd5e
--- /dev/null
+++ b/payroll_policy_ot/tests/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2021 TREVI Software
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import test_payroll_policy_access
diff --git a/payroll_policy_ot/tests/test_payroll_policy_access.py b/payroll_policy_ot/tests/test_payroll_policy_access.py
new file mode 100644
index 00000000..269bbfac
--- /dev/null
+++ b/payroll_policy_ot/tests/test_payroll_policy_access.py
@@ -0,0 +1,158 @@
+# Copyright (C) 2021 TREVI Software
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from datetime import date
+
+from odoo.exceptions import AccessError
+from odoo.tests import common, new_test_user
+
+
+class TestPolicyAccess(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super(TestPolicyAccess, cls).setUpClass()
+
+        cls.OtPolicy = cls.env["hr.policy.ot"]
+        cls.OtPolicyLine = cls.env["hr.policy.line.ot"]
+        cls.ot_policy = cls.OtPolicy.create({"name": "OT1", "date": date.today()})
+        cls.ot_line = cls.OtPolicyLine.create(
+            {
+                "name": "Line1",
+                "code": "L1",
+                "type": "daily",
+                "policy_id": cls.ot_policy.id,
+            }
+        )
+        # Payroll Manager user
+        cls.userPM = new_test_user(
+            cls.env,
+            login="pm",
+            groups="base.group_user,payroll.group_payroll_manager",
+            name="Payroll manager",
+            email="ric@example.com",
+        )
+        # Payroll user
+        cls.userPU = new_test_user(
+            cls.env,
+            login="pu",
+            groups="base.group_user,payroll.group_payroll_user",
+            name="Payroll manager",
+            email="ric@example.com",
+        )
+        # HR Manager
+        cls.userHRM = new_test_user(
+            cls.env,
+            login="hrm",
+            groups="base.group_user,hr.group_hr_manager",
+            name="Payroll manager",
+            email="ric@example.com",
+        )
+
+    def test_hrm_access(self):
+        """HRM only has read access"""
+
+        # Create fails
+        with self.assertRaises(AccessError):
+            self.OtPolicy.with_user(self.userHRM).create(
+                {"name": "OT2", "date": date.today()}
+            )
+            self.OtPolicyLine.with_user(self.userHRM).create(
+                {"name": "line2", "type": "daily"}
+            )
+        # Unlink fails
+        with self.assertRaises(AccessError):
+            self.ot_policy.with_user(self.userHRM).unlink()
+            self.ot_line.with_user(self.userHRM).unlink()
+        # Read succeeds
+        try:
+            self.OtPolicy.with_user(self.userHRM).browse(self.ot_policy.id)
+        except AccessError:
+            self.fail("Caught an unexpected exception reading hr.policy.ot")
+        try:
+            self.OtPolicyLine.with_user(self.userHRM).browse(self.ot_policy.id)
+        except AccessError:
+            self.fail("Caught an unexpected exception reading hr.policy.line.ot")
+        # Write fails
+        with self.assertRaises(AccessError):
+            self.OtPolicy.with_user(self.userHRM).browse(self.ot_policy.id).write(
+                {"name": "OT3"}
+            )
+            self.OtPolicyLine.with_user(self.userHRM).browse(self.ot_line.id).write(
+                {"name": "line3"}
+            )
+
+    def test_payroll_user_access(self):
+        """Payroll User only has read access"""
+
+        # Create fails
+        with self.assertRaises(AccessError):
+            self.OtPolicy.with_user(self.userPU).create(
+                {"name": "OT2", "date": date.today()}
+            )
+            self.OtPolicyLine.with_user(self.userPU).create(
+                {"name": "line2", "type": "daily"}
+            )
+        # Unlink fails
+        with self.assertRaises(AccessError):
+            self.ot_policy.with_user(self.userPU).unlink()
+            self.ot_line.with_user(self.userPU).unlink()
+        # Read succeeds
+        try:
+            self.OtPolicy.with_user(self.userPU).browse(self.ot_policy.id)
+        except AccessError:
+            self.fail("Caught an unexpected exception reading hr.policy.ot")
+        try:
+            self.OtPolicyLine.with_user(self.userPU).browse(self.ot_policy.id)
+        except AccessError:
+            self.fail("Caught an unexpected exception reading hr.policy.line.ot")
+        # Write fails
+        with self.assertRaises(AccessError):
+            self.OtPolicy.with_user(self.userPU).browse(self.ot_policy.id).write(
+                {"name": "OT3"}
+            )
+            self.OtPolicyLine.with_user(self.userPU).browse(self.ot_line.id).write(
+                {"name": "line3"}
+            )
+
+    def test_payroll_manager_access(self):
+        """Payroll Manager has complete access"""
+
+        # Read succeeds
+        try:
+            self.OtPolicy.with_user(self.userPM).browse(self.ot_policy.id)
+        except AccessError:
+            self.fail("Caught an unexpected exception reading hr.policy.ot")
+        try:
+            self.OtPolicyLine.with_user(self.userPM).browse(self.ot_line.id)
+        except AccessError:
+            self.fail("Caught an unexpected exception reading hr.policy.line.ot")
+        # Write succeeds
+        try:
+            self.OtPolicy.with_user(self.userPM).browse(self.ot_policy.id).write(
+                {"name": "XX"}
+            )
+        except AccessError:
+            self.fail("Caught an unexpected exception writing hr.policy.ot")
+        try:
+            self.OtPolicyLine.with_user(self.userPM).browse(self.ot_line.id).write(
+                {"name": "XX"}
+            )
+        except AccessError:
+            self.fail("Caught an unexpected exception writing hr.policy.line.ot")
+        # Create/Unlink succeeds
+        try:
+            ot = self.OtPolicy.with_user(self.userPM).create(
+                {"name": "OT test pm", "date": date.today()}
+            )
+            ot.unlink()
+        except AccessError:
+            self.fail("Caught unexpected exception creating/unlinking hr.policy.ot")
+        try:
+            line = self.OtPolicyLine.with_user(self.userPM).create(
+                {"name": "line test pm", "type": "daily", "code": "A"}
+            )
+            line.unlink()
+        except AccessError:
+            self.fail(
+                "Caught unexpected exception creating/unlinking hr.policy.line.ot"
+            )
diff --git a/payroll_policy_ot/views/hr_policy_ot_view.xml b/payroll_policy_ot/views/hr_policy_ot_view.xml
new file mode 100644
index 00000000..6bbcb603
--- /dev/null
+++ b/payroll_policy_ot/views/hr_policy_ot_view.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+        <!-- Policy Lines -->
+        <record id="ot_policy_line_tree_view" model="ir.ui.view">
+            <field name="name">hr.policy.line.ot.tree</field>
+            <field name="model">hr.policy.line.ot</field>
+            <field name="arch" type="xml">
+                <tree string="Overtime Lines">
+                    <field name="name" />
+                    <field name="code" />
+                    <field name="type" />
+                    <field name="rate" />
+                    <field name="weekly_working_days" />
+                    <field name="active_after" />
+                    <field name="active_start_time" />
+                    <field name="active_end_time" />
+                </tree>
+            </field>
+        </record>
+        <record id="ot_policy_line_form_view" model="ir.ui.view">
+            <field name="name">hr.policy.line.ot.form</field>
+            <field name="model">hr.policy.line.ot</field>
+            <field name="arch" type="xml">
+                <form string="Overtime Policy">
+                    <sheet>
+                        <h1>
+                            <label for="name" string="Name" class="oe_edit_only" />
+                            <field name="name" />
+                        </h1>
+                        <h1>
+                            <label for="code" string="Code" class="oe_edit_only" />
+                            <field name="code" />
+                        </h1>
+                        <group>
+                            <group>
+                                <field name="type" />
+                                <field
+                                    name="weekly_working_days"
+                                    attrs="{'invisible': [('type','!=','weekly')]}"
+                                />
+                                <field
+                                    name="active_after"
+                                    attrs="{'required': [('type','=','weekly')]}"
+                                />
+                                <field name="rate" />
+                            </group>
+                            <group>
+                                <field
+                                    name="active_start_time"
+                                    attrs="{'invisible': [('type','!=','daily')]}"
+                                />
+                                <field
+                                    name="active_end_time"
+                                    attrs="{'invisible': [('type','!=','daily')]}"
+                                />
+                                <field
+                                    name="tz"
+                                    attrs="{'invisible': [('type','!=','daily')], 'required': ['&amp;', ('active_start_time', '!=',''), ('active_start_time', '!=', False)]}"
+                                />
+                                <field name="policy_id" />
+                            </group>
+                            <group string="Accrual">
+                                <field name="accrual_policy_line_id" />
+                                <field name="accrual_rate" />
+                                <field name="accrual_min" />
+                                <field name="accrual_max" />
+                            </group>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+        <!-- Overtime Policy -->
+        <record id="ot_policy_view_tree" model="ir.ui.view">
+            <field name="name">hr.policy.ot.tree</field>
+            <field name="model">hr.policy.ot</field>
+            <field name="arch" type="xml">
+                <tree string="Overtime Policies">
+                    <field name="name" />
+                    <field name="date" />
+                </tree>
+            </field>
+        </record>
+        <record id="ot_policy_view_form" model="ir.ui.view">
+            <field name="name">hr.policy.ot.form</field>
+            <field name="model">hr.policy.ot</field>
+            <field name="arch" type="xml">
+                <form string="Overtime Policy">
+                    <sheet>
+                        <h1>
+                            <label for="name" string="Name" class="oe_edit_only" />
+                            <field name="name" />
+                        </h1>
+                        <group>
+                            <group>
+                                <field name="date" />
+                            </group>
+                            <group />
+                        </group>
+                        <group string="Overtime Lines">
+                            <field name="line_ids" nolabel="1" editable="top" />
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+        <record id="open_ot_policy" model="ir.actions.act_window">
+            <field name="name">Overtime Policies</field>
+            <field name="res_model">hr.policy.ot</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem
+            action="open_ot_policy"
+            id="menu_hr_ot_policy"
+            parent="payroll_policy_group.menu_hr_policy_configuration"
+            sequence="10"
+        />
+        <!-- Policy Group -->
+        <record id="policy_group_view_form" model="ir.ui.view">
+            <field name="name">hr.policy.group.form.otinherit</field>
+            <field name="model">hr.policy.group</field>
+            <field
+                name="inherit_id"
+                ref="payroll_policy_group.policy_group_view_form"
+            />
+            <field name="arch" type="xml">
+                <xpath expr="//group[@name='left']" position="inside">
+                    <field name="ot_policy_ids" />
+                </xpath>
+            </field>
+        </record>
+    </data>
+</odoo>
diff --git a/payroll_policy_payslip/README.rst b/payroll_policy_payslip/README.rst
new file mode 100644
index 00000000..f0f6b2c3
--- /dev/null
+++ b/payroll_policy_payslip/README.rst
@@ -0,0 +1,62 @@
+======================
+Payroll Policy Payslip
+======================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:a257f67c9d5c45c857d06d2a03dc6d7e96565d525afd78ff6a7116b393bd096d
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_policy_payslip
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+This module applies payslip processing using payroll policies. It processes an employee's payslip
+using the presense, absence, OT, and accrual policies defined in the system.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_policy_payslip%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+* Michael Telahun Makonnen
+
+Other credits
+~~~~~~~~~~~~~
+
+* Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_policy_payslip>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/payroll_policy_payslip/__init__.py b/payroll_policy_payslip/__init__.py
new file mode 100644
index 00000000..35bb139f
--- /dev/null
+++ b/payroll_policy_payslip/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2022 TREVI Software
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import models
diff --git a/payroll_policy_payslip/__manifest__.py b/payroll_policy_payslip/__manifest__.py
new file mode 100644
index 00000000..b10772fe
--- /dev/null
+++ b/payroll_policy_payslip/__manifest__.py
@@ -0,0 +1,29 @@
+# Copyright (C) 2022 TREVI Software
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    "name": "Payroll Policy Payslip",
+    "summary": "Apply payroll policies duing payslip processing",
+    "version": "15.0.1.0.0",
+    "category": "Payroll",
+    "author": "TREVI Software, Michael Telahun Makonnen",
+    "license": "AGPL-3",
+    "images": ["static/src/img/main_screenshot.png"],
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "hr_accrual_bank",
+        "hr_attendance",
+        "hr_attendance_day",
+        "hr_holidays_public",
+        "payroll",
+        "payroll_policy_absence",
+        "payroll_policy_accrual",
+        "payroll_policy_group",
+        "payroll_policy_ot",
+        "payroll_policy_presence",
+    ],
+    "data": [
+        "security/payroll_policy_payslip_security.xml",
+    ],
+    "installable": True,
+}
diff --git a/payroll_policy_payslip/i18n/payroll_policy_payslip.pot b/payroll_policy_payslip/i18n/payroll_policy_payslip.pot
new file mode 100644
index 00000000..14e4484f
--- /dev/null
+++ b/payroll_policy_payslip/i18n/payroll_policy_payslip.pot
@@ -0,0 +1,100 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* payroll_policy_payslip
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: payroll_policy_payslip
+#: model:ir.model.fields,field_description:payroll_policy_payslip.field_hr_payslip_worked_days__accrual_policy_line_id
+msgid "Accrual Policy"
+msgstr ""
+
+#. module: payroll_policy_payslip
+#: model:ir.model,name:payroll_policy_payslip.model_hr_attendance
+msgid "Attendance"
+msgstr ""
+
+#. module: payroll_policy_payslip
+#: code:addons/payroll_policy_payslip/models/hr_attendance.py:0
+#: code:addons/payroll_policy_payslip/models/hr_attendance.py:0
+#, python-format
+msgid "Attendance Error!"
+msgstr ""
+
+#. module: payroll_policy_payslip
+#: model:ir.model.fields,field_description:payroll_policy_payslip.field_hr_attendance__display_name
+#: model:ir.model.fields,field_description:payroll_policy_payslip.field_hr_payslip__display_name
+#: model:ir.model.fields,field_description:payroll_policy_payslip.field_hr_payslip_worked_days__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: payroll_policy_payslip
+#: code:addons/payroll_policy_payslip/models/hr_attendance.py:0
+#, python-format
+msgid ""
+"Employee: %s\n"
+"Sign-in(s): %s\n"
+"Sign-out(s): %s"
+msgstr ""
+
+#. module: payroll_policy_payslip
+#: model:ir.model.fields,field_description:payroll_policy_payslip.field_hr_attendance__id
+#: model:ir.model.fields,field_description:payroll_policy_payslip.field_hr_payslip__id
+#: model:ir.model.fields,field_description:payroll_policy_payslip.field_hr_payslip_worked_days__id
+msgid "ID"
+msgstr ""
+
+#. module: payroll_policy_payslip
+#: model:ir.model.fields,field_description:payroll_policy_payslip.field_hr_attendance____last_update
+#: model:ir.model.fields,field_description:payroll_policy_payslip.field_hr_payslip____last_update
+#: model:ir.model.fields,field_description:payroll_policy_payslip.field_hr_payslip_worked_days____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: payroll_policy_payslip
+#: code:addons/payroll_policy_payslip/models/hr_payslip.py:0
+#, python-format
+msgid "Maximum Possible Working Hours"
+msgstr ""
+
+#. module: payroll_policy_payslip
+#: code:addons/payroll_policy_payslip/models/hr_attendance.py:0
+#, python-format
+msgid "Number of Sign-in and Sign-out records do not match!"
+msgstr ""
+
+#. module: payroll_policy_payslip
+#: model:ir.model,name:payroll_policy_payslip.model_hr_payslip
+msgid "Payslip"
+msgstr ""
+
+#. module: payroll_policy_payslip
+#: model:ir.model,name:payroll_policy_payslip.model_hr_payslip_worked_days
+msgid "Payslip Worked Days"
+msgstr ""
+
+#. module: payroll_policy_payslip
+#: model:ir.model.fields,field_description:payroll_policy_payslip.field_hr_payslip_worked_days__rate
+msgid "Rate"
+msgstr ""
+
+#. module: payroll_policy_payslip
+#: code:addons/payroll_policy_payslip/models/hr_attendance.py:0
+#, python-format
+msgid "There is a sign-in with no corresponding sign-out for %s on %s"
+msgstr ""
+
+#. module: payroll_policy_payslip
+#: code:addons/payroll_policy_payslip/models/hr_attendance.py:0
+#, python-format
+msgid "There is not a final sign-out record for %s on %s"
+msgstr ""
diff --git a/payroll_policy_payslip/models/__init__.py b/payroll_policy_payslip/models/__init__.py
new file mode 100644
index 00000000..01cab115
--- /dev/null
+++ b/payroll_policy_payslip/models/__init__.py
@@ -0,0 +1,6 @@
+# Copyright (C) 2022 TREVI Software
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import hr_attendance
+from . import hr_payslip
+from . import hr_payslip_worked_days
diff --git a/payroll_policy_payslip/models/hr_attendance.py b/payroll_policy_payslip/models/hr_attendance.py
new file mode 100644
index 00000000..29d3c70c
--- /dev/null
+++ b/payroll_policy_payslip/models/hr_attendance.py
@@ -0,0 +1,374 @@
+# Copyright (C) 2013,2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import datetime, timedelta
+
+from pytz import timezone, utc
+
+from odoo import _, api, exceptions, models
+
+
+class HrAttendance(models.Model):
+    _inherit = "hr.attendance"
+
+    def punches_list_init(self, contract, dFrom, dTo):
+        """Returns a list containing, for each attendance in range dFrom - dTo, a
+        tuple containing: check_in and check_out time."""
+
+        res = []
+
+        # Convert datetime to tz aware datetime according to tz in pay period schedule,
+        # then to UTC, and then to naive datetime for comparison with values in db.
+        #
+        # Also, includue records 48 hours previous to and 48 hours after the desired
+        # dates so that any requests for rollover, sessions, etc can be satisfied
+        #
+        employee = contract.employee_id
+        tz_template = timezone(employee.tz)
+        dtFrom = datetime.combine(dFrom, datetime.min.time())
+        dtFrom += timedelta(hours=-48)
+        dtTo = datetime.combine(dTo, datetime.min.time())
+        dtTo += timedelta(hours=+48)
+        utcdtFrom = tz_template.localize(dtFrom, is_dst=False).astimezone(utc)
+        utcdtTo = tz_template.localize(dtTo, is_dst=False).astimezone(utc)
+        utcdtDay = utcdtFrom
+        utcdtDayEnd = utcdtTo + timedelta(days=1, seconds=-1)
+        ndtDay = utcdtDay.replace(tzinfo=None)
+        ndtDayEnd = utcdtDayEnd.replace(tzinfo=None)
+
+        attendances = self.search(
+            [
+                ("employee_id", "=", employee.id),
+                "&",
+                ("check_in", ">=", ndtDay),
+                ("check_in", "<=", ndtDayEnd),
+            ],
+            order="check_in",
+        )
+
+        for a in attendances:
+            res.append((a.check_in, a.check_out))
+
+        return res
+
+    @api.model
+    def punches_list_search(self, ndtFrom, ndtTo, punches_list):
+
+        res = []
+        for check_in, check_out in punches_list:
+            if check_in >= ndtFrom and check_in <= ndtTo:
+                res.append((check_in, check_out))
+        return res
+
+    @api.model
+    def _calculate_rollover(self, utcdt, rollover_hours):
+
+        # XXX - assume time part of utcdt is already set to midnight
+        return utcdt + timedelta(hours=int(rollover_hours))
+
+    @api.model
+    def _get_ot_rollover_hours(self, contract):
+        return 0
+
+    @api.model
+    def _get_ot_rollover_gap(self, contract):
+        return 0
+
+    @api.model
+    def _check_punches_crossover_yesterday(
+        self, dtRollover, ot_max_rollover_gap, sin, sout
+    ):
+        if (len(sout) - len(sin)) == 0:
+
+            if len(sout) > 0:
+                dtSout = sout[0]
+                dtSin = sin[0]
+                if dtSout > dtRollover and (dtSout < dtSin):
+                    sin = [dtRollover] + sin
+                elif dtSout < dtSin:
+                    sout = sout[1:]
+                    # There may be another session that starts within the rollover period
+                    if (
+                        dtSin < dtRollover
+                        and float((dtSin - dtSout).seconds) / 60.0
+                        >= ot_max_rollover_gap
+                    ):
+                        sin = sin[1:]
+                        sout = sout[1:]
+            else:
+                return [], []
+        elif (len(sout) - len(sin)) == 1:
+            dtSout = sout[0]
+            if dtSout > dtRollover:
+                sin = [dtRollover] + sin
+            else:
+                sout = sout[1:]
+                # There may be another session that starts within the rollover period
+                dtSin = False
+                if len(sin) > 0:
+                    dtSin = sin[0]
+                if (
+                    dtSin
+                    and dtSin < dtRollover
+                    and float((dtSin - dtSout).seconds) / 60.0 >= ot_max_rollover_gap
+                ):
+                    sin = sin[1:]
+                    sout = sout[1:]
+        return (sin, sout)
+
+    @api.model
+    def _check_punches_crossover_from_midnight(
+        self, ot_max_rollover_gap, ndtDay, punches_list, sin, sout
+    ):
+        if len(sout) > 0:
+            ndtSin = sin[0]
+            if (ndtSin - timedelta(minutes=ot_max_rollover_gap)) <= ndtDay:
+                my_list4 = self.punches_list_search(
+                    ndtDay + timedelta(hours=-24),
+                    ndtDay + timedelta(seconds=-1),
+                    punches_list,
+                )
+                if len(my_list4) > 0 and (my_list4[-1][1] is not False):
+                    ndtSout = my_list4[-1][0]
+                    if ndtSin <= ndtSout + timedelta(minutes=ot_max_rollover_gap):
+                        sin = sin[1:]
+                        sout = sout[1:]
+        return (sin, sout)
+
+    @api.model
+    def _check_punches_crossover_tomorrow(
+        self,
+        contract,
+        dDay,
+        dtRollover,
+        ot_max_rollover_gap,
+        ndtDayEnd,
+        punches_list,
+        sin,
+        sout,
+    ):
+        if (len(sin) - len(sout)) == 1:
+
+            employee = contract.employee_id
+            my_list2 = self.punches_list_search(
+                ndtDayEnd + timedelta(seconds=+1),
+                ndtDayEnd + timedelta(days=1),
+                punches_list,
+            )
+            if len(my_list2) == 0:
+                raise exceptions.ValidationError(
+                    _("Attendance Error!"),
+                    _("There is not a final sign-out record for %s on %s")
+                    % (employee.name, dDay),
+                )
+
+            check_in, check_out = my_list2[0]
+            if check_out is not False:
+                dtSout = check_out
+                if dtSout > dtRollover:
+                    sout.append(dtRollover)
+                else:
+                    sout.append(check_out)
+                    # There may be another session within the OT max. rollover gap
+                    if len(my_list2) > 1:
+                        dtSin = check_in
+                        if float((dtSin - dtSout).seconds) / 60.0 < ot_max_rollover_gap:
+                            sin.append(my_list2[1][0])
+                            sout.append(my_list2[1][1])
+
+            else:
+                raise exceptions.ValidationError(
+                    _("Attendance Error!"),
+                    _("There is a sign-in with no corresponding sign-out for %s on %s")
+                    % (employee.name, dDay),
+                )
+        return (sin, sout)
+
+    @api.model
+    def _check_punches_crossover_past_midnight(
+        self, ot_max_rollover_gap, ndtDayEnd, punches_list, sin, sout
+    ):
+        if len(sout) > 0:
+            ndtSout = sout[-1]
+            if (ndtDayEnd - timedelta(minutes=ot_max_rollover_gap)) <= ndtSout:
+                my_list3 = self.punches_list_search(
+                    ndtDayEnd + timedelta(seconds=+1),
+                    ndtDayEnd + timedelta(hours=+24),
+                    punches_list,
+                )
+                if len(my_list3) > 0:
+                    check_in, check_out = my_list3[0]
+                    ndtSin = check_in
+                    if ndtSin <= ndtSout + timedelta(minutes=ot_max_rollover_gap):
+                        sin.append(check_in)
+                        sout.append(check_out)
+        return (sin, sout)
+
+    @api.model
+    def _get_normalized_punches(self, contract, dDay, punches_list):
+        """Returns a tuple containing two lists: in punches, and
+        corresponding out punches"""
+
+        #
+        # We assume that:
+        #    - No dangling sign-in or sign-out
+        #
+
+        # Convert datetime to tz aware datetime according to employee timezone,
+        # then to UTC, and then to naive datetime for comparison with values in db.
+        #
+        employee = contract.employee_id
+        dt = datetime.combine(dDay, datetime.min.time())
+        utcdtDay = timezone(employee.tz).localize(dt, is_dst=False).astimezone(utc)
+        utcdtDayEnd = utcdtDay + timedelta(days=1, seconds=-1)
+        ndtDay = utcdtDay.replace(tzinfo=None)
+        ndtDayEnd = utcdtDayEnd.replace(tzinfo=None)
+        my_list = self.punches_list_search(ndtDay, ndtDayEnd, punches_list)
+        if len(my_list) == 0:
+            return [], []
+
+        # We are assuming attendances are normalized: (in, out, in, out, ...)
+        sin = []
+        sout = []
+        for check_in, check_out in my_list:
+            sin.append(check_in)
+            sout.append(check_out)
+
+        if len(sin) == 0 and len(sout) == 0:
+            return [], []
+
+        # CHECKS AT THE START OF THE DAY
+        # Remove sessions that would have been included in yesterday's attendance.
+
+        # We may have a a session *FROM YESTERDAY* that crossed-over into
+        # today. If it is greater than the maximum continuous hours allowed into
+        # the next day (as configured in the pay period schedule), then count
+        # only the difference between the actual and the maximum continuous
+        # hours.
+        #
+        ot_max_rollover_hours = self._get_ot_rollover_hours(employee)
+        ot_max_rollover_gap = self._get_ot_rollover_gap(employee)
+        dtRollover = (
+            self._calculate_rollover(utcdtDay, ot_max_rollover_hours)
+        ).replace(tzinfo=None)
+        sin, sout = self._check_punches_crossover_yesterday(
+            dtRollover, ot_max_rollover_gap, sin, sout
+        )
+
+        # If the first sign-in was within the rollover gap *AT* midnight check to
+        # see if there are any sessions within the rollover gap before it.
+        #
+        sin, sout = self._check_punches_crossover_from_midnight(
+            ot_max_rollover_gap, ndtDay, punches_list, sin, sout
+        )
+
+        # CHECKS AT THE END OF THE DAY
+        # Include sessions from tomorrow that should be included in today's attendance.
+
+        # We may have a session that crosses the midnight boundary. If so, add it to today's
+        # session.
+        #
+        dtRollover = (
+            self._calculate_rollover(ndtDay + timedelta(days=1), ot_max_rollover_hours)
+        ).replace(tzinfo=None)
+        sin, sout = self._check_punches_crossover_tomorrow(
+            contract,
+            dDay,
+            dtRollover,
+            ot_max_rollover_gap,
+            ndtDayEnd,
+            punches_list,
+            sin,
+            sout,
+        )
+
+        # If the last sign-out was within the rollover gap *BEFORE* midnight check to
+        # see if there are any sessions within the rollover gap after it.
+        #
+        sin, sout = self._check_punches_crossover_past_midnight(
+            ot_max_rollover_gap, ndtDayEnd, punches_list, sin, sout
+        )
+
+        return sin, sout
+
+    def _on_day(self, contract, dDay, punches_list=None):
+        """Return two lists: the first is sign-in times, and the second is
+        corresponding sign-outs."""
+
+        if punches_list is None:
+            punches_list = self.punches_list_init(contract, dDay, dDay)
+
+        sin, sout = self._get_normalized_punches(contract, dDay, punches_list)
+        if len(sin) != len(sout):
+            raise exceptions.ValidationError(
+                _("Number of Sign-in and Sign-out records do not match!"),
+                _("Employee: %s\nSign-in(s): %s\nSign-out(s): %s")
+                % (contract.employee_id.name, sin, sout),
+            )
+
+        return sin, sout
+
+    def total_hours_on_day(self, contract, dDay, punches_list=None):
+        """Calculate the number of hours worked on specified date."""
+
+        sin, sout = self._on_day(contract, dDay, punches_list=punches_list)
+
+        worked_hours = 0
+        for i in range(0, len(sin)):
+            start = sin[i]
+            end = sout[i]
+            worked_hours += float((end - start).seconds) / 60.0 / 60.0
+
+        return worked_hours
+
+    def partial_hours_on_day(
+        self, contract, dDay, active_after, begin, stop, tz, punches_list=None
+    ):
+        """Calculate the number of hours worked between begin and stop hours, but
+        after active_after hours past the beginning of the first sign-in on specified date."""
+
+        # Since OpenERP stores datetime in db as UTC, but in naive format we have to do
+        # the following to compare our partial time to the time in db:
+        #    1. Make our partial time into a naive datetime
+        #    2. Localize the naive datetime to the timezone specified by our caller
+        #    3. Convert our localized datetime to UTC
+        #    4. Convert our UTC datetime back into naive datetime format
+        #
+        dtBegin = datetime.combine(dDay, datetime.strptime(f"{begin}", "%H:%M").time())
+        dtStop = datetime.combine(dDay, datetime.strptime(f"{stop}", "%H:%M").time())
+        if dtStop <= dtBegin:
+            dtStop += timedelta(days=1)
+        utcdtBegin = timezone(tz).localize(dtBegin, is_dst=False).astimezone(utc)
+        utcdtStop = timezone(tz).localize(dtStop, is_dst=False).astimezone(utc)
+        dtBegin = utcdtBegin.replace(tzinfo=None)
+        dtStop = utcdtStop.replace(tzinfo=None)
+
+        if punches_list is None:
+            punches_list = self.punches_list_init(contract, dDay, dDay)
+        sin, sout = self._get_normalized_punches(contract, dDay, punches_list)
+
+        worked_hours = 0
+        lead_hours = 0
+        for i in range(0, len(sin)):
+            start = sin[i]
+            end = sout[i]
+            if worked_hours == 0 and end <= dtBegin:
+                lead_hours += float((end - start).seconds) / 60.0 / 60.0
+            elif worked_hours == 0 and end > dtBegin:
+                if start < dtBegin:
+                    lead_hours += float((dtBegin - start).seconds) / 60.0 / 60.0
+                    start = dtBegin
+                if end > dtStop:
+                    end = dtStop
+                worked_hours = float((end - start).seconds) / 60.0 / 60.0
+            elif worked_hours > 0 and start < dtStop:
+                if end > dtStop:
+                    end = dtStop
+                worked_hours += float((end - start).seconds) / 60.0 / 60.0
+
+        if worked_hours == 0:
+            return 0
+        elif lead_hours >= active_after:
+            return worked_hours
+
+        return max(0, (worked_hours + lead_hours) - active_after)
diff --git a/payroll_policy_payslip/models/hr_payslip.py b/payroll_policy_payslip/models/hr_payslip.py
new file mode 100644
index 00000000..c0fb5d47
--- /dev/null
+++ b/payroll_policy_payslip/models/hr_payslip.py
@@ -0,0 +1,1007 @@
+# Copyright (C) 2013,2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import datetime, timedelta
+
+from odoo import _, api, fields, models
+
+
+class LastXDays:
+    """Last X Days
+    Keeps track of the days an employee worked/didn't work in the last X days.
+    """
+
+    def __init__(self, days=6):
+        self.limit = days
+        self.arr = []
+
+    def reset(self):
+        self.arr = []
+
+    def push(self, worked=False):
+        if len(self.arr) == (self.limit + 1):
+            self.arr.pop(0)
+        self.arr.append(worked)
+        return [v for v in self.arr]
+
+    def days_worked(self):
+        res = 0
+        for d in reversed(self.arr):
+            if d is True:
+                res += 1
+            else:
+                break
+        return res
+
+
+class HrPayslip(models.Model):
+
+    _inherit = "hr.payslip"
+
+    def attendance_dict_init(self, contract, dFrom, dTo):
+
+        att_obj = self.env["hr.attendance"]
+
+        res = {}
+        att_list = att_obj.punches_list_init(contract, dFrom, dTo)
+        res.update({"raw_list": att_list})
+        d = dFrom
+        while d <= dTo:
+            res[d] = att_obj.total_hours_on_day(contract, d, punches_list=att_list)
+            d += timedelta(days=1)
+
+        return res
+
+    def attendance_dict_list(self, att_dict):
+
+        return att_dict["raw_list"]
+
+    def attendance_dict_hours_on_day(self, d, attendance_dict):
+
+        return attendance_dict[d]
+
+    @api.model
+    def holidays_list_init(self, date_from, date_to):
+
+        return self.env["hr.holidays.public"].get_holidays_list(
+            start_dt=date_from, end_dt=date_to
+        )
+
+    @api.model
+    def holidays_list_contains(self, d, holidays_list):
+
+        res = holidays_list.filtered(lambda x: x.date == d)
+        return len(res) > 0
+
+    @api.model
+    def get_days_off(self, contract):
+
+        res = {
+            "default": [],
+        }
+        daysofweek = ["0", "1", "2", "3", "4", "5", "6"]
+        resource_calendar = contract.resource_calendar_id
+        for d in daysofweek:
+            if d not in resource_calendar.attendance_ids.mapped("dayofweek"):
+                res["default"].append(int(d))
+        return res
+
+    @api.model
+    def require_day_off(self, lsd, presence_policy):
+
+        work_days = 6
+        if presence_policy.work_days_per_week:
+            work_days = presence_policy.work_days_per_week
+
+        if lsd.days_worked() >= work_days:
+            return True
+
+        return False
+
+    @api.model
+    def setup_worked_days_presence(
+        self, contract, today, normal_working_hours, presence_data, attendances
+    ):
+
+        # Get Presence policy data. Unless the policy changed mid-period
+        # this should keep returning the same data (w/out hitting db).
+        presence_data = self.get_presence_policies(
+            contract.policy_group_id, today, presence_data
+        )
+        presence_policy = presence_data["policy"]
+        presence_sequence = 50
+        for (
+            pcode,
+            pname,
+            ptype,
+            prate,
+            pduration,
+            pacc_id,
+            pacc_code,
+            paccrate,
+            paccmin,
+            paccmax,
+        ) in presence_data["codes"]:
+            if attendances.get(pcode, False):
+                continue
+            if ptype == "normal":
+                normal_working_hours += float(pduration) / 60.0
+            attendances[pcode] = {
+                "name": pname,
+                "code": pcode,
+                "sequence": presence_sequence,
+                "number_of_days": 0.0,
+                "number_of_hours": 0.0,
+                "rate": prate,
+                "contract_id": contract.id,
+            }
+            presence_sequence += 1
+
+            # Create accrual input
+            if pacc_id:
+                if self._insert_accrual(
+                    contract.id,
+                    attendances,
+                    pacc_id,
+                    pacc_code,
+                    paccrate,
+                    paccmin,
+                    paccmax,
+                    presence_sequence,
+                ):
+
+                    presence_sequence += 1
+        return (presence_policy, normal_working_hours, presence_data, attendances)
+
+    @api.model
+    def _set_abrate(self, abtype, abrate):
+        res = abrate
+        if abtype == "unpaid":
+            res = 0
+        elif abtype == "dock":
+            res = -abrate
+        return res
+
+    @api.model
+    def setup_worked_days_absence(
+        self, contract, today, absence_data, attendances, super_res
+    ):
+
+        # Get Absence data
+        #
+        absence_data = self.get_absence_policies(
+            contract.policy_group_id, today, absence_data
+        )
+        absence_sequence = 100
+        awol_code = False
+        for abcode, abname, abtype, abrate, useawol in absence_data["codes"]:
+            if useawol:
+                awol_code = abcode
+            abrate = self._set_abrate(abtype, abrate)
+
+            if attendances.get(abcode, False):
+                continue
+
+            # If the leave has already been added by the parent class, only
+            # modify the rate.
+            #
+            res_dict = False
+            for r in super_res:
+                if r["code"] == abcode:
+                    res_dict = r
+                    break
+
+            if res_dict is not False:
+                res_dict["rate"] = abrate
+            else:
+                attendances[abcode] = {
+                    "name": abname,
+                    "code": abcode,
+                    "sequence": absence_sequence,
+                    "number_of_days": 0.0,
+                    "number_of_hours": 0.0,
+                    "rate": abrate,
+                    "contract_id": contract.id,
+                }
+                absence_sequence += 1
+        return (awol_code, absence_data, attendances, super_res)
+
+    @api.model
+    def setup_worked_days_ot(self, contract, today, ot_data, attendances):
+
+        # Get OT data
+        #
+        ot_data = self.get_ot_policies(contract.policy_group_id, today, ot_data)
+        ot_policy = ot_data["policy"]
+        daily_ot = ot_data["daily"]
+        ot_sequence = 150
+
+        if ot_policy:
+            for (
+                otcode,
+                otname,
+                _ottype,
+                otrate,
+                otacc_id,
+                otacc_code,
+                otaccrate,
+                otaccmin,
+                otaccmax,
+            ) in ot_data["codes"]:
+                if attendances.get(otcode, False):
+                    continue
+                attendances[otcode] = {
+                    "name": otname,
+                    "code": otcode,
+                    "sequence": ot_sequence,
+                    "number_of_days": 0.0,
+                    "number_of_hours": 0.0,
+                    "rate": otrate,
+                    "contract_id": contract.id,
+                }
+                ot_sequence += 1
+
+                # Create accrual input
+                if otacc_id:
+                    if self._insert_accrual(
+                        contract.id,
+                        attendances,
+                        otacc_id,
+                        otacc_code,
+                        otaccrate,
+                        otaccmin,
+                        otaccmax,
+                        ot_sequence,
+                    ):
+
+                        ot_sequence += 1
+        return (ot_policy, daily_ot, ot_data, attendances)
+
+    @api.model
+    def check_and_process_public_holiday(
+        self,
+        contract,
+        today,
+        public_holiday,
+        lsd,
+        presence_policy,
+        ot_policy,
+        attendances,
+        rest_days,
+        working_hours_on_day,
+    ):
+
+        done = False
+        push_lsd = True
+        if public_holiday:
+            _hours, push_lsd = self._book_holiday_hours(
+                contract,
+                presence_policy,
+                ot_policy,
+                attendances,
+                today,
+                rest_days["default"],
+                lsd,
+                working_hours_on_day,
+            )
+            if _hours == 0:
+                done = True
+            else:
+                working_hours_on_day = _hours
+        elif self.require_day_off(lsd, presence_policy):
+            _hours, push_lsd = self._book_restday_hours(
+                contract,
+                presence_policy,
+                ot_policy,
+                attendances,
+                today,
+                rest_days["default"],
+                lsd,
+                working_hours_on_day,
+            )
+            if _hours == 0:
+                done = True
+            else:
+                working_hours_on_day = _hours
+        return (working_hours_on_day, push_lsd, done)
+
+    @api.model
+    def check_and_process_ot(
+        self,
+        contract,
+        today,
+        ot_policy,
+        working_hours_dict,
+        attendances,
+        working_hours_on_day,
+    ):
+
+        # Do the OT between specified times (partial OT) first, so that it
+        # doesn't get double-counted in the regular OT.
+        #
+        att_obj = self.env["hr.attendance"]
+        partial_hr = 0
+        hours_after_ot = working_hours_on_day
+        for line in ot_policy.line_ids:
+            active_after_hrs = float(line.active_after) / 60.0
+            if (
+                line.type == "daily"
+                and working_hours_on_day > active_after_hrs
+                and line.active_start_time
+            ):
+                partial_hr = att_obj.partial_hours_on_day(
+                    contract,
+                    today,
+                    active_after_hrs,
+                    line.active_start_time,
+                    line.active_end_time,
+                    line.tz,
+                    punches_list=self.attendance_dict_list(working_hours_dict),
+                )
+                if fields.Float.compare(partial_hr, 0.0, precision_digits=2) == 1:
+                    attendances[line.code]["number_of_hours"] += partial_hr
+                    attendances[line.code]["number_of_days"] += 1.0
+                    hours_after_ot -= partial_hr
+                    working_hours_on_day -= partial_hr
+
+                    # Process Accruals
+                    if line.accrual_policy_line_id:
+                        accrued_hours = self._get_accrued_accrual(
+                            partial_hr,
+                            line.accrual_policy_line_id.accrual_rate_hour,
+                            line.accrual_min,
+                            line.accrual_max,
+                        )
+                        if (
+                            fields.Float.compare(accrued_hours, 0.0, precision_digits=2)
+                            == 1
+                        ):
+                            self._add_accrued_hours(line, attendances, accrued_hours)
+
+        for line in ot_policy.line_ids:
+            active_after_hrs = float(line.active_after) / 60.0
+            if (
+                line.type == "daily"
+                and hours_after_ot > active_after_hrs
+                and not line.active_start_time
+            ):
+                attendances[line.code]["number_of_hours"] += hours_after_ot - (
+                    float(line.active_after) / 60.0
+                )
+                attendances[line.code]["number_of_days"] += 1.0
+
+                # Process Accruals
+                if line.accrual_policy_line_id:
+                    accrued_hours = self._get_accrued_accrual(
+                        hours_after_ot - (float(line.active_after) / 60.0),
+                        line.accrual_policy_line_id.accrual_rate_hour,
+                        line.accrual_min,
+                        line.accrual_max,
+                    )
+                    if (
+                        fields.Float.compare(accrued_hours, 0.0, precision_digits=2)
+                        == 1
+                    ):
+                        self._add_accrued_hours(line, attendances, accrued_hours)
+
+        return (working_hours_on_day, attendances)
+
+    @api.model
+    def check_and_process_standard(
+        self, contract, today, presence_policy, attendances, working_hours_on_day
+    ):
+
+        done = False
+        for line in presence_policy.line_ids:
+            if line.type == "normal":
+                normal_hours = self._get_applied_time(
+                    working_hours_on_day,
+                    line.active_after,
+                    line.duration,
+                )
+                attendances[line.code]["number_of_hours"] += normal_hours
+                attendances[line.code]["number_of_days"] += (
+                    normal_hours > 0 and 1.0 or 0
+                )
+
+                # Process Accruals
+                if line.accrual_policy_line_id:
+                    accrued_hours = self._get_accrued_accrual(
+                        normal_hours,
+                        line.accrual_policy_line_id.accrual_rate_hour,
+                        line.accrual_min,
+                        line.accrual_max,
+                    )
+                    if (
+                        fields.Float.compare(accrued_hours, 0.0, precision_digits=2)
+                        == 1
+                    ):
+                        self._add_accrued_hours(line, attendances, accrued_hours)
+
+                done = True
+        return (working_hours_on_day, attendances, done)
+
+    @api.model
+    def consecutive_days_worked(self, lsd, presence_policy):
+
+        return lsd.days_worked()
+
+    @api.model
+    def get_worked_day_lines(self, contracts, date_from, date_to):
+        """
+        @param contracts: Browse record of contracts
+        @return: returns a list of dict containing the input that should be
+        applied for the given contract between date_from and date_to
+        """
+
+        res = super().get_worked_day_lines(contracts, date_from, date_to)
+
+        # Initialize list of public holidays. We only need to calculate it once during
+        # the lifetime of this object so does it need to be optimized?
+        #
+        public_holidays_list = self.holidays_list_init(date_from, date_to)
+
+        nb_of_days = (date_to - date_from).days + 1
+        presence_data = None
+        absence_data = None
+        ot_data = None
+        for contract in contracts:
+
+            # Get default set of rest days for this employee/contract
+            contract_days_off = self.get_days_off(contract)
+
+            # Initialize dictionary of hours worked per day
+            working_hours_dict = self.attendance_dict_init(contract, date_from, date_to)
+
+            # List of leaves taken [(day, hours, resource.calendar.leaves), ...]
+            dt_from = datetime.combine(date_from, datetime.min.time())
+            dt_to = datetime.combine(date_to, datetime.max.time())
+            day_leave_intervals = contract[0].employee_id.list_leaves(
+                dt_from, dt_to, calendar=contract.resource_calendar_id
+            )
+
+            # Multiple Contracts in one period handling
+            temp_nb_of_days = nb_of_days
+            dTempPeriodFrom = date_from
+            if len(contracts.ids) > 0:
+                if contract.date_start > date_from:
+                    dTempPeriodFrom = contract.date_start
+                    temp_nb_of_days -= (contract.date_start - date_from).days
+                if contract.date_end and contract.date_end < date_to:
+                    temp_nb_of_days -= (date_to - contract.date_end).days
+
+            attendances = {
+                "MAX": {
+                    "name": _("Maximum Possible Working Hours"),
+                    "sequence": 1,
+                    "code": "MAX",
+                    "number_of_days": 0.0,
+                    "number_of_hours": 0.0,
+                    "contract_id": contract.id,
+                },
+            }
+            normal_working_hours = 0
+            awol_code = False
+
+            # Initialize policy structures. If the policies didn't change mid-period then
+            # this is the only time in this contract that it hits the db even though it's
+            # called again for every day in the period.
+            presence_data = self.get_presence_data(
+                contract, date_from, date_to, presence_data
+            )
+            absence_data = self.get_absence_data(
+                contract, date_from, date_to, absence_data
+            )
+            ot_data = self.get_ot_data(contract, date_from, date_to, ot_data)
+            lsd = self.init_last_week_worked(contract, dTempPeriodFrom)
+
+            for day in range(0, temp_nb_of_days):
+                dToday = dTempPeriodFrom + timedelta(days=day)
+                rest_days = contract_days_off
+
+                (
+                    presence_policy,
+                    normal_working_hours,
+                    presence_data,
+                    attendances,
+                ) = self.setup_worked_days_presence(
+                    contract, dToday, normal_working_hours, presence_data, attendances
+                )
+
+                (
+                    awol_code,
+                    absence_data,
+                    attendances,
+                    res,
+                ) = self.setup_worked_days_absence(
+                    contract, dToday, absence_data, attendances, res
+                )
+
+                ot_policy, daily_ot, ot_data, attendances = self.setup_worked_days_ot(
+                    contract, dToday, ot_data, attendances
+                )
+
+                # Is today a holiday?
+                public_holiday = self.holidays_list_contains(
+                    dToday, public_holidays_list
+                )
+
+                # Actual number of hours worked on the day. Based on attendance records.
+                working_hours_on_day = self.attendance_dict_hours_on_day(
+                    dToday, working_hours_dict
+                )
+
+                push_lsd = True
+                if working_hours_on_day:
+                    done = False
+
+                    (
+                        working_hours_on_day,
+                        push_lsd,
+                        done,
+                    ) = self.check_and_process_public_holiday(
+                        contract,
+                        dToday,
+                        public_holiday,
+                        lsd,
+                        presence_policy,
+                        ot_policy,
+                        attendances,
+                        rest_days,
+                        working_hours_on_day,
+                    )
+
+                    if not done and daily_ot:
+                        working_hours_on_day, attendances = self.check_and_process_ot(
+                            contract,
+                            dToday,
+                            ot_policy,
+                            working_hours_dict,
+                            attendances,
+                            working_hours_on_day,
+                        )
+
+                    if not done:
+                        (
+                            working_hours_on_day,
+                            attendances,
+                            _done,
+                        ) = self.check_and_process_standard(
+                            contract,
+                            dToday,
+                            presence_policy,
+                            attendances,
+                            working_hours_on_day,
+                        )
+
+                    if push_lsd:
+                        lsd.push(True)
+
+                        # If employee has worked 7 consecutive days reset counter
+                        if self.consecutive_days_worked(lsd, presence_policy) == 7:
+                            lsd.reset()
+                else:
+                    lsd.push(False)
+
+                leave_hours = 0
+                for lday, lhours, _leaves in day_leave_intervals:
+                    if lday == dToday:
+                        leave_hours += lhours
+                if (
+                    awol_code
+                    and not public_holiday
+                    and dToday.weekday() not in rest_days["default"]
+                    and working_hours_on_day < (normal_working_hours - leave_hours)
+                ):
+                    hours_diff = (
+                        normal_working_hours - working_hours_on_day - leave_hours
+                    )
+                    attendances[awol_code]["number_of_days"] += (
+                        hours_diff / normal_working_hours
+                    )
+                    attendances[awol_code]["number_of_hours"] += hours_diff
+
+                # Calculate total possible working hours in the month
+                if dToday.weekday() not in rest_days["default"]:
+                    attendances["MAX"]["number_of_hours"] += normal_working_hours
+                    attendances["MAX"]["number_of_days"] += (
+                        normal_working_hours > 0 and 1.0 or 0
+                    )
+
+            attendances = [value for _key, value in attendances.items()]
+            res += attendances
+
+        return res
+
+    def _get_policy(self, policy_group, policy_ids, dDay):
+        "Return a policy with an effective date before dDay but greater than all others"
+
+        if not policy_group or not policy_ids:
+            return None
+
+        res = None
+        for policy in policy_ids:
+            if policy.date <= dDay and (res is None or policy.date > res.date):
+                res = policy
+        return res
+
+    def _get_presence_policy(self, policy_group, dDay):
+        """Return a Presence Policy with an effective date before dDay but
+        greater than all others"""
+
+        res = self._get_policy(policy_group, policy_group.presence_policy_ids, dDay)
+        if res is None:
+            res = self.env["hr.policy.presence"]
+        return res
+
+    def get_presence_policies(self, policy_group_id, day, data):
+
+        if data is None or not data["_reuse"]:
+            data = {
+                "policy": None,
+                "codes": [],
+                "_reuse": False,
+            }
+        elif data["_reuse"]:
+            return data
+
+        policy = self._get_presence_policy(policy_group_id, day)
+
+        data["policy"] = policy
+        data["codes"] = policy.get_codes()
+        return data
+
+    def get_presence_data(self, contract, date_from, date_to, data):
+
+        # Short-circuit:
+        # If the policy for the first day is the same as the one for the
+        # last day assume that it will also be the same for the days in
+        # between, and reuse the same policy instead of checking for every day.
+        #
+        data2 = None
+        data = self.get_presence_policies(contract.policy_group_id, date_from, data)
+        data2 = self.get_presence_policies(contract.policy_group_id, date_to, data2)
+        if (data["policy"] and data2["policy"]) and data["policy"].id == data2[
+            "policy"
+        ].id:
+            data["_reuse"] = True
+        return data
+
+    def _get_absence_policy(self, policy_group, dDay):
+        """Return an Absence policy with an effective date before dDay but
+        greater than all others"""
+
+        res = self._get_policy(policy_group, policy_group.absence_policy_ids, dDay)
+        if res is None:
+            res = self.env["hr.policy.absence"]
+        return res
+
+    def get_absence_policies(self, policy_group_id, day, data):
+
+        if data is None or not data["_reuse"]:
+            data = {
+                "policy": None,
+                "codes": False,
+                "_reuse": False,
+            }
+        elif data["_reuse"]:
+            return data
+
+        absence_policy = self._get_absence_policy(policy_group_id, day)
+
+        data["policy"] = absence_policy
+        data["codes"] = absence_policy.get_codes()
+        return data
+
+    def get_absence_data(self, contract, date_from, date_to, data):
+
+        # Short-circuite
+        data2 = None
+        data = self.get_absence_policies(contract.policy_group_id, date_from, data)
+        data2 = self.get_absence_policies(contract.policy_group_id, date_to, data2)
+        if (data["policy"] and data2["policy"]) and data["policy"].id == data2[
+            "policy"
+        ].id:
+            data["_reuse"] = True
+        return data
+
+    @api.model
+    def _get_ot_policy(self, policy_group, dDay):
+        """Return an OT policy with an effective date before dDay but
+        greater than all others"""
+
+        res = self._get_policy(policy_group, policy_group.ot_policy_ids, dDay)
+        if res is None:
+            res = self.env["hr.policy.ot"]
+        return res
+
+    @api.model
+    def get_ot_policies(self, policy_group_id, day, data):
+
+        if data is None or not data["_reuse"]:
+            data = {
+                "policy": None,
+                "daily": None,
+                "restday2": None,
+                "restday": None,
+                "weekly": None,
+                "holiday": None,
+                "codes": False,
+                "_reuse": False,
+            }
+        elif data["_reuse"]:
+            return data
+
+        ot_policy = self._get_ot_policy(policy_group_id, day)
+        data["policy"] = ot_policy
+        if not ot_policy:
+            return data
+        daily_ot = ot_policy and len(ot_policy.daily_codes()) > 0 or None
+        restday2_ot = ot_policy and len(ot_policy.restday2_codes()) > 0 or None
+        restday_ot = ot_policy and len(ot_policy.restday_codes()) > 0 or None
+        weekly_ot = ot_policy and len(ot_policy.weekly_codes()) > 0 or None
+        holiday_ot = ot_policy and len(ot_policy.holiday_codes()) > 0 or None
+
+        data["codes"] = ot_policy.get_codes()
+        data["daily"] = daily_ot
+        data["restday2"] = restday2_ot
+        data["restday"] = restday_ot
+        data["weekly"] = weekly_ot
+        data["holiday"] = holiday_ot
+        return data
+
+    def get_ot_data(self, contract, date_from, date_to, data):
+
+        # Short-circuit
+        data2 = None
+        data = self.get_ot_policies(contract.policy_group_id, date_from, data)
+        data2 = self.get_ot_policies(contract.policy_group_id, date_to, data2)
+        if (data["policy"] and data2["policy"]) and data["policy"].id == data2[
+            "policy"
+        ].id:
+            data["_reuse"] = True
+        return data
+
+    def init_last_week_worked(self, contract, date_from):
+
+        # Calculate the number of days worked in the last week before the
+        # start of this contract. Necessary to calculate Weekly Rest Day OT.
+        #
+        att_obj = self.env["hr.attendance"]
+        lsd = LastXDays()
+        if len(lsd.arr) == 0:
+            d = date_from - timedelta(days=6)
+            while d < date_from:
+                att_count = att_obj.search_count(
+                    [
+                        ("employee_id", "=", contract.employee_id.id),
+                        ("day", "=", d.strftime("%Y-%m-%d")),
+                    ],
+                )
+                if att_count > 0:
+                    lsd.push(True)
+                else:
+                    lsd.push(False)
+                d += timedelta(days=1)
+        return lsd
+
+    @api.model
+    def _insert_accrual(
+        self,
+        contract_id,
+        attendances,
+        accrual_policy_line_id,
+        accrual_code,
+        rate,
+        _ratemin,
+        _ratemax,
+        sequence,
+    ):
+
+        if accrual_code not in attendances:
+            apl = self.env["hr.policy.line.accrual"].browse(accrual_policy_line_id)
+            attendances[accrual_code] = {
+                "name": apl.accrual_id.name,
+                "code": accrual_code,
+                "sequence": sequence,
+                "number_of_days": 0.0,
+                "number_of_hours": 0.0,
+                "rate": rate,
+                "accrual_policy_line_id": accrual_policy_line_id,
+                "contract_id": contract_id,
+            }
+            return True
+
+        return False
+
+    @api.model
+    def _get_accrued_accrual(
+        self, worked_hours, pol_acc_rate, pol_acc_min, pol_acc_max
+    ):
+
+        acc_precision = 2
+        accrued = worked_hours
+        if (
+            not fields.Float.is_zero(pol_acc_min, precision_digits=acc_precision)
+            and accrued < pol_acc_min
+        ):
+            accrued = pol_acc_min
+        elif (
+            not fields.Float.is_zero(pol_acc_max, precision_digits=acc_precision)
+            and accrued > pol_acc_max
+        ):
+            accrued = pol_acc_max
+
+        return accrued
+
+    @api.model
+    def _add_accrued_hours(self, policy_line, attendances, hours):
+
+        attendances[policy_line.accrual_policy_line_id.code]["number_of_hours"] += hours
+
+    @api.model
+    def _get_applied_time(self, worked_hours, pol_active_after, pol_duration=False):
+        """Returns worked time in hours according to pol_active_after and pol_duration."""
+
+        applied_min = (worked_hours * 60) - pol_active_after
+        if fields.Float.compare(applied_min, 0.0, precision_digits=0) == 1:
+            applied_min = (
+                (pol_duration is not False and applied_min > pol_duration)
+                and pol_duration
+                or applied_min
+            )
+        else:
+            applied_min = 0
+        applied_hours = float(applied_min) / 60.0
+        return applied_hours
+
+    @api.model
+    def _book_holiday_hours(
+        self,
+        _contract,
+        presence_policy,
+        ot_policy,
+        attendances,
+        dtDay,
+        rest_days,
+        lsd,
+        worked_hours,
+    ):
+
+        touched = False
+        push_lsd = False
+        hours = worked_hours
+
+        # Process normal working hours
+        for line in presence_policy.line_ids:
+            if line.type == "holiday":
+                holiday_hours = self._get_applied_time(
+                    worked_hours, line.active_after, line.duration
+                )
+                attendances[line.code]["number_of_hours"] += holiday_hours
+                attendances[line.code]["number_of_days"] += (
+                    holiday_hours > 0 and 1.0 or 0
+                )
+
+                # Process Accruals
+                if line.accrual_policy_line_id:
+                    accrued_hours = self._get_accrued_accrual(
+                        holiday_hours,
+                        line.accrual_policy_line_id.accrual_rate_hour,
+                        line.accrual_min,
+                        line.accrual_max,
+                    )
+                    if (
+                        fields.Float.compare(accrued_hours, 0.0, precision_digits=2)
+                        == 1
+                    ):
+                        self._add_accrued_hours(line, attendances, accrued_hours)
+
+                hours -= holiday_hours
+                touched = True
+
+        # Process OT hours
+        for line in ot_policy.line_ids:
+            if line.type == "holiday":
+                ot_hours = self._get_applied_time(worked_hours, line.active_after)
+                attendances[line.code]["number_of_hours"] += ot_hours
+                attendances[line.code]["number_of_days"] += ot_hours > 0 and 1.0 or 0
+
+                # Process Accruals
+                if line.accrual_policy_line_id:
+                    accrued_hours = self._get_accrued_accrual(
+                        ot_hours,
+                        line.accrual_policy_line_id.accrual_rate_hour,
+                        line.accrual_min,
+                        line.accrual_max,
+                    )
+                    if (
+                        fields.Float.compare(accrued_hours, 0.0, precision_digits=2)
+                        == 1
+                    ):
+                        self._add_accrued_hours(line, attendances, accrued_hours)
+
+                hours -= ot_hours
+                touched = True
+
+        if touched:
+            push_lsd = True
+
+        # make 'nearly zero' values zero
+        hours = round(hours, 2)
+
+        return hours, push_lsd
+
+    def _book_restday_hours(
+        self,
+        contract,
+        presence_policy,
+        ot_policy,
+        attendances,
+        dtDay,
+        rest_days,
+        lsd,
+        worked_hours,
+    ):
+
+        touched = False
+        push_lsd = False
+        hours = worked_hours
+
+        # Process normal working hours
+        for line in presence_policy.line_ids:
+            if line.type == "restday" and self.require_day_off(lsd, presence_policy):
+                rd_hours = self._get_applied_time(
+                    worked_hours, line.active_after, line.duration
+                )
+                attendances[line.code]["number_of_hours"] += rd_hours
+                attendances[line.code]["number_of_days"] += rd_hours > 0 and 1.0 or 0
+
+                # Process Accruals
+                if line.accrual_policy_line_id:
+                    accrued_hours = self._get_accrued_accrual(
+                        rd_hours,
+                        line.accrual_policy_line_id.accrual_rate_hour,
+                        line.accrual_min,
+                        line.accrual_max,
+                    )
+                    if (
+                        fields.Float.compare(accrued_hours, 0.0, precision_digits=2)
+                        == 1
+                    ):
+                        self._add_accrued_hours(line, attendances, accrued_hours)
+
+                hours -= rd_hours
+                touched = True
+
+        # Process OT hours
+        for line in ot_policy.line_ids:
+            if line.type == "restday" and self.require_day_off(lsd, presence_policy):
+                ot_hours = self._get_applied_time(worked_hours, line.active_after)
+                attendances[line.code]["number_of_hours"] += ot_hours
+                attendances[line.code]["number_of_days"] += ot_hours > 0 and 1.0 or 0
+
+                # Process Accruals
+                if line.accrual_policy_line_id:
+                    accrued_hours = self._get_accrued_accrual(
+                        ot_hours,
+                        line.accrual_policy_line_id.accrual_rate_hour,
+                        line.accrual_min,
+                        line.accrual_max,
+                    )
+                    if (
+                        fields.Float.compare(accrued_hours, 0.0, precision_digits=2)
+                        == 1
+                    ):
+                        self._add_accrued_hours(line, attendances, accrued_hours)
+
+                hours -= ot_hours
+                touched = True
+
+        if touched:
+            push_lsd = True
+
+        # make 'nearly zero' values zero
+        hours = round(hours, 2)
+
+        return hours, push_lsd
diff --git a/payroll_policy_payslip/models/hr_payslip_worked_days.py b/payroll_policy_payslip/models/hr_payslip_worked_days.py
new file mode 100644
index 00000000..078d818f
--- /dev/null
+++ b/payroll_policy_payslip/models/hr_payslip_worked_days.py
@@ -0,0 +1,12 @@
+# Copyright (C) 2013,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 HrPayslipWorkedDays(models.Model):
+
+    _inherit = "hr.payslip.worked_days"
+
+    rate = fields.Float("Rate", default=0.0, digits="Payroll Rate")
+    accrual_policy_line_id = fields.Many2one("hr.policy.line.accrual", "Accrual Policy")
diff --git a/payroll_policy_payslip/readme/CREDITS.rst b/payroll_policy_payslip/readme/CREDITS.rst
new file mode 100644
index 00000000..d264bc7e
--- /dev/null
+++ b/payroll_policy_payslip/readme/CREDITS.rst
@@ -0,0 +1 @@
+* Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/payroll_policy_payslip/readme/DESCRIPTION.rst b/payroll_policy_payslip/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..de38cf7a
--- /dev/null
+++ b/payroll_policy_payslip/readme/DESCRIPTION.rst
@@ -0,0 +1,2 @@
+This module applies payslip processing using payroll policies. It processes an employee's payslip
+using the presense, absence, OT, and accrual policies defined in the system.
diff --git a/payroll_policy_payslip/security/payroll_policy_payslip_security.xml b/payroll_policy_payslip/security/payroll_policy_payslip_security.xml
new file mode 100644
index 00000000..8748b724
--- /dev/null
+++ b/payroll_policy_payslip/security/payroll_policy_payslip_security.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+
+        <record id="hr_attendance_rule_payroll_user" model="ir.rule">
+            <field name="name">payroll officer: full access</field>
+            <field name="model_id" ref="hr_attendance.model_hr_attendance" />
+            <field name="domain_force">[(1,'=',1)]</field>
+            <field name="groups" eval="[(4,ref('payroll.group_payroll_user'))]" />
+            <field name="perm_read" eval="1" />
+            <field name="perm_write" eval="0" />
+            <field name="perm_create" eval="0" />
+            <field name="perm_unlink" eval="0" />
+        </record>
+
+    </data>
+</odoo>
diff --git a/payroll_policy_payslip/static/description/icon.png b/payroll_policy_payslip/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/payroll_policy_payslip/static/description/icon.png differ
diff --git a/payroll_policy_payslip/static/description/index.html b/payroll_policy_payslip/static/description/index.html
new file mode 100644
index 00000000..7627df3e
--- /dev/null
+++ b/payroll_policy_payslip/static/description/index.html
@@ -0,0 +1,418 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Payroll Policy Payslip</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="payroll-policy-payslip">
+<h1 class="title">Payroll Policy Payslip</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:a257f67c9d5c45c857d06d2a03dc6d7e96565d525afd78ff6a7116b393bd096d
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_policy_payslip"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<p>This module applies payslip processing using payroll policies. It processes an employee’s payslip
+using the presense, absence, OT, and accrual policies defined in the system.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-4">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_policy_payslip%0Aversion:%2014.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="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>TREVI Software</li>
+<li>Michael Telahun Makonnen</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-4">Other credits</a></h2>
+<ul class="simple">
+<li>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_policy_payslip">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/payroll_policy_payslip/static/src/img/main_screenshot.png b/payroll_policy_payslip/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/payroll_policy_payslip/static/src/img/main_screenshot.png differ
diff --git a/payroll_policy_payslip/tests/__init__.py b/payroll_policy_payslip/tests/__init__.py
new file mode 100644
index 00000000..5a21787a
--- /dev/null
+++ b/payroll_policy_payslip/tests/__init__.py
@@ -0,0 +1,6 @@
+# Copyright (C) 2022 TREVI Software
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import test_payroll_policy_absence
+from . import test_payroll_policy_ot
+from . import test_payroll_policy_presence
diff --git a/payroll_policy_payslip/tests/common.py b/payroll_policy_payslip/tests/common.py
new file mode 100644
index 00000000..61cc3eae
--- /dev/null
+++ b/payroll_policy_payslip/tests/common.py
@@ -0,0 +1,157 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import date
+
+from pytz import timezone, utc
+
+from odoo.tests import common, new_test_user
+
+
+class TestHrPayslip(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.Contract = cls.env["hr.contract"]
+        cls.HrPayslip = cls.env["hr.payslip"]
+        cls.Rule = cls.env["hr.salary.rule"]
+        cls.PolicyGroup = cls.env["hr.policy.group"]
+        cls.Attendance = cls.env["hr.attendance"]
+        cls.PublicHoliday = cls.env["hr.holidays.public"]
+        cls.PresencePolicy = cls.env["hr.policy.presence"]
+        cls.PresencePolicyLine = cls.env["hr.policy.line.presence"]
+
+        cls.resource_calendar_std = cls.env.ref("resource.resource_calendar_std")
+        cls.payroll_structure = cls.env.ref("payroll.structure_base")
+
+        # Create a new employee "Richard"
+        cls.richard_emp = cls.env["hr.employee"].create(
+            {
+                "name": "Richard",
+                "gender": "male",
+                "birthday": "1984-05-01",
+                "country_id": cls.env.ref("base.be").id,
+                "department_id": cls.env.ref("hr.dep_rd").id,
+                "resource_calendar_id": cls.resource_calendar_std.id,
+                "tz": "Africa/Addis_Ababa",
+            }
+        )
+
+        # Create a salary rule for our tests and add it to the salary structure
+        cls.test_rule = cls.Rule.create(
+            {
+                "name": "Test rule",
+                "code": "TEST",
+                "category_id": cls.env.ref("payroll.ALW").id,
+                "sequence": 5,
+                "amount_select": "code",
+                "amount_python_compute": "result=contract.wage",
+            }
+        )
+        cls.payroll_structure.write({"rule_ids": [(4, cls.test_rule.id)]})
+
+        # Payroll user
+        cls.payroll_user = new_test_user(
+            cls.env,
+            login="pu",
+            groups="base.group_user,payroll.group_payroll_user",
+            name="Payroll User",
+            email="pu@example.com",
+        )
+
+        # Creaet a policy group
+        cls.default_policy_group = cls.PolicyGroup.create(
+            {"name": "default policy group"}
+        )
+
+        # Create a Presence Policy
+        cls.presence_policy = cls.PresencePolicy.create(
+            {"name": "POLICY1", "date": date(2000, 1, 1)}
+        )
+        cls.PresencePolicyLine.create(
+            {
+                "name": "Presence Line - Normal workday",
+                "code": "PL1",
+                "type": "normal",
+                "active_after": 0.0,
+                "duration": 8.0 * 60,
+                "policy_id": cls.presence_policy.id,
+            }
+        )
+        cls.PresencePolicyLine.create(
+            {
+                "name": "Presence Line - Holiday",
+                "code": "HOL",
+                "type": "holiday",
+                "active_after": 0.0,
+                "duration": 8.0 * 60,
+                "rate": 2.0,
+                "policy_id": cls.presence_policy.id,
+            }
+        )
+        cls.restday_presence_line = cls.PresencePolicyLine.create(
+            {
+                "name": "Presence Line - Rest day",
+                "code": "RST",
+                "type": "restday",
+                "active_after": 0.0,
+                "duration": 8.0 * 60,
+                "rate": 1.0,
+                "policy_id": cls.presence_policy.id,
+            }
+        )
+
+        # I put the presence policy in the policy group
+        cls.default_policy_group.presence_policy_ids = [(4, cls.presence_policy.id)]
+
+    def create_contract(self, start, end, employee, wage, name=False):
+        return self.Contract.create(
+            {
+                "date_start": start,
+                "date_end": end,
+                "name": name if name else f"Contract for {employee.name}",
+                "wage": wage,
+                "employee_id": employee.id,
+                "struct_id": self.payroll_structure.id,
+                "kanban_state": "done",
+                "resource_calendar_id": self.resource_calendar_std.id,
+                "policy_group_id": self.default_policy_group.id,
+            }
+        )
+
+    def create_payslip(self, start, end, employee, user=False):
+
+        if user is not False:
+            Payslip = self.HrPayslip.with_user(user)
+        else:
+            Payslip = self.HrPayslip
+
+        return Payslip.create(
+            {
+                "name": f"Payslip of {employee.name}",
+                "employee_id": employee.id,
+                "date_from": start,
+                "date_to": end,
+            }
+        )
+
+    def apply_contract_cron(self):
+        self.env.ref(
+            "hr_contract.ir_cron_data_contract_update_state"
+        ).method_direct_trigger()
+
+    def localize_dt(self, dt, tz, reverse=False):
+        """
+        Localize naive dt from database (UTC) to timzezone tz. If reverse is True
+        a naive dt that is in timezone tz is converted to naive dt for storage in db.
+        """
+
+        local_tz = timezone(tz)
+        if not reverse:
+            res = utc.localize(dt, is_dst=False).astimezone(local_tz)
+        else:
+            res = (
+                local_tz.localize(dt, is_dst=False).astimezone(utc).replace(tzinfo=None)
+            )
+        return res
diff --git a/payroll_policy_payslip/tests/test_payroll_policy_absence.py b/payroll_policy_payslip/tests/test_payroll_policy_absence.py
new file mode 100644
index 00000000..218b259b
--- /dev/null
+++ b/payroll_policy_payslip/tests/test_payroll_policy_absence.py
@@ -0,0 +1,391 @@
+# Copyright (C) 2022 TREVI Software
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from datetime import date, datetime
+
+from . import common
+
+
+class TestAbsencePolicy(common.TestHrPayslip):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.LeaveType = cls.env["hr.leave.type"]
+        cls.LeaveRequest = cls.env["hr.leave"]
+        cls.AbsencePolicy = cls.env["hr.policy.absence"]
+        cls.AbsencePolicyLine = cls.env["hr.policy.line.absence"]
+
+        # Create salary rules for Absence tests and add it to the salary structure
+        cls.absence_test_rule = cls.Rule.create(
+            {
+                "name": "Absence test rule",
+                "code": "ABTEST",
+                "category_id": cls.env.ref("payroll.ALW").id,
+                "sequence": 6,
+                "amount_select": "code",
+                "amount_python_compute": "result = 0",
+            }
+        )
+        cls.awol_test_rule = cls.Rule.create(
+            {
+                "name": "AWOL test rule",
+                "code": "AWTEST",
+                "category_id": cls.env.ref("payroll.ALW").id,
+                "sequence": 6,
+                "amount_select": "code",
+                "amount_python_compute": "result = 0",
+            }
+        )
+        cls.payroll_structure.write({"rule_ids": [(4, cls.absence_test_rule.id)]})
+        cls.payroll_structure.write({"rule_ids": [(4, cls.awol_test_rule.id)]})
+
+        # Create an AWOL leave type
+        cls.awol_leave_type = cls.LeaveType.create(
+            {
+                "name": "Absent without Leave",
+                "code": "AWOL",
+                "unpaid": True,
+            }
+        )
+
+        # Create Leave types
+        cls.sick_leave_type = cls.LeaveType.create(
+            {
+                "name": "Sick Leave",
+                "code": "SICK50",
+                "allocation_type": "no",
+                "leave_validation_type": "hr",
+            }
+        )
+        cls.hourly_leave_type = cls.LeaveType.create(
+            {
+                "name": "Hourly Leave",
+                "code": "HOURLY",
+                "allocation_type": "no",
+                "leave_validation_type": "hr",
+                "request_unit": "hour",
+            }
+        )
+
+        # Create an Absence Policy
+        cls.absence_policy = cls.AbsencePolicy.create(
+            {"name": "Absence Policy", "date": date(2000, 1, 1)}
+        )
+        cls.AbsencePolicyLine.create(
+            {
+                "name": "Line - Absent Without Leave",
+                "code": "AWOL",
+                "type": "dock",
+                "rate": 1.0,
+                "holiday_status_id": cls.awol_leave_type.id,
+                "use_awol": True,
+                "policy_id": cls.absence_policy.id,
+            }
+        )
+        cls.AbsencePolicyLine.create(
+            {
+                "name": "Line - Sick Leave",
+                "code": "SICK50",
+                "type": "paid",
+                "rate": 0.5,
+                "holiday_status_id": cls.sick_leave_type.id,
+                "policy_id": cls.absence_policy.id,
+            }
+        )
+        cls.AbsencePolicyLine.create(
+            {
+                "name": "Line - Hourly Leave",
+                "code": "HOURLY",
+                "type": "dock",
+                "rate": 1.0,
+                "holiday_status_id": cls.hourly_leave_type.id,
+                "policy_id": cls.absence_policy.id,
+            }
+        )
+
+        # I put the absence policy in the policy group
+        cls.default_policy_group.absence_policy_ids = [(4, cls.absence_policy.id)]
+
+    def test_no_hours(self):
+
+        # I set the test rule to detect the number of regular worked hours
+        self.test_rule.amount_python_compute = (
+            "result_rate = worked_days.PL1.rate * 100 \n"
+            "result = worked_days.PL1.number_of_hours"
+        )
+
+        # I set the test rule to detect the number of AWOL hours
+        self.absence_test_rule.amount_python_compute = (
+            "result_rate = worked_days.AWOL.rate * 100 \n"
+            "result = worked_days.AWOL.number_of_hours"
+        )
+
+        # I create a contract for "Richard"
+        contract_start = date(2022, 1, 1)
+        start = date(2022, 4, 1)
+        end = date(2022, 4, 30)
+        self.create_contract(contract_start, False, self.richard_emp, 5000.0)
+        self.apply_contract_cron()
+
+        # I create an employee Payslip and process it
+        richard_payslip = self.create_payslip(
+            start, end, self.richard_emp, user=self.payroll_user
+        )
+        richard_payslip.onchange_employee()
+        richard_payslip.compute_sheet()
+
+        line = richard_payslip.line_ids.filtered(lambda l: l.code == "TEST")
+        self.assertEqual(len(line), 1, "I found the Test line")
+        self.assertEqual(
+            line[0].amount,
+            0.0,
+            "There is no attenance",
+        )
+
+        line = richard_payslip.line_ids.filtered(lambda l: l.code == "ABTEST")
+        self.assertEqual(len(line), 1, "I found the Absence Test line")
+        self.assertEqual(
+            line[0].amount,
+            168.0,
+            "There entire month of April is AWOL",
+        )
+        self.assertEqual(
+            line[0].rate,
+            -100,
+            "AWOL hours are DOCKED 100%",
+        )
+
+    def test_public_holiday_absence(self):
+
+        # Create a public holiday
+        self.public_holiday = self.PublicHoliday.create(
+            {
+                "year": 2022,
+                "line_ids": [
+                    (0, 0, {"name": "Foo", "date": date(2022, 4, 5)}),
+                ],
+            }
+        )
+
+        # I check that public holidays exist
+        ph = self.PublicHoliday.search([("year", "=", 2022)])
+        self.assertTrue(ph, "There is a public holiday object")
+        self.assertGreater(len(ph.line_ids), 0, "At least one public holiday")
+
+        # I set the test rule to detect the number of regular worked hours
+        self.test_rule.amount_python_compute = (
+            "result_rate = worked_days.PL1.rate * 100 \n"
+            "result = worked_days.PL1.number_of_hours"
+        )
+
+        # I set the test rule to detect the number of AWOL hours
+        self.absence_test_rule.amount_python_compute = (
+            "result_rate = worked_days.AWOL.rate * 100 \n"
+            "result = worked_days.AWOL.number_of_hours"
+        )
+
+        # I create a contract for "Richard"
+        contract_start = date(2022, 1, 1)
+        start = date(2022, 4, 1)
+        end = date(2022, 4, 30)
+        self.create_contract(contract_start, False, self.richard_emp, 5000.0)
+        self.apply_contract_cron()
+
+        # I create an employee Payslip and process it
+        richard_payslip = self.create_payslip(
+            start, end, self.richard_emp, user=self.payroll_user
+        )
+        richard_payslip.onchange_employee()
+        richard_payslip.compute_sheet()
+
+        line = richard_payslip.line_ids.filtered(lambda l: l.code == "TEST")
+        self.assertEqual(len(line), 1, "I found the Test line")
+        self.assertEqual(
+            line[0].amount,
+            0.0,
+            "There is no attenance",
+        )
+
+        line = richard_payslip.line_ids.filtered(lambda l: l.code == "ABTEST")
+        self.assertEqual(len(line), 1, "I found the Absence Test line")
+        self.assertEqual(
+            line[0].amount,
+            160.0,
+            "There entire month of April is AWOL minus the public holiday",
+        )
+        self.assertEqual(
+            line[0].rate,
+            -100,
+            "AWOL hours are DOCKED 100%",
+        )
+
+    def test_leave_dock(self):
+
+        # Set system parameter
+        self.env["ir.config_parameter"].sudo().set_param(
+            "payroll.leaves_positive", True
+        )
+
+        # Create a leave request
+        lv = self.LeaveRequest.create(
+            {
+                "name": "Richard Sick Leave",
+                "employee_id": self.richard_emp.id,
+                "holiday_status_id": self.sick_leave_type.id,
+                "date_from": datetime(2022, 4, 4),
+                "date_to": datetime(2022, 4, 5, 23, 59, 59),
+                # 'number_of_days': 2,
+            }
+        )
+        lv.action_approve()
+        self.assertEqual(lv.state, "validate", "the leave is in validate state")
+
+        # I set the test rule to detect the number of regular worked hours
+        self.test_rule.amount_python_compute = (
+            "result_rate = worked_days.PL1.rate * 100 \n"
+            "result = worked_days.PL1.number_of_hours"
+        )
+
+        # I set the test rule to detect the number of leave hours
+        self.absence_test_rule.amount_python_compute = (
+            "result_rate = worked_days.SICK50.rate * 100 \n"
+            "result = worked_days.SICK50.number_of_hours"
+        )
+
+        # I set the test rule to detect the number of awol hours
+        self.awol_test_rule.amount_python_compute = (
+            "result_rate = worked_days.AWOL.rate * 100 \n"
+            "result = worked_days.AWOL.number_of_hours"
+        )
+
+        # I create a contract for "Richard"
+        contract_start = date(2022, 1, 1)
+        start = date(2022, 4, 1)
+        end = date(2022, 4, 30)
+        self.create_contract(contract_start, False, self.richard_emp, 5000.0)
+        self.apply_contract_cron()
+
+        # I create an employee Payslip and process it
+        richard_payslip = self.create_payslip(
+            start, end, self.richard_emp, user=self.payroll_user
+        )
+        richard_payslip.onchange_employee()
+        richard_payslip.compute_sheet()
+
+        line = richard_payslip.line_ids.filtered(lambda l: l.code == "TEST")
+        self.assertEqual(len(line), 1, "I found the Test line")
+        self.assertEqual(
+            line[0].amount,
+            0.0,
+            "There is no attenance",
+        )
+
+        line = richard_payslip.line_ids.filtered(lambda l: l.code == "ABTEST")
+        self.assertEqual(len(line), 1, "I found the Absence Test line")
+        self.assertEqual(
+            line[0].amount,
+            16.0,
+            "The time of the sick leave is recorded in worked_days",
+        )
+        self.assertEqual(
+            line[0].rate,
+            50.0,
+            "The time the employee was on sick leave is paid at 0.5x",
+        )
+
+        line = richard_payslip.line_ids.filtered(lambda l: l.code == "AWTEST")
+        self.assertEqual(len(line), 1, "I found the AWOL Test line")
+        self.assertEqual(
+            line[0].amount,
+            168.0 - (2 * 8.0),
+            "The time of the sick leave is not marked as AWOL",
+        )
+
+    def test_leave_partial_awol(self):
+
+        # Set system parameter
+        self.env["ir.config_parameter"].sudo().set_param(
+            "payroll.leaves_positive", True
+        )
+
+        # Create a leave request
+        lv = self.LeaveRequest.create(
+            {
+                "name": "Richard Partial Leave",
+                "employee_id": self.richard_emp.id,
+                "holiday_status_id": self.hourly_leave_type.id,
+                "request_date_from": date(2022, 4, 5),
+                "request_date_to": date(2022, 4, 5),
+                "request_unit_hours": True,
+                "request_hour_from": "8",
+                "request_hour_to": "12",
+            }
+        )
+        lv._compute_date_from_to()
+        lv.action_approve()
+        self.assertEqual(lv.state, "validate", "the leave is in validate state")
+
+        # I set the test rule to detect the number of regular worked hours
+        self.test_rule.amount_python_compute = (
+            "result_rate = worked_days.PL1.rate * 100 \n"
+            "result = worked_days.PL1.number_of_hours"
+        )
+
+        # I set the test rule to detect the number of leave hours
+        self.absence_test_rule.amount_python_compute = (
+            "result_rate = worked_days.HOURLY.rate * 100 \n"
+            "result = worked_days.HOURLY.number_of_hours"
+        )
+
+        # I set the test rule to detect the number of awol hours
+        self.awol_test_rule.amount_python_compute = (
+            "result_rate = worked_days.AWOL.rate * 100 \n"
+            "result = worked_days.AWOL.number_of_hours"
+        )
+
+        # I create a contract for "Richard"
+        contract_start = date(2022, 1, 1)
+        start = date(2022, 4, 1)
+        end = date(2022, 4, 30)
+        self.create_contract(contract_start, False, self.richard_emp, 5000.0)
+        self.apply_contract_cron()
+
+        # I create an employee Payslip and process it
+        richard_payslip = self.create_payslip(
+            start, end, self.richard_emp, user=self.payroll_user
+        )
+        richard_payslip.onchange_employee()
+        richard_payslip.compute_sheet()
+
+        line = richard_payslip.line_ids.filtered(lambda l: l.code == "TEST")
+        self.assertEqual(len(line), 1, "I found the Test line")
+        self.assertEqual(
+            line[0].amount,
+            0.0,
+            "There is no attenance",
+        )
+
+        line = richard_payslip.line_ids.filtered(lambda l: l.code == "ABTEST")
+        self.assertEqual(len(line), 1, "I found the Absence Test line")
+        self.assertEqual(
+            line[0].amount,
+            4.0,
+            "The time of the partial leave is only 1/2 day",
+        )
+
+        line = richard_payslip.line_ids.filtered(lambda l: l.code == "AWTEST")
+        self.assertEqual(len(line), 1, "I found the AWOL Test line")
+        self.assertEqual(
+            line[0].amount,
+            168.0 - 4.0,
+            "The AWOL time for the other 1/2 day is recorded correctly",
+        )
+
+        wdl = richard_payslip.worked_days_line_ids.filtered(lambda l: l.code == "AWOL")
+        self.assertEqual(len(wdl), 1, "I found the AWOL worked days line")
+        self.assertEqual(
+            wdl[0].number_of_days,
+            20.5,
+            "In worked days line field 'number_of_days' 1/2 day is subtracted",
+        )
diff --git a/payroll_policy_payslip/tests/test_payroll_policy_ot.py b/payroll_policy_payslip/tests/test_payroll_policy_ot.py
new file mode 100644
index 00000000..c86de724
--- /dev/null
+++ b/payroll_policy_payslip/tests/test_payroll_policy_ot.py
@@ -0,0 +1,670 @@
+# Copyright (C) 2022 TREVI Software
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from datetime import date, datetime, timedelta
+
+from . import common
+
+
+class TestPresencePolicy(common.TestHrPayslip):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.OtPolicy = cls.env["hr.policy.ot"]
+        cls.OtPolicyLine = cls.env["hr.policy.line.ot"]
+
+        # Create a salary rule for OT tests and add it to the salary structure
+        cls.ot_test_rule = cls.Rule.create(
+            {
+                "name": "OT Test rule",
+                "code": "OTTEST",
+                "category_id": cls.env.ref("payroll.ALW").id,
+                "sequence": 6,
+                "amount_select": "code",
+                "amount_python_compute": "result = 0",
+            }
+        )
+        cls.payroll_structure.write({"rule_ids": [(4, cls.ot_test_rule.id)]})
+
+        # Create a salary rule for a second OT tests, add it to salary structure
+        cls.ot_test_rule2 = cls.Rule.create(
+            {
+                "name": "OT 2 Test rule",
+                "code": "OTTEST2",
+                "category_id": cls.env.ref("payroll.ALW").id,
+                "sequence": 7,
+                "amount_select": "code",
+                "amount_python_compute": "result = 0",
+            }
+        )
+        cls.payroll_structure.write({"rule_ids": [(4, cls.ot_test_rule2.id)]})
+
+        # Create a OT Policy
+        cls.ot_policy = cls.OtPolicy.create(
+            {"name": "POLICY OT", "date": date(2000, 1, 1)}
+        )
+        cls.OtPolicyLine.create(
+            {
+                "name": "OT Line - Normal workday",
+                "code": "OTD",
+                "type": "daily",
+                "active_after": 8.0 * 60,
+                "rate": 1.5,
+                "policy_id": cls.ot_policy.id,
+                "tz": "Africa/Addis_Ababa",
+            }
+        )
+        cls.OtPolicyLine.create(
+            {
+                "name": "Night OT Line",
+                "code": "OTN",
+                "type": "daily",
+                "active_after": 0.0,
+                "active_start_time": "22:00",
+                "active_end_time": "06:00",
+                "rate": 1.75,
+                "policy_id": cls.ot_policy.id,
+                "tz": "Africa/Addis_Ababa",
+            }
+        )
+        cls.OtPolicyLine.create(
+            {
+                "name": "OT Line - Rest Day",
+                "code": "OTR",
+                "type": "restday",
+                "active_after": 8.0 * 60,
+                "rate": 4.0,
+                "policy_id": cls.ot_policy.id,
+                "tz": "Africa/Addis_Ababa",
+            }
+        )
+        cls.OtPolicyLine.create(
+            {
+                "name": "OT Line - Holiday",
+                "code": "OTH",
+                "type": "holiday",
+                "active_after": 8.0 * 60,
+                "rate": 2.5,
+                "policy_id": cls.ot_policy.id,
+                "tz": "Africa/Addis_Ababa",
+            }
+        )
+
+        # I put the presence policy in the policy group
+        cls.default_policy_group.ot_policy_ids = [(4, cls.ot_policy.id)]
+
+        # Create a public holiday
+        cls.public_holiday = cls.PublicHoliday.create(
+            {
+                "year": 2022,
+                "line_ids": [
+                    (0, 0, {"name": "Foo", "date": date(2022, 4, 2)}),
+                ],
+            }
+        )
+
+    def test_daily_ot(self):
+
+        # I set the test rules to detect the number of regular and OT worked hours
+        self.test_rule.amount_python_compute = (
+            "result_rate = worked_days.PL1.rate * 100 \n"
+            "result = worked_days.PL1.number_of_hours"
+        )
+        self.ot_test_rule.amount_python_compute = (
+            "result_rate = worked_days.OTD.rate * 100 \n"
+            "result = worked_days.OTD.number_of_hours"
+        )
+
+        # I create a contract for "Richard"
+        contract_start = date(2022, 1, 1)
+        start = date(2022, 4, 1)
+        end = date(2022, 4, 30)
+        self.create_contract(contract_start, False, self.richard_emp, 5000.0)
+        self.apply_contract_cron()
+
+        # I create attendance for one day
+        self.Attendance.create(
+            {
+                "employee_id": self.richard_emp.id,
+                "check_in": self.localize_dt(
+                    datetime.combine(start, datetime.strptime("08:00", "%H:%M").time()),
+                    self.richard_emp.tz,
+                    reverse=True,
+                ),
+                "check_out": self.localize_dt(
+                    datetime.combine(start, datetime.strptime("17:30", "%H:%M").time()),
+                    self.richard_emp.tz,
+                    reverse=True,
+                ),
+            }
+        )
+
+        # I create an employee Payslip and process it
+        richard_payslip = self.create_payslip(
+            start, end, self.richard_emp, user=self.payroll_user
+        )
+        richard_payslip.onchange_employee()
+        richard_payslip.compute_sheet()
+
+        line = richard_payslip.line_ids.filtered(lambda l: l.code == "TEST")
+        self.assertEqual(len(line), 1, "I found the Normal Test line")
+        self.assertEqual(
+            line[0].amount,
+            8.0,
+            "The number of regularly worked hours is 8",
+        )
+        self.assertEqual(
+            line[0].rate,
+            100,
+            "Regular hours are paid at the normal rate",
+        )
+
+        line = richard_payslip.line_ids.filtered(lambda l: l.code == "OTTEST")
+        self.assertEqual(len(line), 1, "I found the OT Test line")
+        self.assertEqual(
+            line[0].amount,
+            1.5,
+            "The number of daily OT worked hours is 1:30",
+        )
+        self.assertEqual(
+            line[0].rate,
+            150,
+            "Daily OT hours are paid at 1.5x normal rate",
+        )
+
+    def test_nightly_ot(self):
+
+        # I set the test rules to detect the number of regular and OT worked hours
+        self.test_rule.amount_python_compute = (
+            "result_rate = worked_days.PL1.rate * 100 \n"
+            "result = worked_days.PL1.number_of_hours"
+        )
+        self.ot_test_rule.amount_python_compute = (
+            "result_rate = worked_days.OTN.rate * 100 \n"
+            "result = worked_days.OTN.number_of_hours"
+        )
+
+        # I create a contract for "Richard"
+        contract_start = date(2022, 1, 1)
+        start = date(2022, 4, 1)
+        end = date(2022, 4, 30)
+        self.create_contract(contract_start, False, self.richard_emp, 5000.0)
+        self.apply_contract_cron()
+
+        # I create attendance for one day
+        self.Attendance.create(
+            {
+                "employee_id": self.richard_emp.id,
+                "check_in": self.localize_dt(
+                    datetime.combine(start, datetime.strptime("17:00", "%H:%M").time()),
+                    self.richard_emp.tz,
+                    reverse=True,
+                ),
+                "check_out": self.localize_dt(
+                    datetime.combine(start, datetime.strptime("23:00", "%H:%M").time()),
+                    self.richard_emp.tz,
+                    reverse=True,
+                ),
+            }
+        )
+
+        # I create an employee Payslip and process it
+        richard_payslip = self.create_payslip(
+            start, end, self.richard_emp, user=self.payroll_user
+        )
+        richard_payslip.onchange_employee()
+        richard_payslip.compute_sheet()
+
+        line = richard_payslip.line_ids.filtered(lambda l: l.code == "TEST")
+        self.assertEqual(len(line), 1, "I found the Normal Test line")
+        self.assertEqual(
+            line[0].amount,
+            5.0,
+            "The number of regularly worked hours is 5",
+        )
+        self.assertEqual(
+            line[0].rate,
+            100,
+            "Regular hours are paid at the normal rate",
+        )
+
+        line = richard_payslip.line_ids.filtered(lambda l: l.code == "OTTEST")
+        self.assertEqual(len(line), 1, "I found the OT Test line")
+        self.assertEqual(
+            line[0].amount,
+            1.0,
+            "The number of night OT worked hours is 1",
+        )
+        self.assertEqual(
+            line[0].rate,
+            175,
+            "Night OT hours are paid at 1.75x normal rate",
+        )
+
+    def test_nightly_ot_midnight(self):
+
+        # I set the test rules to detect the number of regular and OT worked hours
+        self.test_rule.amount_python_compute = (
+            "result_rate = worked_days.PL1.rate * 100 \n"
+            "result = worked_days.PL1.number_of_hours"
+        )
+        self.ot_test_rule.amount_python_compute = (
+            "result_rate = worked_days.OTN.rate * 100 \n"
+            "result = worked_days.OTN.number_of_hours"
+        )
+
+        # I create a contract for "Richard"
+        contract_start = date(2022, 1, 1)
+        start = date(2022, 4, 1)
+        end = date(2022, 4, 30)
+        self.create_contract(contract_start, False, self.richard_emp, 5000.0)
+        self.apply_contract_cron()
+
+        # I create attendance for one day
+        self.Attendance.create(
+            {
+                "employee_id": self.richard_emp.id,
+                "check_in": self.localize_dt(
+                    datetime.combine(start, datetime.strptime("17:00", "%H:%M").time()),
+                    self.richard_emp.tz,
+                    reverse=True,
+                ),
+                "check_out": self.localize_dt(
+                    datetime.combine(
+                        start + timedelta(days=1),
+                        datetime.strptime("03:00", "%H:%M").time(),
+                    ),
+                    self.richard_emp.tz,
+                    reverse=True,
+                ),
+            }
+        )
+
+        # I create an employee Payslip and process it
+        richard_payslip = self.create_payslip(
+            start, end, self.richard_emp, user=self.payroll_user
+        )
+        richard_payslip.onchange_employee()
+        richard_payslip.compute_sheet()
+
+        line = richard_payslip.line_ids.filtered(lambda l: l.code == "TEST")
+        self.assertEqual(len(line), 1, "I found the Normal Test line")
+        self.assertEqual(
+            line[0].amount,
+            5.0,
+            "The number of regularly worked hours is 5",
+        )
+        self.assertEqual(
+            line[0].rate,
+            100,
+            "Regular hours are paid at the normal rate",
+        )
+
+        line = richard_payslip.line_ids.filtered(lambda l: l.code == "OTTEST")
+        self.assertEqual(len(line), 1, "I found the OT Test line")
+        self.assertEqual(
+            line[0].amount,
+            5.0,
+            "The number of night OT worked hours is 5",
+        )
+        self.assertEqual(
+            line[0].rate,
+            175,
+            "Night OT hours are paid at 1.75x normal rate",
+        )
+
+    def test_nightly_ot_8pm5am(self):
+
+        # I set the test rules to detect the number of regular and OT worked hours
+        self.test_rule.amount_python_compute = (
+            "result_rate = worked_days.PL1.rate * 100 \n"
+            "result = worked_days.PL1.number_of_hours"
+        )
+        self.ot_test_rule.amount_python_compute = (
+            "result_rate = worked_days.OTN.rate * 100 \n"
+            "result = worked_days.OTN.number_of_hours"
+        )
+
+        # I create a contract for "Richard"
+        contract_start = date(2022, 1, 1)
+        start = date(2022, 4, 1)
+        end = date(2022, 4, 30)
+        self.create_contract(contract_start, False, self.richard_emp, 5000.0)
+        self.apply_contract_cron()
+
+        # I create attendance for one day
+        self.Attendance.create(
+            {
+                "employee_id": self.richard_emp.id,
+                "check_in": self.localize_dt(
+                    datetime.combine(start, datetime.strptime("20:00", "%H:%M").time()),
+                    self.richard_emp.tz,
+                    reverse=True,
+                ),
+                "check_out": self.localize_dt(
+                    datetime.combine(
+                        start + timedelta(days=1),
+                        datetime.strptime("05:00", "%H:%M").time(),
+                    ),
+                    self.richard_emp.tz,
+                    reverse=True,
+                ),
+            }
+        )
+
+        # I create an employee Payslip and process it
+        richard_payslip = self.create_payslip(
+            start, end, self.richard_emp, user=self.payroll_user
+        )
+        richard_payslip.onchange_employee()
+        richard_payslip.compute_sheet()
+
+        line = richard_payslip.line_ids.filtered(lambda l: l.code == "TEST")
+        self.assertEqual(len(line), 1, "I found the Normal Test line")
+        self.assertEqual(
+            line[0].amount,
+            2.0,
+            "The number of regularly worked hours is 5",
+        )
+        self.assertEqual(
+            line[0].rate,
+            100,
+            "Regular hours are paid at the normal rate",
+        )
+
+        line = richard_payslip.line_ids.filtered(lambda l: l.code == "OTTEST")
+        self.assertEqual(len(line), 1, "I found the OT Test line")
+        self.assertEqual(
+            line[0].amount,
+            7.0,
+            "The number of night OT worked hours is 7",
+        )
+        self.assertEqual(
+            line[0].rate,
+            175,
+            "Night OT hours are paid at 1.75x normal rate",
+        )
+
+    def test_ot_day_and_night(self):
+
+        # I set the test rules to detect the number of regular and OT worked hours
+        self.test_rule.amount_python_compute = (
+            "result_rate = worked_days.PL1.rate * 100 \n"
+            "result = worked_days.PL1.number_of_hours"
+        )
+        self.ot_test_rule.amount_python_compute = (
+            "result_rate = worked_days.OTD.rate * 100 \n"
+            "result = worked_days.OTD.number_of_hours"
+        )
+        self.ot_test_rule2.amount_python_compute = (
+            "result_rate = worked_days.OTN.rate * 100 \n"
+            "result = worked_days.OTN.number_of_hours"
+        )
+
+        # I create a contract for "Richard"
+        contract_start = date(2022, 1, 1)
+        start = date(2022, 4, 1)
+        end = date(2022, 4, 30)
+        self.create_contract(contract_start, False, self.richard_emp, 5000.0)
+        self.apply_contract_cron()
+
+        # I create attendance for one day to include regurlar, OT, and Night OT hours
+        self.Attendance.create(
+            {
+                "employee_id": self.richard_emp.id,
+                "check_in": self.localize_dt(
+                    datetime.combine(start, datetime.strptime("12:00", "%H:%M").time()),
+                    self.richard_emp.tz,
+                    reverse=True,
+                ),
+                "check_out": self.localize_dt(
+                    datetime.combine(
+                        start + timedelta(days=1),
+                        datetime.strptime("05:00", "%H:%M").time(),
+                    ),
+                    self.richard_emp.tz,
+                    reverse=True,
+                ),
+            }
+        )
+
+        # I create an employee Payslip and process it
+        richard_payslip = self.create_payslip(
+            start, end, self.richard_emp, user=self.payroll_user
+        )
+        richard_payslip.onchange_employee()
+        richard_payslip.compute_sheet()
+
+        line = richard_payslip.line_ids.filtered(lambda l: l.code == "TEST")
+        self.assertEqual(len(line), 1, "I found the Normal Test line")
+        self.assertEqual(
+            line[0].amount,
+            8.0,
+            "The number of regularly worked hours is 8",
+        )
+        self.assertEqual(
+            line[0].rate,
+            100,
+            "Regular hours are paid at the normal rate",
+        )
+
+        line = richard_payslip.line_ids.filtered(lambda l: l.code == "OTTEST")
+        self.assertEqual(len(line), 1, "I found the DAY OT Test line")
+        self.assertEqual(
+            line[0].amount,
+            2.0,
+            "The number of DAY OT worked hours is 2",
+        )
+        self.assertEqual(
+            line[0].rate,
+            150,
+            "DAY OT hours are paid at 1.5x normal rate",
+        )
+
+        line = richard_payslip.line_ids.filtered(lambda l: l.code == "OTTEST2")
+        self.assertEqual(len(line), 1, "I found the NIGHT OT Test line")
+        self.assertEqual(
+            line[0].amount,
+            7.0,
+            "The number of NIGHT OT worked hours is 7",
+        )
+        self.assertEqual(
+            line[0].rate,
+            175,
+            "NIGHT OT hours are paid at 1.75x normal rate",
+        )
+
+    def test_restday_ot(self):
+
+        # I set the test rules to detect the number of regular and OT worked hours
+        self.test_rule.amount_python_compute = (
+            "result_rate = worked_days.PL1.rate * 100 \n"
+            "result = worked_days.PL1.number_of_hours"
+        )
+        self.ot_test_rule.amount_python_compute = (
+            "result_rate = worked_days.OTD.rate * 100 \n"
+            "result = worked_days.OTD.number_of_hours"
+        )
+        self.ot_test_rule2.amount_python_compute = (
+            "result_rate = worked_days.OTR.rate * 100 \n"
+            "result = worked_days.OTR.number_of_hours"
+        )
+
+        # I create a contract for "Richard"
+        contract_start = date(2022, 1, 1)
+        start = date(2022, 4, 1)
+        end = date(2022, 4, 30)
+        self.create_contract(contract_start, False, self.richard_emp, 5000.0)
+        self.apply_contract_cron()
+
+        # I create attendance for seven days
+        monday = date(2022, 4, 4)
+        for day in range(0, 7):
+            self.Attendance.create(
+                {
+                    "employee_id": self.richard_emp.id,
+                    "check_in": self.localize_dt(
+                        datetime.combine(
+                            monday + timedelta(days=day),
+                            datetime.strptime("08:00", "%H:%M").time(),
+                        ),
+                        self.richard_emp.tz,
+                        reverse=True,
+                    ),
+                    "check_out": self.localize_dt(
+                        datetime.combine(
+                            monday + timedelta(days=day),
+                            datetime.strptime("17:30", "%H:%M").time(),
+                        ),
+                        self.richard_emp.tz,
+                        reverse=True,
+                    ),
+                }
+            )
+
+        # I create an employee Payslip and process it
+        richard_payslip = self.create_payslip(
+            start, end, self.richard_emp, user=self.payroll_user
+        )
+        richard_payslip.onchange_employee()
+        richard_payslip.compute_sheet()
+
+        line = richard_payslip.line_ids.filtered(lambda l: l.code == "TEST")
+        self.assertEqual(len(line), 1, "I found the Normal Test line")
+        self.assertEqual(
+            line[0].amount,
+            48.0,
+            "The number of regularly worked hours is 48",
+        )
+        self.assertEqual(
+            line[0].rate,
+            100,
+            "Regular hours are paid at the normal rate",
+        )
+
+        line = richard_payslip.line_ids.filtered(lambda l: l.code == "OTTEST")
+        self.assertEqual(len(line), 1, "I found the OT Test line")
+        self.assertEqual(
+            line[0].amount,
+            9.0,
+            "The number of daily OT worked hours is 9:00",
+        )
+        self.assertEqual(
+            line[0].rate,
+            150,
+            "Daily OT hours are paid at 1.5x normal rate",
+        )
+
+        line = richard_payslip.line_ids.filtered(lambda l: l.code == "OTTEST2")
+        self.assertEqual(len(line), 1, "I found the Rest Day OT Test line")
+        self.assertEqual(
+            line[0].amount,
+            1.5,
+            "The number of Rest Day OT worked hours is 1:30",
+        )
+        self.assertEqual(
+            line[0].rate,
+            400,
+            "Rest Day OT hours are paid at 4x normal rate",
+        )
+
+    def test_holiday_ot(self):
+
+        # I check that public holidays exist
+        ph = self.PublicHoliday.search([("year", "=", 2022)])
+        self.assertTrue(ph, "There is a public holiday object")
+        self.assertGreater(len(ph.line_ids), 0, "At least one public holiday")
+
+        # I set the test rules to detect the number of
+        # regular, Holiday and Holiday OT worked hours
+        self.test_rule.amount_python_compute = (
+            "result_rate = worked_days.PL1.rate * 100 \n"
+            "result = worked_days.PL1.number_of_hours"
+        )
+        self.ot_test_rule.amount_python_compute = (
+            "result_rate = worked_days.HOL.rate * 100 \n"
+            "result = worked_days.HOL.number_of_hours"
+        )
+        self.ot_test_rule2.amount_python_compute = (
+            "result_rate = worked_days.OTH.rate * 100 \n"
+            "result = worked_days.OTH.number_of_hours"
+        )
+
+        # I create a contract for "Richard"
+        contract_start = date(2022, 1, 1)
+        start = date(2022, 4, 1)
+        end = date(2022, 4, 30)
+        self.create_contract(contract_start, False, self.richard_emp, 5000.0)
+        self.apply_contract_cron()
+
+        # I create attendance for five days
+        monday = date(2022, 4, 1)
+        for day in range(0, 5):
+            self.Attendance.create(
+                {
+                    "employee_id": self.richard_emp.id,
+                    "check_in": self.localize_dt(
+                        datetime.combine(
+                            monday + timedelta(days=day),
+                            datetime.strptime("08:00", "%H:%M").time(),
+                        ),
+                        self.richard_emp.tz,
+                        reverse=True,
+                    ),
+                    "check_out": self.localize_dt(
+                        datetime.combine(
+                            monday + timedelta(days=day),
+                            datetime.strptime("17:30", "%H:%M").time(),
+                        ),
+                        self.richard_emp.tz,
+                        reverse=True,
+                    ),
+                }
+            )
+
+        # I create an employee Payslip and process it
+        richard_payslip = self.create_payslip(
+            start, end, self.richard_emp, user=self.payroll_user
+        )
+        richard_payslip.onchange_employee()
+        richard_payslip.compute_sheet()
+
+        line = richard_payslip.line_ids.filtered(lambda l: l.code == "TEST")
+        self.assertEqual(len(line), 1, "I found the Normal Test line")
+        self.assertEqual(
+            line[0].amount,
+            32.0,
+            "The number of regularly worked hours is 32",
+        )
+        self.assertEqual(
+            line[0].rate,
+            100,
+            "Regular hours are paid at the normal rate",
+        )
+
+        line = richard_payslip.line_ids.filtered(lambda l: l.code == "OTTEST")
+        self.assertEqual(len(line), 1, "I found the OT Test line")
+        self.assertEqual(
+            line[0].amount,
+            8.0,
+            "The number of Holiday worked hours is 8:00",
+        )
+        self.assertEqual(
+            line[0].rate,
+            200,
+            "Holiday hours are paid at 2x normal rate",
+        )
+
+        line = richard_payslip.line_ids.filtered(lambda l: l.code == "OTTEST2")
+        self.assertEqual(len(line), 1, "I found the Holiday OT Test line")
+        self.assertEqual(
+            line[0].amount,
+            1.5,
+            "The number of Holiday OT worked hours is 1:30",
+        )
+        self.assertEqual(
+            line[0].rate,
+            250,
+            "Holiday OT hours are paid at 2.5x normal rate",
+        )
diff --git a/payroll_policy_payslip/tests/test_payroll_policy_presence.py b/payroll_policy_payslip/tests/test_payroll_policy_presence.py
new file mode 100644
index 00000000..34172475
--- /dev/null
+++ b/payroll_policy_payslip/tests/test_payroll_policy_presence.py
@@ -0,0 +1,329 @@
+# Copyright (C) 2022 TREVI Software
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from datetime import date, datetime, timedelta
+
+from . import common
+
+
+class TestPresencePolicy(common.TestHrPayslip):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.LeaveType = cls.env["hr.leave.type"]
+        cls.Accrual = cls.env["hr.accrual"]
+        cls.AccrualPolicy = cls.env["hr.policy.accrual"]
+        cls.AccrualPolicyLine = cls.env["hr.policy.line.accrual"]
+
+        cls.lt = cls.LeaveType.create({"name": "Rest-day Compensatory", "code": "ARD"})
+        cls.aa = cls.Accrual.create(
+            {"name": "Compensatory Rest day", "holiday_status_id": cls.lt.id}
+        )
+        cls.policy = cls.AccrualPolicy.create(
+            {
+                "name": "Compensatory Restday",
+                "date": date(2022, 1, 1),
+            }
+        )
+        cls.pl = cls.AccrualPolicyLine.create(
+            {
+                "name": "Compensatory Rest",
+                "code": "CRS",
+                "type": "hour",
+                "accrual_id": cls.aa.id,
+                "policy_id": cls.policy.id,
+                "accrual_rate_hour": 1.0,
+            }
+        )
+        cls.restday_presence_line.accrual_policy_line_id = cls.pl
+        cls.restday_presence_line.accrual_min = 8.0
+        cls.restday_presence_line.accrual_max = 8.0
+
+        # Create a salary rule for Accrual tests and add it to the salary structure
+        cls.accrual_test_rule = cls.Rule.create(
+            {
+                "name": "Accrual test rule",
+                "code": "ACRTEST",
+                "category_id": cls.env.ref("payroll.ALW").id,
+                "sequence": 6,
+                "amount_select": "code",
+                "amount_python_compute": "result = 0",
+            }
+        )
+        cls.payroll_structure.write({"rule_ids": [(4, cls.accrual_test_rule.id)]})
+
+        # Create a public holiday
+        cls.public_holiday = cls.PublicHoliday.create(
+            {
+                "year": 2022,
+                "line_ids": [
+                    (0, 0, {"name": "Foo", "date": date(2022, 4, 2)}),
+                ],
+            }
+        )
+
+    def test_worked_hours(self):
+
+        # I set the test rule to detect the number of regular worked hours
+        self.test_rule.amount_python_compute = (
+            "result_rate = worked_days.PL1.rate * 100 \n"
+            "result = worked_days.PL1.number_of_hours"
+        )
+
+        # I create a contract for "Richard"
+        contract_start = date(2022, 1, 1)
+        start = date(2022, 4, 1)
+        end = date(2022, 4, 30)
+        self.create_contract(contract_start, False, self.richard_emp, 5000.0)
+        self.apply_contract_cron()
+
+        # I create attendance for one day
+        self.Attendance.create(
+            {
+                "employee_id": self.richard_emp.id,
+                "check_in": datetime.combine(
+                    start, datetime.strptime("08:00", "%H:%M").time()
+                ),
+                "check_out": datetime.combine(
+                    start, datetime.strptime("16:00", "%H:%M").time()
+                ),
+            }
+        )
+
+        # I create an employee Payslip and process it
+        richard_payslip = self.create_payslip(
+            start, end, self.richard_emp, user=self.payroll_user
+        )
+        richard_payslip.onchange_employee()
+        richard_payslip.compute_sheet()
+
+        line = richard_payslip.line_ids.filtered(lambda l: l.code == "TEST")
+        self.assertEqual(len(line), 1, "I found the Test line")
+        self.assertEqual(
+            line[0].amount,
+            8.0,
+            "The number of worked hours is 8",
+        )
+        self.assertEqual(
+            line[0].rate,
+            100,
+            "Regular hours are paid at the normal rate",
+        )
+
+    def test_worked_holiday(self):
+
+        # I check that public holidays exist
+        ph = self.PublicHoliday.search([("year", "=", 2022)])
+        self.assertTrue(ph, "There is a public holiday object")
+        self.assertGreater(len(ph.line_ids), 0, "At least one public holiday")
+
+        # I set the test rule to detect the number of holiday worked hours
+        self.test_rule.amount_python_compute = (
+            "result_rate = worked_days.HOL.rate * 100 \n"
+            "result = worked_days.HOL.number_of_hours"
+        )
+
+        # I create a contract for "Richard"
+        contract_start = date(2022, 1, 1)
+        start = date(2022, 4, 1)
+        end = date(2022, 4, 30)
+        self.create_contract(contract_start, False, self.richard_emp, 5000.0)
+        self.apply_contract_cron()
+
+        # I create attendance on a public holiday
+        self.Attendance.create(
+            {
+                "employee_id": self.richard_emp.id,
+                "check_in": datetime.combine(
+                    start + timedelta(days=1),
+                    datetime.strptime("08:00", "%H:%M").time(),
+                ),
+                "check_out": datetime.combine(
+                    start + timedelta(days=1),
+                    datetime.strptime("16:00", "%H:%M").time(),
+                ),
+            }
+        )
+
+        # I create an employee Payslip and process it
+        richard_payslip = self.create_payslip(
+            start, end, self.richard_emp, user=self.payroll_user
+        )
+        richard_payslip.onchange_employee()
+        richard_payslip.compute_sheet()
+
+        line = richard_payslip.line_ids.filtered(lambda l: l.code == "TEST")
+        self.assertEqual(len(line), 1, "I found the Test line")
+        self.assertEqual(
+            line[0].amount,
+            8.0,
+            "The number of worked holiday hours is 8",
+        )
+        self.assertEqual(
+            line[0].rate,
+            200,
+            "Holiday hours are paid double",
+        )
+
+    def test_worked_restday(self):
+
+        # I set the test rule to detect the number of rest day worked hours
+        self.test_rule.amount_python_compute = (
+            "result_rate = worked_days.RST.rate * 100 \n"
+            "result = worked_days.RST.number_of_hours"
+        )
+        # I set the test rule to detect the number of accruals added
+        self.accrual_test_rule.amount_python_compute = (
+            "result_rate = worked_days.CRS.rate * 100 \n"
+            "result = worked_days.CRS.number_of_hours"
+        )
+
+        # I create a contract for "Richard"
+        contract_start = date(2022, 1, 1)
+        start = date(2022, 4, 1)
+        end = date(2022, 4, 30)
+        self.create_contract(contract_start, False, self.richard_emp, 5000.0)
+        self.apply_contract_cron()
+
+        # I create attendance for seven days in a row
+        monday = date(2022, 4, 4)
+        for day in range(0, 7):
+            self.Attendance.create(
+                {
+                    "employee_id": self.richard_emp.id,
+                    "check_in": self.localize_dt(
+                        datetime.combine(
+                            monday + timedelta(days=day),
+                            datetime.strptime("08:00", "%H:%M").time(),
+                        ),
+                        self.richard_emp.tz,
+                        reverse=True,
+                    ),
+                    "check_out": self.localize_dt(
+                        datetime.combine(
+                            monday + timedelta(days=day),
+                            datetime.strptime("16:00", "%H:%M").time(),
+                        ),
+                        self.richard_emp.tz,
+                        reverse=True,
+                    ),
+                }
+            )
+
+        # I create an employee Payslip and process it
+        richard_payslip = self.create_payslip(
+            start, end, self.richard_emp, user=self.payroll_user
+        )
+        richard_payslip.onchange_employee()
+        richard_payslip.compute_sheet()
+
+        line = richard_payslip.line_ids.filtered(lambda l: l.code == "TEST")
+        self.assertEqual(len(line), 1, "I found the Test line")
+        self.assertEqual(
+            line[0].amount,
+            8.0,
+            "The number of worked rest day hours is 8 (1 day)",
+        )
+        self.assertEqual(
+            line[0].rate,
+            100,
+            "Rest day hours are accrued at the regular rate",
+        )
+
+        line = richard_payslip.line_ids.filtered(lambda l: l.code == "ACRTEST")
+        self.assertEqual(len(line), 1, "I found the Accrual Test line")
+        self.assertEqual(
+            line[0].amount,
+            8.0,
+            "The number of accrued hours is 8",
+        )
+        self.assertEqual(
+            line[0].rate,
+            100,
+            "Rest day hours are accrued at a 1:1 rate",
+        )
+
+    def test_worked_restday_weekend(self):
+
+        # I set the weekly working days to 5
+        self.presence_policy.work_days_per_week = 5
+
+        # I adjust the accrual multiple to 2:1
+        self.pl.accrual_rate_hour = 2.0
+
+        # I set the test rule to detect the number of rest day worked hours
+        self.test_rule.amount_python_compute = (
+            "result_rate = worked_days.RST.rate * 100 \n"
+            "result = worked_days.RST.number_of_hours"
+        )
+        # I set the test rule to detect the number of accruals added
+        self.accrual_test_rule.amount_python_compute = (
+            "result_rate = worked_days.CRS.rate * 100 \n"
+            "result = worked_days.CRS.number_of_hours"
+        )
+
+        # I create a contract for "Richard"
+        contract_start = date(2022, 1, 1)
+        start = date(2022, 4, 1)
+        end = date(2022, 4, 30)
+        self.create_contract(contract_start, False, self.richard_emp, 5000.0)
+        self.apply_contract_cron()
+
+        # I create attendance for eight days in a row
+        monday = date(2022, 4, 4)
+        for day in range(0, 8):
+            self.Attendance.create(
+                {
+                    "employee_id": self.richard_emp.id,
+                    "check_in": self.localize_dt(
+                        datetime.combine(
+                            monday + timedelta(days=day),
+                            datetime.strptime("08:00", "%H:%M").time(),
+                        ),
+                        self.richard_emp.tz,
+                        reverse=True,
+                    ),
+                    "check_out": self.localize_dt(
+                        datetime.combine(
+                            monday + timedelta(days=day),
+                            datetime.strptime("16:00", "%H:%M").time(),
+                        ),
+                        self.richard_emp.tz,
+                        reverse=True,
+                    ),
+                }
+            )
+
+        # I create an employee Payslip and process it
+        richard_payslip = self.create_payslip(
+            start, end, self.richard_emp, user=self.payroll_user
+        )
+        richard_payslip.onchange_employee()
+        richard_payslip.compute_sheet()
+
+        line = richard_payslip.line_ids.filtered(lambda l: l.code == "TEST")
+        self.assertEqual(len(line), 1, "I found the Test line")
+        self.assertEqual(
+            line[0].amount,
+            16.0,
+            "The number of worked rest day hours is 16 (2 days)",
+        )
+        self.assertEqual(
+            line[0].rate,
+            100,
+            "Rest day hours are accrued at the regular rate",
+        )
+
+        line = richard_payslip.line_ids.filtered(lambda l: l.code == "ACRTEST")
+        self.assertEqual(len(line), 1, "I found the Accrual Test line")
+        self.assertEqual(
+            line[0].amount,
+            16.0,
+            "The number of accrued hours is 16",
+        )
+        self.assertEqual(
+            line[0].rate,
+            200,
+            "Rest day hours are accrued at a 2:1 rate",
+        )
diff --git a/payroll_policy_presence/README.rst b/payroll_policy_presence/README.rst
new file mode 100644
index 00000000..6d18a527
--- /dev/null
+++ b/payroll_policy_presence/README.rst
@@ -0,0 +1,67 @@
+=======================
+Payroll Presence Policy
+=======================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:9bad412a285e12c29c750e3c91985d64a5e489596c46593ec7aa1b224caea63f
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_policy_presence
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+Define Employee Presence Policies
+=================================
+Define properties of an employee presence policy, such as:
+    * The number of regular working hours in a day
+    * The maximum possible hours
+    * Rate (multiplier of base wage)
+    * Accrual to time bank
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_policy_presence%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+* Michael Telahun Makonnen
+
+Other credits
+~~~~~~~~~~~~~
+
+* Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_policy_presence>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/payroll_policy_presence/__init__.py b/payroll_policy_presence/__init__.py
new file mode 100644
index 00000000..1cc5116e
--- /dev/null
+++ b/payroll_policy_presence/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import models
diff --git a/payroll_policy_presence/__manifest__.py b/payroll_policy_presence/__manifest__.py
new file mode 100644
index 00000000..3578a75a
--- /dev/null
+++ b/payroll_policy_presence/__manifest__.py
@@ -0,0 +1,25 @@
+# Copyright (C) 2021 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    "name": "Payroll Presence Policy",
+    "summary": "Define properties of an employee presence policy",
+    "version": "15.0.1.0.0",
+    "category": "Payroll",
+    "author": "TREVI Software, Michael Telahun Makonnen",
+    "license": "AGPL-3",
+    "images": ["static/src/img/main_screenshot.png"],
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "hr_accrual_bank",
+        "payroll",
+        "payroll_policy_accrual",
+        "payroll_policy_group",
+    ],
+    "data": [
+        "security/ir.model.access.csv",
+        "views/hr_policy_presence_view.xml",
+    ],
+    "installable": True,
+}
diff --git a/payroll_policy_presence/i18n/payroll_policy_presence.pot b/payroll_policy_presence/i18n/payroll_policy_presence.pot
new file mode 100644
index 00000000..abe28583
--- /dev/null
+++ b/payroll_policy_presence/i18n/payroll_policy_presence.pot
@@ -0,0 +1,217 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* payroll_policy_presence
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: payroll_policy_presence
+#: model_terms:ir.ui.view,arch_db:payroll_policy_presence.presence_policy_line_form_view
+msgid "Accrual"
+msgstr ""
+
+#. module: payroll_policy_presence
+#: model:ir.model.fields,field_description:payroll_policy_presence.field_hr_policy_line_presence__accrual_policy_line_id
+msgid "Accrual Policy Line"
+msgstr ""
+
+#. module: payroll_policy_presence
+#: model:ir.model.fields,field_description:payroll_policy_presence.field_hr_policy_line_presence__active_after
+msgid "Active After"
+msgstr ""
+
+#. module: payroll_policy_presence
+#: model:ir.model.fields,field_description:payroll_policy_presence.field_hr_policy_line_presence__code
+#: model_terms:ir.ui.view,arch_db:payroll_policy_presence.presence_policy_line_form_view
+msgid "Code"
+msgstr ""
+
+#. module: payroll_policy_presence
+#: model:ir.model.fields,field_description:payroll_policy_presence.field_hr_policy_line_presence__create_uid
+#: model:ir.model.fields,field_description:payroll_policy_presence.field_hr_policy_presence__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: payroll_policy_presence
+#: model:ir.model.fields,field_description:payroll_policy_presence.field_hr_policy_line_presence__create_date
+#: model:ir.model.fields,field_description:payroll_policy_presence.field_hr_policy_presence__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: payroll_policy_presence
+#: model:ir.model.fields,field_description:payroll_policy_presence.field_hr_policy_group__display_name
+#: model:ir.model.fields,field_description:payroll_policy_presence.field_hr_policy_line_presence__display_name
+#: model:ir.model.fields,field_description:payroll_policy_presence.field_hr_policy_presence__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: payroll_policy_presence
+#: model:ir.model.fields,field_description:payroll_policy_presence.field_hr_policy_line_presence__duration
+msgid "Duration"
+msgstr ""
+
+#. module: payroll_policy_presence
+#: model:ir.model.fields,field_description:payroll_policy_presence.field_hr_policy_presence__date
+msgid "Effective Date"
+msgstr ""
+
+#. module: payroll_policy_presence
+#: model:ir.model,name:payroll_policy_presence.model_hr_policy_group
+msgid "HR Policy Group"
+msgstr ""
+
+#. module: payroll_policy_presence
+#: model:ir.model.fields.selection,name:payroll_policy_presence.selection__hr_policy_line_presence__type__holiday
+msgid "Holidays"
+msgstr ""
+
+#. module: payroll_policy_presence
+#: model:ir.model.fields,field_description:payroll_policy_presence.field_hr_policy_group__id
+#: model:ir.model.fields,field_description:payroll_policy_presence.field_hr_policy_line_presence__id
+#: model:ir.model.fields,field_description:payroll_policy_presence.field_hr_policy_presence__id
+msgid "ID"
+msgstr ""
+
+#. module: payroll_policy_presence
+#: model:ir.model.fields,help:payroll_policy_presence.field_hr_policy_line_presence__duration
+msgid "In minutes."
+msgstr ""
+
+#. module: payroll_policy_presence
+#: model:ir.model.fields,field_description:payroll_policy_presence.field_hr_policy_group____last_update
+#: model:ir.model.fields,field_description:payroll_policy_presence.field_hr_policy_line_presence____last_update
+#: model:ir.model.fields,field_description:payroll_policy_presence.field_hr_policy_presence____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: payroll_policy_presence
+#: model:ir.model.fields,field_description:payroll_policy_presence.field_hr_policy_line_presence__write_uid
+#: model:ir.model.fields,field_description:payroll_policy_presence.field_hr_policy_presence__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: payroll_policy_presence
+#: model:ir.model.fields,field_description:payroll_policy_presence.field_hr_policy_line_presence__write_date
+#: model:ir.model.fields,field_description:payroll_policy_presence.field_hr_policy_presence__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: payroll_policy_presence
+#: model:ir.model.fields,field_description:payroll_policy_presence.field_hr_policy_line_presence__accrual_max
+msgid "Maximum Accrual"
+msgstr ""
+
+#. module: payroll_policy_presence
+#: model:ir.model.fields,field_description:payroll_policy_presence.field_hr_policy_line_presence__accrual_min
+msgid "Minimum Accrual"
+msgstr ""
+
+#. module: payroll_policy_presence
+#: model:ir.model.fields,help:payroll_policy_presence.field_hr_policy_line_presence__active_after
+msgid "Minutes after first punch of the day in which policy will take effect."
+msgstr ""
+
+#. module: payroll_policy_presence
+#: model:ir.model.fields,help:payroll_policy_presence.field_hr_policy_line_presence__rate
+msgid "Multiplier of employee wage."
+msgstr ""
+
+#. module: payroll_policy_presence
+#: model:ir.model.fields,field_description:payroll_policy_presence.field_hr_policy_line_presence__name
+#: model:ir.model.fields,field_description:payroll_policy_presence.field_hr_policy_presence__name
+#: model_terms:ir.ui.view,arch_db:payroll_policy_presence.presence_policy_line_form_view
+#: model_terms:ir.ui.view,arch_db:payroll_policy_presence.presence_policy_view_form
+msgid "Name"
+msgstr ""
+
+#. module: payroll_policy_presence
+#: model:ir.model.fields.selection,name:payroll_policy_presence.selection__hr_policy_line_presence__type__normal
+msgid "Normal Working Hours"
+msgstr ""
+
+#. module: payroll_policy_presence
+#: model:ir.model.fields,field_description:payroll_policy_presence.field_hr_policy_line_presence__policy_id
+msgid "Policy"
+msgstr ""
+
+#. module: payroll_policy_presence
+#: model:ir.model.fields,field_description:payroll_policy_presence.field_hr_policy_presence__line_ids
+#: model_terms:ir.ui.view,arch_db:payroll_policy_presence.presence_policy_view_form
+msgid "Policy Lines"
+msgstr ""
+
+#. module: payroll_policy_presence
+#: model_terms:ir.ui.view,arch_db:payroll_policy_presence.presence_policy_line_tree_view
+msgid "Presence Lines"
+msgstr ""
+
+#. module: payroll_policy_presence
+#: model:ir.actions.act_window,name:payroll_policy_presence.open_presence_policy
+#: model:ir.ui.menu,name:payroll_policy_presence.menu_hr_presence_policy
+#: model_terms:ir.ui.view,arch_db:payroll_policy_presence.presence_policy_view_tree
+msgid "Presence Policies"
+msgstr ""
+
+#. module: payroll_policy_presence
+#: model:ir.model.fields,field_description:payroll_policy_presence.field_hr_policy_group__presence_policy_ids
+#: model_terms:ir.ui.view,arch_db:payroll_policy_presence.presence_policy_view_form
+msgid "Presence Policy"
+msgstr ""
+
+#. module: payroll_policy_presence
+#: model_terms:ir.ui.view,arch_db:payroll_policy_presence.presence_policy_line_form_view
+msgid "Presence Policy Line"
+msgstr ""
+
+#. module: payroll_policy_presence
+#: model:ir.model,name:payroll_policy_presence.model_hr_policy_presence
+msgid "Presence payroll policy"
+msgstr ""
+
+#. module: payroll_policy_presence
+#: model:ir.model,name:payroll_policy_presence.model_hr_policy_line_presence
+msgid "Presence payroll policy line"
+msgstr ""
+
+#. module: payroll_policy_presence
+#: model:ir.model.fields,field_description:payroll_policy_presence.field_hr_policy_line_presence__rate
+msgid "Rate"
+msgstr ""
+
+#. module: payroll_policy_presence
+#: model:ir.model.fields,help:payroll_policy_presence.field_hr_policy_presence__work_days_per_week
+msgid "Regular work days in a work week."
+msgstr ""
+
+#. module: payroll_policy_presence
+#: model:ir.model.fields.selection,name:payroll_policy_presence.selection__hr_policy_line_presence__type__restday
+msgid "Rest Days"
+msgstr ""
+
+#. module: payroll_policy_presence
+#: model:ir.model.fields,field_description:payroll_policy_presence.field_hr_policy_line_presence__type
+msgid "Type"
+msgstr ""
+
+#. module: payroll_policy_presence
+#: model:ir.model.fields,help:payroll_policy_presence.field_hr_policy_line_presence__code
+msgid "Use this code in the salary rules."
+msgstr ""
+
+#. module: payroll_policy_presence
+#: model:ir.model.fields,field_description:payroll_policy_presence.field_hr_policy_presence__work_days_per_week
+msgid "Work Days/Week"
+msgstr ""
+
+#. module: payroll_policy_presence
+#: model:ir.model.fields,field_description:payroll_policy_presence.field_hr_policy_presence__work_hours_per_week
+msgid "Working Hours/Week"
+msgstr ""
diff --git a/payroll_policy_presence/models/__init__.py b/payroll_policy_presence/models/__init__.py
new file mode 100644
index 00000000..c290f6a2
--- /dev/null
+++ b/payroll_policy_presence/models/__init__.py
@@ -0,0 +1,7 @@
+# Copyright (C) 2021 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import hr_policy_group
+from . import hr_policy_line_presence
+from . import hr_policy_presence
diff --git a/payroll_policy_presence/models/hr_policy_group.py b/payroll_policy_presence/models/hr_policy_group.py
new file mode 100644
index 00000000..ef196867
--- /dev/null
+++ b/payroll_policy_presence/models/hr_policy_group.py
@@ -0,0 +1,18 @@
+# Copyright (C) 2021 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class PolicyGroup(models.Model):
+
+    _inherit = "hr.policy.group"
+
+    presence_policy_ids = fields.Many2many(
+        string="Presence Policy",
+        comodel_name="hr.policy.presence",
+        relation="hr_policy_group_presence_rel",
+        column1="group_id",
+        column2="presence_id",
+    )
diff --git a/payroll_policy_presence/models/hr_policy_line_presence.py b/payroll_policy_presence/models/hr_policy_line_presence.py
new file mode 100644
index 00000000..ccdd8bc1
--- /dev/null
+++ b/payroll_policy_presence/models/hr_policy_line_presence.py
@@ -0,0 +1,34 @@
+# Copyright (C) 2021 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class PolicyLinePresence(models.Model):
+
+    _name = "hr.policy.line.presence"
+    _description = "Presence payroll policy line"
+
+    name = fields.Char(size=64, required=True)
+    policy_id = fields.Many2one(comodel_name="hr.policy.presence", string="Policy")
+    code = fields.Char(required=True, help="Use this code in the salary rules.")
+    rate = fields.Float(required=True, help="Multiplier of employee wage.", default=1.0)
+    type = fields.Selection(
+        selection=[
+            ("normal", "Normal Working Hours"),
+            ("holiday", "Holidays"),
+            ("restday", "Rest Days"),
+        ],
+        required=True,
+    )
+    active_after = fields.Integer(
+        required=True,
+        help="Minutes after first punch of the day in which policy will take effect.",
+    )
+    duration = fields.Integer(required=True, help="In minutes.")
+    accrual_policy_line_id = fields.Many2one(
+        string="Accrual Policy Line", comodel_name="hr.policy.line.accrual"
+    )
+    accrual_min = fields.Float(string="Minimum Accrual", digits="Accruals")
+    accrual_max = fields.Float(string="Maximum Accrual", digits="Accruals")
diff --git a/payroll_policy_presence/models/hr_policy_presence.py b/payroll_policy_presence/models/hr_policy_presence.py
new file mode 100644
index 00000000..5c69e5dc
--- /dev/null
+++ b/payroll_policy_presence/models/hr_policy_presence.py
@@ -0,0 +1,47 @@
+# Copyright (C) 2021 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class PolicyPresence(models.Model):
+
+    _name = "hr.policy.presence"
+    _description = "Presence payroll policy"
+    _order = "date desc"
+
+    name = fields.Char(required=True)
+    date = fields.Date(string="Effective Date", required=True)
+    work_hours_per_week = fields.Integer(
+        string="Working Hours/Week", required=True, default=40
+    )
+    work_days_per_week = fields.Integer(
+        string="Work Days/Week", default=6, help="Regular work days in a work week."
+    )
+    line_ids = fields.One2many(
+        string="Policy Lines",
+        comodel_name="hr.policy.line.presence",
+        inverse_name="policy_id",
+    )
+
+    def get_codes(self):
+
+        res = []
+        for policy in self:
+            for line in policy.line_ids:
+                res.append(
+                    (
+                        line.code,
+                        line.name,
+                        line.type,
+                        line.rate,
+                        line.duration,
+                        line.accrual_policy_line_id.id,
+                        line.accrual_policy_line_id.code,
+                        line.accrual_policy_line_id.accrual_rate_hour,
+                        line.accrual_min,
+                        line.accrual_max,
+                    )
+                )
+        return res
diff --git a/payroll_policy_presence/readme/CREDITS.rst b/payroll_policy_presence/readme/CREDITS.rst
new file mode 100644
index 00000000..d264bc7e
--- /dev/null
+++ b/payroll_policy_presence/readme/CREDITS.rst
@@ -0,0 +1 @@
+* Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/payroll_policy_presence/readme/DESCRIPTION.rst b/payroll_policy_presence/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..82cb0d59
--- /dev/null
+++ b/payroll_policy_presence/readme/DESCRIPTION.rst
@@ -0,0 +1,7 @@
+Define Employee Presence Policies
+=================================
+Define properties of an employee presence policy, such as:
+    * The number of regular working hours in a day
+    * The maximum possible hours
+    * Rate (multiplier of base wage)
+    * Accrual to time bank
diff --git a/payroll_policy_presence/security/ir.model.access.csv b/payroll_policy_presence/security/ir.model.access.csv
new file mode 100644
index 00000000..bfb9ffc0
--- /dev/null
+++ b/payroll_policy_presence/security/ir.model.access.csv
@@ -0,0 +1,7 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_policy_line_presence_hro,access_hr_policy_line_presence,model_hr_policy_line_presence,hr.group_hr_user,1,0,0,0
+access_hr_policy_line_presence_pu,access_hr_policy_line_presence,model_hr_policy_line_presence,payroll.group_payroll_user,1,0,0,0
+access_hr_policy_line_presence_payroll,access_hr_policy_line_presence,model_hr_policy_line_presence,payroll.group_payroll_manager,1,1,1,1
+access_hr_policy_presence_hro,access_hr_policy_presence,model_hr_policy_presence,hr.group_hr_user,1,0,0,0
+access_hr_policy_presence_pu,access_hr_policy_presence,model_hr_policy_presence,payroll.group_payroll_user,1,0,0,0
+access_hr_policy_presence_payroll,access_hr_policy_line_presence,model_hr_policy_presence,payroll.group_payroll_manager,1,1,1,1
diff --git a/payroll_policy_presence/static/description/icon.png b/payroll_policy_presence/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/payroll_policy_presence/static/description/icon.png differ
diff --git a/payroll_policy_presence/static/description/index.html b/payroll_policy_presence/static/description/index.html
new file mode 100644
index 00000000..dae196e8
--- /dev/null
+++ b/payroll_policy_presence/static/description/index.html
@@ -0,0 +1,418 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Payroll Presence Policy</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="payroll-presence-policy">
+<h1 class="title">Payroll Presence Policy</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:9bad412a285e12c29c750e3c91985d64a5e489596c46593ec7aa1b224caea63f
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_policy_presence"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<div class="section" id="define-employee-presence-policies">
+<h1>Define Employee Presence Policies</h1>
+<dl class="docutils">
+<dt>Define properties of an employee presence policy, such as:</dt>
+<dd><ul class="first last simple">
+<li>The number of regular working hours in a day</li>
+<li>The maximum possible hours</li>
+<li>Rate (multiplier of base wage)</li>
+<li>Accrual to time bank</li>
+</ul>
+</dd>
+</dl>
+<p><strong>Table of contents</strong></p>
+</div>
+<div class="section" id="bug-tracker">
+<h1>Bug Tracker</h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_policy_presence%0Aversion:%2014.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>Credits</h1>
+<div class="section" id="authors">
+<h2>Authors</h2>
+<ul class="simple">
+<li>TREVI Software</li>
+<li>Michael Telahun Makonnen</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2>Other credits</h2>
+<ul class="simple">
+<li>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2>Maintainers</h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_policy_presence">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/payroll_policy_presence/static/src/img/main_screenshot.png b/payroll_policy_presence/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/payroll_policy_presence/static/src/img/main_screenshot.png differ
diff --git a/payroll_policy_presence/tests/__init__.py b/payroll_policy_presence/tests/__init__.py
new file mode 100644
index 00000000..7498bd5e
--- /dev/null
+++ b/payroll_policy_presence/tests/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2021 TREVI Software
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import test_payroll_policy_access
diff --git a/payroll_policy_presence/tests/test_payroll_policy_access.py b/payroll_policy_presence/tests/test_payroll_policy_access.py
new file mode 100644
index 00000000..dc34c0d7
--- /dev/null
+++ b/payroll_policy_presence/tests/test_payroll_policy_access.py
@@ -0,0 +1,168 @@
+# Copyright (C) 2021 TREVI Software
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from datetime import date
+
+from odoo.exceptions import AccessError
+from odoo.tests import common, new_test_user
+
+
+class TestPolicyAccess(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super(TestPolicyAccess, cls).setUpClass()
+
+        cls.Policy = cls.env["hr.policy.presence"]
+        cls.PolicyLine = cls.env["hr.policy.line.presence"]
+        cls.policy = cls.Policy.create({"name": "POLICY1", "date": date.today()})
+        cls.line = cls.PolicyLine.create(
+            {
+                "name": "Line1",
+                "code": "L1",
+                "type": "normal",
+                "active_after": 8.0,
+                "duration": 1.0,
+                "policy_id": cls.policy.id,
+            }
+        )
+        # Payroll Manager user
+        cls.userPM = new_test_user(
+            cls.env,
+            login="pm",
+            groups="base.group_user,payroll.group_payroll_manager",
+            name="Payroll manager",
+            email="pm@example.com",
+        )
+        # Payroll user
+        cls.userPU = new_test_user(
+            cls.env,
+            login="pu",
+            groups="base.group_user,payroll.group_payroll_user",
+            name="Payroll manager",
+            email="pu@example.com",
+        )
+        # HR Manager
+        cls.userHRM = new_test_user(
+            cls.env,
+            login="hrm",
+            groups="base.group_user,hr.group_hr_manager",
+            name="Payroll manager",
+            email="hrm@example.com",
+        )
+
+    def test_hrm_access(self):
+        """HRM only has read access"""
+
+        # Create fails
+        with self.assertRaises(AccessError):
+            self.Policy.with_user(self.userHRM).create(
+                {"name": "POLICY2", "date": date.today()}
+            )
+            self.OtPolicyLine.with_user(self.userHRM).create(
+                {"name": "line2", "type": "daily"}
+            )
+        # Unlink fails
+        with self.assertRaises(AccessError):
+            self.policy.with_user(self.userHRM).unlink()
+            self.line.with_user(self.userHRM).unlink()
+        # Read succeeds
+        try:
+            self.Policy.with_user(self.userHRM).browse(self.policy.id)
+        except AccessError:
+            self.fail("Caught an unexpected exception reading hr.policy.presence")
+        try:
+            self.PolicyLine.with_user(self.userHRM).browse(self.policy.id)
+        except AccessError:
+            self.fail("Caught an unexpected exception reading hr.policy.line.presence")
+        # Write fails
+        with self.assertRaises(AccessError):
+            self.Policy.with_user(self.userHRM).browse(self.policy.id).write(
+                {"name": "POLICY3"}
+            )
+            self.PolicyLine.with_user(self.userHRM).browse(self.line.id).write(
+                {"name": "line3"}
+            )
+
+    def test_payroll_user_access(self):
+        """Payroll User only has read access"""
+
+        # Create fails
+        with self.assertRaises(AccessError):
+            self.Policy.with_user(self.userPU).create(
+                {"name": "POL2", "date": date.today()}
+            )
+            self.PolicyLine.with_user(self.userPU).create(
+                {"name": "line2", "type": "daily"}
+            )
+        # Unlink fails
+        with self.assertRaises(AccessError):
+            self.policy.with_user(self.userPU).unlink()
+            self.line.with_user(self.userPU).unlink()
+        # Read succeeds
+        try:
+            self.Policy.with_user(self.userPU).browse(self.policy.id)
+        except AccessError:
+            self.fail("Caught an unexpected exception reading hr.policy.presence")
+        try:
+            self.PolicyLine.with_user(self.userPU).browse(self.policy.id)
+        except AccessError:
+            self.fail("Caught an unexpected exception reading hr.policy.line.presence")
+        # Write fails
+        with self.assertRaises(AccessError):
+            self.Policy.with_user(self.userPU).browse(self.policy.id).write(
+                {"name": "POL3"}
+            )
+            self.PolicyLine.with_user(self.userPU).browse(self.line.id).write(
+                {"name": "line3"}
+            )
+
+    def test_payroll_manager_access(self):
+        """Payroll Manager has complete access"""
+
+        # Read succeeds
+        try:
+            self.Policy.with_user(self.userPM).browse(self.policy.id)
+        except AccessError:
+            self.fail("Caught an unexpected exception reading hr.policy.presence")
+        try:
+            self.PolicyLine.with_user(self.userPM).browse(self.line.id)
+        except AccessError:
+            self.fail("Caught an unexpected exception reading hr.policy.line.presence")
+        # Write succeeds
+        try:
+            self.Policy.with_user(self.userPM).browse(self.policy.id).write(
+                {"name": "XX"}
+            )
+        except AccessError:
+            self.fail("Caught an unexpected exception writing hr.policy.presence")
+        try:
+            self.PolicyLine.with_user(self.userPM).browse(self.line.id).write(
+                {"name": "XX"}
+            )
+        except AccessError:
+            self.fail("Caught an unexpected exception writing hr.policy.line.presence")
+        # Create/Unlink succeeds
+        try:
+            pol = self.Policy.with_user(self.userPM).create(
+                {"name": "Policy test pm", "date": date.today()}
+            )
+            pol.unlink()
+        except AccessError:
+            self.fail(
+                "Caught unexpected exception creating/unlinking hr.policy.presence"
+            )
+        try:
+            line = self.PolicyLine.with_user(self.userPM).create(
+                {
+                    "name": "line test pm",
+                    "type": "normal",
+                    "active_after": 8.0,
+                    "duration": 1.0,
+                    "code": "A",
+                }
+            )
+            line.unlink()
+        except AccessError:
+            self.fail(
+                "Caught unexpected exception creating/unlinking hr.policy.line.presence"
+            )
diff --git a/payroll_policy_presence/views/hr_policy_presence_view.xml b/payroll_policy_presence/views/hr_policy_presence_view.xml
new file mode 100644
index 00000000..35838c48
--- /dev/null
+++ b/payroll_policy_presence/views/hr_policy_presence_view.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+
+        <!-- Holiday Policy Lines -->
+
+        <record id="presence_policy_line_tree_view" model="ir.ui.view">
+            <field name="name">hr.policy.line.presence.tree</field>
+            <field name="model">hr.policy.line.presence</field>
+            <field name="arch" type="xml">
+                <tree string="Presence Lines">
+                    <field name="name" />
+                    <field name="code" />
+                    <field name="type" />
+                    <field name="rate" />
+                    <field name="active_after" />
+                    <field name="duration" />
+                </tree>
+            </field>
+        </record>
+
+        <record id="presence_policy_line_form_view" model="ir.ui.view">
+            <field name="name">hr.policy.line.presence.form</field>
+            <field name="model">hr.policy.line.presence</field>
+            <field name="arch" type="xml">
+                <form string="Presence Policy Line">
+                    <sheet>
+                        <h1>
+                            <label for="name" string="Name" class="oe_edit_only" />
+                            <field name="name" />
+                        </h1>
+                        <h1>
+                            <label for="code" string="Code" class="oe_edit_only" />
+                            <field name="code" />
+                        </h1>
+                        <group>
+                            <group>
+                                <field name="type" />
+                                <field
+                                    name="active_after"
+                                    attrs="{'required': [('type','=','weekly')]}"
+                                />
+                                <field name="duration" />
+                                <field name="rate" />
+                            </group>
+                            <group>
+                                <field name="policy_id" />
+                            </group>
+                            <group string="Accrual">
+                                <field name="accrual_policy_line_id" />
+                                <field name="accrual_min" />
+                                <field name="accrual_max" />
+                            </group>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <!-- Presence Policy -->
+        <record id="presence_policy_view_tree" model="ir.ui.view">
+            <field name="name">hr.policy.presence.tree</field>
+            <field name="model">hr.policy.presence</field>
+            <field name="arch" type="xml">
+                <tree string="Presence Policies">
+                    <field name="name" />
+                    <field name="date" />
+                    <field name="work_hours_per_week" />
+                    <field name="work_days_per_week" />
+                </tree>
+            </field>
+        </record>
+
+        <record id="presence_policy_view_form" model="ir.ui.view">
+            <field name="name">hr.policy.presence.form</field>
+            <field name="model">hr.policy.presence</field>
+            <field name="arch" type="xml">
+                <form string="Presence Policy">
+                    <sheet>
+                        <h1>
+                            <label for="name" string="Name" class="oe_edit_only" />
+                            <field name="name" />
+                        </h1>
+                        <group>
+                            <group>
+                                <field name="date" />
+                            </group>
+                            <group>
+                                <field name="work_hours_per_week" />
+                                <field name="work_days_per_week" />
+                            </group>
+                        </group>
+                        <group string="Policy Lines">
+                            <field name="line_ids" nolabel="1" editable="top" />
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="open_presence_policy" model="ir.actions.act_window">
+            <field name="name">Presence Policies</field>
+            <field name="res_model">hr.policy.presence</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem
+            action="open_presence_policy"
+            id="menu_hr_presence_policy"
+            parent="payroll_policy_group.menu_hr_policy_configuration"
+            sequence="10"
+        />
+
+        <!-- Policy Group -->
+
+        <record id="policy_group_view_form" model="ir.ui.view">
+            <field name="name">hr.policy.group.form.presenceinherit</field>
+            <field name="model">hr.policy.group</field>
+            <field
+                name="inherit_id"
+                ref="payroll_policy_group.policy_group_view_form"
+            />
+            <field name="arch" type="xml">
+                <xpath expr="//group[@name='left']" position="inside">
+                    <field name="presence_policy_ids" />
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/payroll_policy_rounding/README.rst b/payroll_policy_rounding/README.rst
new file mode 100644
index 00000000..a8b7604b
--- /dev/null
+++ b/payroll_policy_rounding/README.rst
@@ -0,0 +1,64 @@
+===============
+Rounding Policy
+===============
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:4ed058b8b87e839b22d2b866aaaa1730dd3deef97a1e693fa468750e0d627081
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_policy_rounding
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+This module defines properties of an attendance rounding policy, such as:
+    * Check-in grace period
+    * Early check-in and late check-out rounding
+    * Rounding intervals (for example 15 minute rounding intervals)
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_policy_rounding%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+* Michael Telahun Makonnen
+
+Other credits
+~~~~~~~~~~~~~
+
+* Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_policy_rounding>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/payroll_policy_rounding/__init__.py b/payroll_policy_rounding/__init__.py
new file mode 100644
index 00000000..47f1b5c9
--- /dev/null
+++ b/payroll_policy_rounding/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2022 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import models
diff --git a/payroll_policy_rounding/__manifest__.py b/payroll_policy_rounding/__manifest__.py
new file mode 100644
index 00000000..09277eba
--- /dev/null
+++ b/payroll_policy_rounding/__manifest__.py
@@ -0,0 +1,25 @@
+# Copyright (C) 2022 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    "name": "Rounding Policy",
+    "summary": "Define attendance check-in and check-out rounding policies",
+    "version": "15.0.1.0.0",
+    "category": "Human Resources",
+    "author": "TREVI Software,Michael Telahun Makonnen",
+    "license": "AGPL-3",
+    "images": ["static/src/img/main_screenshot.png"],
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "hr_attendance",
+        "hr_contract",
+        "payroll_policy_group",
+        "resource_schedule",
+    ],
+    "data": [
+        "security/ir.model.access.csv",
+        "views/payroll_policy_view.xml",
+    ],
+    "installable": True,
+}
diff --git a/payroll_policy_rounding/i18n/payroll_policy_rounding.pot b/payroll_policy_rounding/i18n/payroll_policy_rounding.pot
new file mode 100644
index 00000000..5caf409f
--- /dev/null
+++ b/payroll_policy_rounding/i18n/payroll_policy_rounding.pot
@@ -0,0 +1,227 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* payroll_policy_rounding
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: payroll_policy_rounding
+#: model:ir.model,name:payroll_policy_rounding.model_hr_attendance
+msgid "Attendance"
+msgstr ""
+
+#. module: payroll_policy_rounding
+#: model_terms:ir.ui.view,arch_db:payroll_policy_rounding.rounding_policy_view_tree
+msgid "Attendance Rounding Policies"
+msgstr ""
+
+#. module: payroll_policy_rounding
+#: model:ir.model,name:payroll_policy_rounding.model_hr_policy_rounding
+#: model_terms:ir.ui.view,arch_db:payroll_policy_rounding.rounding_policy_view_form
+msgid "Attendance Rounding Policy"
+msgstr ""
+
+#. module: payroll_policy_rounding
+#: model:ir.model,name:payroll_policy_rounding.model_hr_policy_line_rounding
+msgid "Attendance Rounding Policy Line"
+msgstr ""
+
+#. module: payroll_policy_rounding
+#: model:ir.model.fields,field_description:payroll_policy_rounding.field_hr_policy_line_rounding__attendance_type
+msgid "Attendance Type"
+msgstr ""
+
+#. module: payroll_policy_rounding
+#: code:addons/payroll_policy_rounding/models/hr_policy_rounding.py:0
+#: model:ir.model.constraint,message:payroll_policy_rounding.constraint_hr_policy_line_rounding_uniq_id_att_type
+#, python-format
+msgid "Attendance types must be unique per rounding policy line"
+msgstr ""
+
+#. module: payroll_policy_rounding
+#: model:ir.model.fields.selection,name:payroll_policy_rounding.selection__hr_policy_line_rounding__round_type__avg
+msgid "Average"
+msgstr ""
+
+#. module: payroll_policy_rounding
+#: code:addons/payroll_policy_rounding/models/hr_employee.py:0
+#, python-format
+msgid ""
+"Cannot perform check out on %(empl_name)s, could not find corresponding "
+"check in. Your attendances have probably been modified manually by human "
+"resources."
+msgstr ""
+
+#. module: payroll_policy_rounding
+#: model:ir.model.fields,field_description:payroll_policy_rounding.field_hr_attendance__clock_in
+#: model_terms:ir.ui.view,arch_db:payroll_policy_rounding.view_attendance_filter
+msgid "Clock In"
+msgstr ""
+
+#. module: payroll_policy_rounding
+#: model:ir.model.fields,field_description:payroll_policy_rounding.field_hr_attendance__clock_out
+#: model_terms:ir.ui.view,arch_db:payroll_policy_rounding.view_attendance_filter
+msgid "Clock Out"
+msgstr ""
+
+#. module: payroll_policy_rounding
+#: model:ir.model.fields,field_description:payroll_policy_rounding.field_hr_policy_line_rounding__create_uid
+#: model:ir.model.fields,field_description:payroll_policy_rounding.field_hr_policy_rounding__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: payroll_policy_rounding
+#: model:ir.model.fields,field_description:payroll_policy_rounding.field_hr_policy_line_rounding__create_date
+#: model:ir.model.fields,field_description:payroll_policy_rounding.field_hr_policy_rounding__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: payroll_policy_rounding
+#: model:ir.model.fields,field_description:payroll_policy_rounding.field_hr_attendance__display_name
+#: model:ir.model.fields,field_description:payroll_policy_rounding.field_hr_employee__display_name
+#: model:ir.model.fields,field_description:payroll_policy_rounding.field_hr_policy_group__display_name
+#: model:ir.model.fields,field_description:payroll_policy_rounding.field_hr_policy_line_rounding__display_name
+#: model:ir.model.fields,field_description:payroll_policy_rounding.field_hr_policy_rounding__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: payroll_policy_rounding
+#: model:ir.model.fields.selection,name:payroll_policy_rounding.selection__hr_policy_line_rounding__round_type__down
+msgid "Down"
+msgstr ""
+
+#. module: payroll_policy_rounding
+#: model:ir.model.fields,field_description:payroll_policy_rounding.field_hr_policy_rounding__date
+msgid "Effective Date"
+msgstr ""
+
+#. module: payroll_policy_rounding
+#: model:ir.model,name:payroll_policy_rounding.model_hr_employee
+msgid "Employee"
+msgstr ""
+
+#. module: payroll_policy_rounding
+#: model:ir.model.fields,field_description:payroll_policy_rounding.field_hr_policy_line_rounding__grace
+msgid "Grace Period"
+msgstr ""
+
+#. module: payroll_policy_rounding
+#: model:ir.model,name:payroll_policy_rounding.model_hr_policy_group
+msgid "HR Policy Group"
+msgstr ""
+
+#. module: payroll_policy_rounding
+#: model:ir.model.fields,field_description:payroll_policy_rounding.field_hr_attendance__id
+#: model:ir.model.fields,field_description:payroll_policy_rounding.field_hr_employee__id
+#: model:ir.model.fields,field_description:payroll_policy_rounding.field_hr_policy_group__id
+#: model:ir.model.fields,field_description:payroll_policy_rounding.field_hr_policy_line_rounding__id
+#: model:ir.model.fields,field_description:payroll_policy_rounding.field_hr_policy_rounding__id
+msgid "ID"
+msgstr ""
+
+#. module: payroll_policy_rounding
+#: model:ir.model.fields,field_description:payroll_policy_rounding.field_hr_attendance____last_update
+#: model:ir.model.fields,field_description:payroll_policy_rounding.field_hr_employee____last_update
+#: model:ir.model.fields,field_description:payroll_policy_rounding.field_hr_policy_group____last_update
+#: model:ir.model.fields,field_description:payroll_policy_rounding.field_hr_policy_line_rounding____last_update
+#: model:ir.model.fields,field_description:payroll_policy_rounding.field_hr_policy_rounding____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: payroll_policy_rounding
+#: model:ir.model.fields,field_description:payroll_policy_rounding.field_hr_policy_line_rounding__write_uid
+#: model:ir.model.fields,field_description:payroll_policy_rounding.field_hr_policy_rounding__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: payroll_policy_rounding
+#: model:ir.model.fields,field_description:payroll_policy_rounding.field_hr_policy_line_rounding__write_date
+#: model:ir.model.fields,field_description:payroll_policy_rounding.field_hr_policy_rounding__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: payroll_policy_rounding
+#: model:ir.model.fields,field_description:payroll_policy_rounding.field_hr_policy_rounding__name
+#: model_terms:ir.ui.view,arch_db:payroll_policy_rounding.rounding_policy_view_form
+msgid "Name"
+msgstr ""
+
+#. module: payroll_policy_rounding
+#: model:ir.model.fields,field_description:payroll_policy_rounding.field_hr_policy_line_rounding__policy_id
+msgid "Policy"
+msgstr ""
+
+#. module: payroll_policy_rounding
+#: model:ir.model.fields,field_description:payroll_policy_rounding.field_hr_policy_rounding__line_ids
+msgid "Policy Lines"
+msgstr ""
+
+#. module: payroll_policy_rounding
+#: model:ir.model.fields,field_description:payroll_policy_rounding.field_hr_policy_line_rounding__preauth_ot
+msgid "Pre-authorized OT"
+msgstr ""
+
+#. module: payroll_policy_rounding
+#: model:ir.model.fields,field_description:payroll_policy_rounding.field_hr_policy_line_rounding__round_interval
+msgid "Round Interval"
+msgstr ""
+
+#. module: payroll_policy_rounding
+#: model:ir.model.fields,field_description:payroll_policy_rounding.field_hr_policy_line_rounding__round_type
+msgid "Round Type"
+msgstr ""
+
+#. module: payroll_policy_rounding
+#: model_terms:ir.ui.view,arch_db:payroll_policy_rounding.rounding_policy_view_form
+msgid "Rounding Lines"
+msgstr ""
+
+#. module: payroll_policy_rounding
+#: model:ir.actions.act_window,name:payroll_policy_rounding.open_rounding_policy
+#: model:ir.ui.menu,name:payroll_policy_rounding.menu_hr_rounding_policy
+msgid "Rounding Policies"
+msgstr ""
+
+#. module: payroll_policy_rounding
+#: model:ir.model.fields,field_description:payroll_policy_rounding.field_hr_policy_group__rounding_policy_ids
+msgid "Rounding Policy"
+msgstr ""
+
+#. module: payroll_policy_rounding
+#: model_terms:ir.ui.view,arch_db:payroll_policy_rounding.rounding_policy_line_form_view
+msgid "Rounding Policy Line"
+msgstr ""
+
+#. module: payroll_policy_rounding
+#: model:ir.actions.act_window,name:payroll_policy_rounding.open_rounding_policy_line
+#: model_terms:ir.ui.view,arch_db:payroll_policy_rounding.rounding_policy_line_tree_view
+msgid "Rounding Policy Lines"
+msgstr ""
+
+#. module: payroll_policy_rounding
+#: model:ir.model.fields.selection,name:payroll_policy_rounding.selection__hr_policy_line_rounding__attendance_type__in
+msgid "Sign-in"
+msgstr ""
+
+#. module: payroll_policy_rounding
+#: model:ir.model.fields.selection,name:payroll_policy_rounding.selection__hr_policy_line_rounding__attendance_type__out
+msgid "Sign-out"
+msgstr ""
+
+#. module: payroll_policy_rounding
+#: model:ir.model.fields,field_description:payroll_policy_rounding.field_hr_policy_rounding__tz
+msgid "Time Zone"
+msgstr ""
+
+#. module: payroll_policy_rounding
+#: model:ir.model.fields.selection,name:payroll_policy_rounding.selection__hr_policy_line_rounding__round_type__up
+msgid "Up"
+msgstr ""
diff --git a/payroll_policy_rounding/models/__init__.py b/payroll_policy_rounding/models/__init__.py
new file mode 100644
index 00000000..94f03ac5
--- /dev/null
+++ b/payroll_policy_rounding/models/__init__.py
@@ -0,0 +1,8 @@
+# Copyright (C) 2022 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import hr_attendance
+from . import hr_employee
+from . import hr_policy_group
+from . import hr_policy_rounding
diff --git a/payroll_policy_rounding/models/hr_attendance.py b/payroll_policy_rounding/models/hr_attendance.py
new file mode 100644
index 00000000..c21a9582
--- /dev/null
+++ b/payroll_policy_rounding/models/hr_attendance.py
@@ -0,0 +1,138 @@
+# Copyright (C) 2022 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+
+from odoo import api, fields, models
+
+
+class HrAttendance(models.Model):
+
+    _inherit = "hr.attendance"
+
+    clock_in = fields.Datetime()
+    clock_out = fields.Datetime()
+
+    @api.model
+    def _get_schedule(self, ee_id, d, contract):
+
+        sched_hours = []
+        if contract:
+            ResourceShift = self.env["resource.schedule.shift"]
+            shifts = ResourceShift.search(
+                [
+                    ("employee_id", "=", ee_id),
+                    ("day", "=", d),
+                ]
+            )
+            sched_hours = shifts.datetimes_naive_utc()
+        return sched_hours
+
+    @api.model
+    def _get_schedule_by_approximation(self, ee_id, action, utcdt, contract):
+
+        shift_records = self._get_schedule(ee_id, utcdt.date(), contract)
+        dtBestIn = dtBestOut = shiftBest = previousDelta = False
+        for utcIn, utcOut, shift in shift_records:
+            if action == "sign_in":
+                delta = abs((utcdt - utcIn).total_seconds())
+                if utcIn == utcdt:
+                    return (utcIn, utcOut, shift)
+                elif delta <= (8 * 60 * 60):
+                    if previousDelta is False or (delta < previousDelta):
+                        previousDelta = delta
+                        dtBestIn = utcIn
+                        dtBestOut = utcOut
+                        shiftBest = shift
+            elif action == "sign_out":
+                delta = abs((utcdt - utcOut).total_seconds())
+                if utcOut == utcdt:
+                    return (utcIn, utcOut, shift)
+                elif delta <= (8 * 60 * 60):
+                    if previousDelta is False or (delta < previousDelta):
+                        previousDelta = delta
+                        dtBestIn = utcIn
+                        dtBestOut = utcOut
+                        shiftBest = shift
+        return (dtBestIn, dtBestOut, shiftBest)
+
+    @api.model
+    def get_contract_by_date(self, ee_id, d):
+
+        con_ids = self.env["hr.contract"].search(
+            [
+                ("employee_id", "=", ee_id),
+                ("date_start", "<=", d),
+                "|",
+                ("date_end", "=", False),
+                ("date_end", ">=", d),
+            ]
+        )
+
+        if len(con_ids) > 0:
+            return con_ids[0]
+        else:
+            return False
+
+    @api.model
+    def _process_policy(self, employee_id, vals):
+
+        PolicyRounding = self.env["hr.policy.rounding"]
+        res = vals.copy()
+        contract = False
+        if res.get("clock_in", False) and not res.get("check_in", False):
+            rp = None
+            dt = fields.Datetime.from_string(res["clock_in"])
+            res.update({"check_in": res["clock_in"]})
+            contract = self.get_contract_by_date(employee_id, dt.date())
+            if contract:
+                rp = PolicyRounding.get_latest_policy(
+                    contract.policy_group_id, dt.date()
+                )
+            if rp is not None:
+                shift_record = tuple(
+                    self._get_schedule_by_approximation(
+                        employee_id, "sign_in", dt, contract
+                    )
+                )
+                if shift_record and shift_record[2]:
+                    res.update({"schedule_shift_id": shift_record[2].id})
+                    new_time = rp.process_rounding_policy(dt, "sign_in", shift_record)
+                    if new_time:
+                        res.update({"check_in": new_time})
+
+        if res.get("clock_out", False) and not res.get("check_out", False):
+            rp = None
+            dt = fields.Datetime.from_string(res["clock_out"])
+            res.update({"check_out": res["clock_out"]})
+            contract = self.get_contract_by_date(employee_id, dt.date())
+            if contract:
+                rp = PolicyRounding.get_latest_policy(
+                    contract.policy_group_id, dt.date()
+                )
+            if rp is not None:
+                shift_record = self._get_schedule_by_approximation(
+                    employee_id, "sign_out", dt, contract
+                )
+                if shift_record and shift_record[2]:
+                    res.update({"schedule_shift_id": shift_record[2].id})
+                    new_time = rp.process_rounding_policy(dt, "sign_out", shift_record)
+                    if new_time:
+                        res.update({"check_out": new_time})
+
+        return res
+
+    @api.model
+    def create(self, vals):
+
+        vals = self._process_policy(vals["employee_id"], vals)
+
+        return super(HrAttendance, self).create(vals)
+
+    def write(self, vals):
+
+        for rec in self:
+            vals = self._process_policy(rec.employee_id.id, vals)
+            res = super().write(vals)
+
+        return res
diff --git a/payroll_policy_rounding/models/hr_employee.py b/payroll_policy_rounding/models/hr_employee.py
new file mode 100644
index 00000000..371634ee
--- /dev/null
+++ b/payroll_policy_rounding/models/hr_employee.py
@@ -0,0 +1,46 @@
+# Copyright (C) 2022 TREVI Software
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+
+from odoo import _, exceptions, fields, models
+
+
+class HrAttendance(models.Model):
+
+    _inherit = "hr.employee"
+
+    # Completely over-ride base module method to implement rounding.
+    # Base module: hr_attendance/models/hr_employee.py
+    #
+    def _attendance_action_change(self):
+        """Check In/Check Out action
+        Check In: create a new attendance record
+        Check Out: modify check_out field of appropriate attendance record
+        """
+        self.ensure_one()
+        action_date = fields.Datetime.now()
+
+        if self.attendance_state != "checked_in":
+            vals = {
+                "employee_id": self.id,
+                "clock_in": action_date,
+            }
+            return self.env["hr.attendance"].create(vals)
+        attendance = self.env["hr.attendance"].search(
+            [("employee_id", "=", self.id), ("check_out", "=", False)], limit=1
+        )
+        if attendance:
+            attendance.clock_out = action_date
+        else:
+            raise exceptions.UserError(
+                _(
+                    "Cannot perform check out on %(empl_name)s, "
+                    "could not find corresponding check in. "
+                    "Your attendances have probably been modified "
+                    "manually by human resources."
+                )
+                % {
+                    "empl_name": self.sudo().name,
+                }
+            )
+        return attendance
diff --git a/payroll_policy_rounding/models/hr_policy_group.py b/payroll_policy_rounding/models/hr_policy_group.py
new file mode 100644
index 00000000..b6dee69d
--- /dev/null
+++ b/payroll_policy_rounding/models/hr_policy_group.py
@@ -0,0 +1,15 @@
+# Copyright (C) 2022 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class PolicyGroup(models.Model):
+
+    _inherit = "hr.policy.group"
+
+    rounding_policy_ids = fields.Many2many(
+        string="Rounding Policy",
+        comodel_name="hr.policy.rounding",
+    )
diff --git a/payroll_policy_rounding/models/hr_policy_rounding.py b/payroll_policy_rounding/models/hr_policy_rounding.py
new file mode 100644
index 00000000..8207862f
--- /dev/null
+++ b/payroll_policy_rounding/models/hr_policy_rounding.py
@@ -0,0 +1,271 @@
+# Copyright (C) 2022 TREVI Software
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from datetime import timedelta
+
+from pytz import common_timezones
+
+from odoo import _, api, fields, models
+
+
+class HrPolicy(models.Model):
+
+    _name = "hr.policy.rounding"
+    _order = "date desc"
+    _description = "Attendance Rounding Policy"
+
+    @api.model
+    def _tz_list(self):
+
+        res = tuple()
+        for name in common_timezones:
+            res += ((name, name),)
+        return res
+
+    name = fields.Char(required=True)
+    date = fields.Date(string="Effective Date", required=True)
+    tz = fields.Selection(selection=_tz_list, string="Time Zone", required=True)
+    line_ids = fields.One2many(
+        string="Policy Lines",
+        comodel_name="hr.policy.line.rounding",
+        inverse_name="policy_id",
+    )
+
+    # Return records with latest date first
+    @api.model
+    def get_latest_policy(self, policy_group, dToday):
+        """Return a rounding policy with an effective date on or before dToday but
+        greater than all the others"""
+
+        if not policy_group or not policy_group.rounding_policy_ids or not dToday:
+            return None
+
+        res = None
+        for policy in policy_group.rounding_policy_ids:
+            if policy.date <= dToday:
+                if res is None:
+                    res = policy
+                elif policy.date > res.date:
+                    res = policy
+        return res
+
+    def process_rounding_policy(self, utcdt, action, shift_record):
+
+        self.ensure_one()
+
+        # 1. Check if it's within the grace period
+        #
+        res = self.line_ids.check_grace_period(utcdt, action, shift_record)
+        if res is not False:
+            return res
+
+        # 2. Check if OT has to be pre-authorized
+        #
+        res = self.line_ids.check_pre_authorized_ot(utcdt, action, shift_record)
+        if res is not False:
+            return res
+
+        # 3. Do any rounding specified
+        #
+        res = self.line_ids.do_rounding(utcdt, action, shift_record)
+
+        return res
+
+
+class PolicyLine(models.Model):
+
+    _name = "hr.policy.line.rounding"
+    _description = "Attendance Rounding Policy Line"
+    _rec_name = "attendance_type"
+    _sql_constraints = [
+        (
+            "uniq_id_att_type",
+            "UNIQUE(id,attendance_type)",
+            _("Attendance types must be unique per rounding policy line"),
+        )
+    ]
+
+    policy_id = fields.Many2one(comodel_name="hr.policy.rounding", string="Policy")
+    attendance_type = fields.Selection(
+        selection=[("in", "Sign-in"), ("out", "Sign-out")], required=True
+    )
+    grace = fields.Integer(string="Grace Period")
+    round_interval = fields.Integer()
+    round_type = fields.Selection(
+        selection=[("up", "Up"), ("down", "Down"), ("avg", "Average")], required=True
+    )
+    preauth_ot = fields.Boolean(string="Pre-authorized OT")
+
+    def check_grace_period(self, utcdt, action, shift_record):
+
+        for line in self:
+
+            # Check if this is an entry type that applies to this line
+            #
+            if (line.attendance_type == "in") and (action != "sign_in"):
+                continue
+            elif (line.attendance_type == "out") and (action != "sign_out"):
+                continue
+
+            utcdtIn, utcdtOut, _shift = shift_record
+            if line.attendance_type == "in":
+                if (utcdtIn < utcdt) and utcdt <= (
+                    utcdtIn + timedelta(minutes=+(line.grace))
+                ):
+                    return fields.Datetime.to_string(utcdtIn)
+            if line.attendance_type == "out":
+                if (
+                    utcdtOut - timedelta(minutes=line.grace)
+                ) <= utcdt and utcdt < utcdtOut:
+                    return fields.Datetime.to_string(utcdtOut)
+        return False
+
+    def check_pre_authorized_ot(self, utcdt, action, shift_record):
+
+        for line in self:
+
+            # Check if this is an entry type that applies to this line
+            #
+            if (line.attendance_type == "in") and (action != "sign_in"):
+                continue
+            elif (line.attendance_type == "out") and (action != "sign_out"):
+                continue
+
+            if line.preauth_ot:
+                utcdtIn, utcdtOut, _shift = shift_record
+                if line.attendance_type == "in" and action == "sign_in":
+                    if utcdt < utcdtIn:
+                        return utcdtIn
+
+                if line.attendance_type == "out" and action == "sign_out":
+                    if utcdt > utcdtOut:
+                        return utcdtOut
+        return False
+
+    def calculate_rounding_clock_in(self, utcdt, shift_record):
+
+        self.ensure_one()
+        new_time = False
+        utcdtBottom = utcdt
+        utcdtTop = utcdt
+        utcdtIn, utcdtOut, _shift = shift_record
+
+        # Sign-in: punch time is less than scheduled time
+        if utcdt <= utcdtIn:
+            if self.round_type in ["down", "avg"]:
+                utcdtBottom = utcdtIn
+                while utcdtBottom > utcdt:
+                    utcdtBottom -= timedelta(minutes=self.round_interval)
+            if self.round_type in ["up", "avg"]:
+                utcdtPrevTop = utcdtIn
+                utcdtTop = utcdtIn
+                while utcdtTop >= utcdt:
+                    utcdtPrevTop = utcdtTop
+                    utcdtTop += timedelta(minutes=-(self.round_interval))
+                utcdtTop = utcdtPrevTop
+
+        # Sign-in: punch time is greater than scheduled time
+        if (utcdt > utcdtIn) and (utcdt < utcdtOut):
+            if self.round_type in ["down", "avg"]:
+                utcdtPrevBottom = utcdtIn
+                utcdtBottom = utcdtIn
+                while utcdtBottom <= utcdt:
+                    utcdtPrevBottom = utcdtBottom
+                    utcdtBottom += timedelta(minutes=+(self.round_interval))
+                utcdtBottom = utcdtPrevBottom
+            if self.round_type in ["up", "avg"]:
+                utcdtTop = utcdtIn
+                while utcdtTop < utcdt:
+                    utcdtTop += timedelta(minutes=+(self.round_interval))
+
+        # Calculate the new rounded time
+        if self.round_type == "down":
+            new_time = fields.Datetime.to_string(utcdtBottom)
+        elif self.round_type == "up":
+            new_time = fields.Datetime.to_string(utcdtTop)
+        elif self.round_type == "avg":
+            delta = (utcdtTop - utcdtBottom).total_seconds()
+            utcdtMiddle = utcdtBottom + timedelta(seconds=(delta / 2))
+            new_time = (
+                (utcdt < utcdtMiddle)
+                and fields.Datetime.to_string(utcdtBottom)
+                or fields.Datetime.to_string(utcdtTop)
+            )
+
+        return new_time
+
+    def calculate_rounding_clock_out(self, utcdt, shift_record):
+
+        self.ensure_one()
+        new_time = False
+        utcdtBottom = utcdt
+        utcdtTop = utcdt
+        utcdtIn, utcdtOut, _shift = shift_record
+
+        # Sign-out: punch time is less than scheduled time
+        if utcdt <= utcdtOut:
+            if self.round_type in ["down", "avg"] and not self.preauth_ot:
+                utcdtBottom = utcdtOut
+                while utcdtBottom > utcdt:
+                    utcdtBottom += timedelta(minutes=-(self.round_interval))
+            if self.round_type in ["up", "avg"]:
+                utcdtPrevTop = utcdtOut
+                utcdtTop = utcdtOut
+                while utcdtTop >= utcdt:
+                    utcdtPrevTop = utcdtTop
+                    utcdtTop += timedelta(minutes=-(self.round_interval))
+                utcdtTop = utcdtPrevTop
+
+        # Sign-out: punch time is greater than scheduled time
+        if utcdt > utcdtOut:
+
+            if self.round_type in ["down", "avg"]:
+                utcdtPrevBottom = utcdtIn
+                utcdtBottom = utcdtIn
+                while utcdtBottom <= utcdt:
+                    utcdtPrevBottom = utcdtBottom
+                    utcdtBottom += timedelta(minutes=+(self.round_interval))
+                utcdtBottom = utcdtPrevBottom
+            if self.round_type in ["up", "avg"]:
+                utcdtTop = utcdtIn
+                while utcdtTop < utcdt:
+                    utcdtTop += timedelta(minutes=+(self.round_interval))
+
+        # Calculate the new rounded time
+        if self.round_type == "down":
+            new_time = fields.Datetime.to_string(utcdtBottom)
+        elif self.round_type == "up":
+            new_time = fields.Datetime.to_string(utcdtTop)
+        elif self.round_type == "avg":
+            delta = (utcdtTop - utcdtBottom).total_seconds()
+            utcdtMiddle = utcdtBottom + timedelta(seconds=(delta / 2))
+            new_time = (
+                (utcdt < utcdtMiddle)
+                and fields.Datetime.to_string(utcdtBottom)
+                or fields.Datetime.to_string(utcdtTop)
+            )
+
+        return new_time
+
+    def do_rounding(self, utcdt, action, shift_record):
+
+        new_time = False
+        for line in self:
+
+            # Check if this is an entry type that applies to this line
+            #
+            if (line.attendance_type == "in") and (action != "sign_in"):
+                continue
+            elif (line.attendance_type == "out") and (action != "sign_out"):
+                continue
+
+            if line.round_interval > 0:
+
+                if line.attendance_type == "in" and action == "sign_in":
+                    return line.calculate_rounding_clock_in(utcdt, shift_record)
+
+                if line.attendance_type == "out" and action == "sign_out":
+                    return line.calculate_rounding_clock_out(utcdt, shift_record)
+
+        return new_time
diff --git a/payroll_policy_rounding/readme/CREDITS.rst b/payroll_policy_rounding/readme/CREDITS.rst
new file mode 100644
index 00000000..d264bc7e
--- /dev/null
+++ b/payroll_policy_rounding/readme/CREDITS.rst
@@ -0,0 +1 @@
+* Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/payroll_policy_rounding/readme/DESCRIPTION.rst b/payroll_policy_rounding/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..f2cb4202
--- /dev/null
+++ b/payroll_policy_rounding/readme/DESCRIPTION.rst
@@ -0,0 +1,4 @@
+This module defines properties of an attendance rounding policy, such as:
+    * Check-in grace period
+    * Early check-in and late check-out rounding
+    * Rounding intervals (for example 15 minute rounding intervals)
diff --git a/payroll_policy_rounding/security/ir.model.access.csv b/payroll_policy_rounding/security/ir.model.access.csv
new file mode 100644
index 00000000..3d824735
--- /dev/null
+++ b/payroll_policy_rounding/security/ir.model.access.csv
@@ -0,0 +1,7 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_policy_rounding_user,access_hr_policy_rounding,model_hr_policy_rounding,hr.group_hr_user,1,0,0,0
+access_hr_policy_rounding_payroll_user,access_hr_policy_rounding,model_hr_policy_rounding,payroll.group_payroll_user,1,0,0,0
+access_hr_policy_rounding_hrm,access_hr_policy_rounding,model_hr_policy_rounding,payroll.group_payroll_manager,1,1,1,1
+access_hr_policy_line_roundingj_user,access_hr_policy_line_rounding,model_hr_policy_line_rounding,hr.group_hr_user,1,0,0,0
+access_hr_policy_line_roundingj_payroll_user,access_hr_policy_line_rounding,model_hr_policy_line_rounding,payroll.group_payroll_user,1,0,0,0
+access_hr_policy_line_roundingj_hrm,access_hr_policy_line_rounding,model_hr_policy_line_rounding,payroll.group_payroll_manager,1,1,1,1
diff --git a/payroll_policy_rounding/static/description/icon.png b/payroll_policy_rounding/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/payroll_policy_rounding/static/description/icon.png differ
diff --git a/payroll_policy_rounding/static/description/index.html b/payroll_policy_rounding/static/description/index.html
new file mode 100644
index 00000000..f1758e0f
--- /dev/null
+++ b/payroll_policy_rounding/static/description/index.html
@@ -0,0 +1,425 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Rounding Policy</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="rounding-policy">
+<h1 class="title">Rounding Policy</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:4ed058b8b87e839b22d2b866aaaa1730dd3deef97a1e693fa468750e0d627081
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_policy_rounding"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<dl class="docutils">
+<dt>This module defines properties of an attendance rounding policy, such as:</dt>
+<dd><ul class="first last simple">
+<li>Check-in grace period</li>
+<li>Early check-in and late check-out rounding</li>
+<li>Rounding intervals (for example 15 minute rounding intervals)</li>
+</ul>
+</dd>
+</dl>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-4">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_policy_rounding%0Aversion:%2014.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="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>TREVI Software</li>
+<li>Michael Telahun Makonnen</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-4">Other credits</a></h2>
+<ul class="simple">
+<li>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_policy_rounding">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/payroll_policy_rounding/static/src/img/main_screenshot.png b/payroll_policy_rounding/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/payroll_policy_rounding/static/src/img/main_screenshot.png differ
diff --git a/payroll_policy_rounding/tests/__init__.py b/payroll_policy_rounding/tests/__init__.py
new file mode 100644
index 00000000..1a62dbba
--- /dev/null
+++ b/payroll_policy_rounding/tests/__init__.py
@@ -0,0 +1,7 @@
+# Copyright (C) 2022 TREVI Software
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import test_hr_attendance
+from . import test_hr_employee
+from . import test_payroll_policy_access
+from . import test_payroll_policy_rounding
diff --git a/payroll_policy_rounding/tests/common.py b/payroll_policy_rounding/tests/common.py
new file mode 100644
index 00000000..ca298711
--- /dev/null
+++ b/payroll_policy_rounding/tests/common.py
@@ -0,0 +1,224 @@
+# Copyright (C) 2022 TREVI Software
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from datetime import date, datetime, timedelta
+
+from pytz import timezone, utc
+
+from odoo.tests import common, new_test_user
+
+
+class TestPolicyCommon(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super(TestPolicyCommon, cls).setUpClass()
+
+        cls.HrAttendance = cls.env["hr.attendance"]
+        cls.HrContract = cls.env["hr.contract"]
+        cls.HrEmployee = cls.env["hr.employee"]
+        cls.PolicyGroup = cls.env["hr.policy.group"]
+        cls.Policy = cls.env["hr.policy.rounding"]
+        cls.PolicyLine = cls.env["hr.policy.line.rounding"]
+        cls.ResourceCalendar = cls.env["resource.calendar"]
+        cls.CalendarAttendance = cls.env["resource.calendar.attendance"]
+        cls.CalendarAttendanceTemplate = cls.env[
+            "resource.calendar.attendance.template"
+        ]
+
+        cls.tpl_morning = cls.CalendarAttendanceTemplate.create(
+            {
+                "name": "Morning",
+                "day_period": "morning",
+                "hour_from": 8,
+                "hour_to": 12,
+            }
+        )
+        cls.tpl_afternoon = cls.CalendarAttendanceTemplate.create(
+            {
+                "name": "Afternoon",
+                "day_period": "afternoon",
+                "hour_from": 13,
+                "hour_to": 17,
+            }
+        )
+        cls.default_calendar = cls.ResourceCalendar.create(
+            {
+                "name": "56 Hrs a week",
+                "tz": "UTC",
+            }
+        )
+        # Create a full 7-day week sor our tests don't fail on Sat. and Sun.
+        for day in ["0", "1", "2", "3", "4", "5", "6"]:
+            cls.CalendarAttendance.create(
+                {
+                    "calendar_id": cls.default_calendar.id,
+                    "template_id": cls.tpl_morning.id,
+                    "dayofweek": day,
+                    "name": "Morning",
+                    "day_period": "morning",
+                    "hour_from": 8,
+                    "hour_to": 12,
+                }
+            )._onchange_template_id()
+            cls.CalendarAttendance.create(
+                {
+                    "calendar_id": cls.default_calendar.id,
+                    "template_id": cls.tpl_afternoon.id,
+                    "dayofweek": day,
+                    "name": "Afternoon",
+                    "day_period": "afternoon",
+                    "hour_from": 13,
+                    "hour_to": 17,
+                }
+            )._onchange_template_id()
+
+        cls.policy = cls.Policy.create(
+            {"name": "ROUNDING POLICY1", "date": date.today(), "tz": "UTC"}
+        )
+        cls.line = cls.PolicyLine.create(
+            {
+                "attendance_type": "in",
+                "round_type": "avg",
+                "policy_id": cls.policy.id,
+            }
+        )
+        # Payroll Manager user
+        cls.userPM = new_test_user(
+            cls.env,
+            login="pm",
+            groups="base.group_user,payroll.group_payroll_manager",
+            name="Payroll manager",
+            email="pm@example.com",
+        )
+        # Payroll user
+        cls.userPU = new_test_user(
+            cls.env,
+            login="pu",
+            groups="base.group_user,payroll.group_payroll_user",
+            name="Payroll manager",
+            email="pu@example.com",
+        )
+        # HR Manager
+        cls.userHRM = new_test_user(
+            cls.env,
+            login="hrm",
+            groups="base.group_user,hr.group_hr_manager",
+            name="Payroll manager",
+            email="hrm@example.com",
+        )
+
+        # Employee with contract
+        cls.test_employee = cls.HrEmployee.create(
+            {"name": "Test Employee", "resource_calendar_id": cls.default_calendar.id}
+        )
+        cls.test_contract = cls.create_contract(cls)
+        cls.apply_contract_cron(cls)
+
+    def create_contract(
+        self, eid=None, state="draft", kanban_state="done", start=None, end=None
+    ):
+        if eid is None:
+            eid = self.test_employee.id
+        if start is None:
+            start = date.today()
+        return self.HrContract.create(
+            {
+                "name": "Contract",
+                "employee_id": eid,
+                "state": state,
+                "kanban_state": kanban_state,
+                "wage": 1,
+                "date_start": start,
+                "date_end": end,
+                "resource_calendar_id": self.default_calendar.id,
+            }
+        )
+
+    def apply_contract_cron(self):
+        self.env.ref(
+            "hr_contract.ir_cron_data_contract_update_state"
+        ).method_direct_trigger()
+
+    def make_datetime(self, d: date, sTime: str) -> datetime:
+        return datetime.combine(d, datetime.strptime(sTime, "%H:%M").time())
+
+    def get_start_end_dates(self, weeks=1):
+
+        total_days = (weeks * 7) - 1
+        dStart = date.today()
+        while dStart.weekday() != 0:
+            dStart -= timedelta(days=1)
+        dEnd = dStart + timedelta(days=total_days)
+        return dStart, dEnd
+
+    def localize_dt(self, dt, tz, reverse=False):
+        """
+        Localize naive dt from database (UTC) to timzezone tz. If reverse is True
+        a naive dt that is in timezone tz is converted to naive dt for storage in db.
+        """
+
+        local_tz = timezone(tz)
+        if reverse:
+            res = (
+                local_tz.localize(dt, is_dst=False).astimezone(utc).replace(tzinfo=None)
+            )
+        else:
+            res = utc.localize(dt, is_dst=False).astimezone(local_tz)
+        return res
+
+    def setup_pg(self, line_ids, tz="UTC"):
+
+        p = self.Policy.create(
+            {
+                "name": "P1",
+                "date": date.today(),
+                "tz": tz,
+                "line_ids": line_ids,
+            }
+        )
+        pg = self.PolicyGroup.create(
+            {
+                "name": "PGroup",
+                "rounding_policy_ids": [(6, 0, [p.id])],
+            }
+        )
+        self.test_contract.policy_group_id = pg
+
+        self.assertGreater(
+            len(self.test_employee.resource_id.scheduled_shift_ids),
+            0,
+            "Shifts have been created on contract creation",
+        )
+
+        return (p, pg)
+
+    def set_in_times(self, strClock, strCheck):
+        clock_in = self.localize_dt(
+            self.make_datetime(date.today(), strClock),
+            self.test_employee.resource_id.tz,
+            reverse=True,
+        )
+        check_in = self.localize_dt(
+            self.make_datetime(date.today(), strCheck),
+            self.test_employee.resource_id.tz,
+            reverse=True,
+        )
+        return (clock_in, check_in)
+
+    def set_out_times(self, strIn, strClock, strCheck):
+        check_in = self.localize_dt(
+            self.make_datetime(date.today(), strIn),
+            self.test_employee.resource_id.tz,
+            reverse=True,
+        )
+        clock_out = self.localize_dt(
+            self.make_datetime(date.today(), strClock),
+            self.test_employee.resource_id.tz,
+            reverse=True,
+        )
+        check_out = self.localize_dt(
+            self.make_datetime(date.today(), strCheck),
+            self.test_employee.resource_id.tz,
+            reverse=True,
+        )
+        return (check_in, clock_out, check_out)
diff --git a/payroll_policy_rounding/tests/test_hr_attendance.py b/payroll_policy_rounding/tests/test_hr_attendance.py
new file mode 100644
index 00000000..4c1bdb5a
--- /dev/null
+++ b/payroll_policy_rounding/tests/test_hr_attendance.py
@@ -0,0 +1,935 @@
+# Copyright (C) 2022 TREVI Software
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from datetime import date, datetime, timedelta
+
+from . import common
+
+
+class TestHrAttendance(common.TestPolicyCommon):
+    def test_create_no_contract(self):
+
+        ee = self.HrEmployee.create({"name": "John"})
+
+        att = self.HrAttendance.create(
+            {
+                "employee_id": ee.id,
+                "clock_in": datetime.combine(
+                    date.today(), datetime.strptime("800", "%H%M").time()
+                ),
+            }
+        )
+        self.assertEqual(
+            att.clock_in,
+            datetime.combine(date.today(), datetime.strptime("800", "%H%M").time()),
+            "Without a contract the check_in time is the clock time",
+        )
+        self.assertEqual(
+            att.clock_in,
+            att.check_in,
+            "The check_in time and the clock time are the same",
+        )
+
+    def test_create_no_policy(self):
+
+        pg = self.PolicyGroup.create(
+            {
+                "name": "PGroup",
+            }
+        )
+
+        start = date.today() - timedelta(days=1)
+        ee = self.HrEmployee.create({"name": "John"})
+        cc = self.create_contract(ee.id, start=start)
+        cc.policy_group_id = pg
+        self.apply_contract_cron()
+
+        att = self.HrAttendance.create(
+            {
+                "employee_id": ee.id,
+                "clock_in": datetime.combine(
+                    date.today(), datetime.strptime("800", "%H%M").time()
+                ),
+            }
+        )
+        self.assertEqual(
+            att.check_in,
+            datetime.combine(date.today(), datetime.strptime("800", "%H%M").time()),
+            "Without a rounding policy the check_in time is the clock time",
+        )
+        self.assertEqual(
+            att.clock_in,
+            att.check_in,
+            "The check_in time and the clock time are the same",
+        )
+
+    def test_create_exact_match(self):
+
+        p = self.Policy.create(
+            {
+                "name": "P1",
+                "date": date.today(),
+                "tz": "UTC",
+                "line_ids": [
+                    (
+                        0,
+                        0,
+                        {
+                            "attendance_type": "in",
+                            "round_type": "down",
+                            "round_interval": 5,
+                        },
+                    ),
+                    (
+                        0,
+                        0,
+                        {
+                            "attendance_type": "out",
+                            "round_type": "up",
+                            "round_interval": 5,
+                        },
+                    ),
+                ],
+            }
+        )
+        pg = self.PolicyGroup.create(
+            {
+                "name": "PGroup",
+                "rounding_policy_ids": [(6, 0, [p.id])],
+            }
+        )
+        self.test_contract.policy_group_id = pg
+
+        self.assertGreater(
+            len(self.test_employee.resource_id.scheduled_shift_ids),
+            0,
+            "Shifts have been created on contract creation",
+        )
+
+        shift = self.test_employee.resource_id.scheduled_shift_ids.filtered(
+            lambda s: s.dayofweek == str(date.today().weekday())
+        )
+
+        # Punch in
+        clock_in = self.localize_dt(
+            self.make_datetime(date.today(), "08:00"),
+            self.test_employee.resource_id.tz,
+            reverse=True,
+        )
+        att = self.HrAttendance.create(
+            {
+                "employee_id": self.test_employee.id,
+                "clock_in": clock_in,
+            }
+        )
+        self.assertEqual(
+            att.check_in,
+            shift[0].datetime_start,
+            "The attendance and schedule start times match",
+        )
+        self.assertEqual(att.check_in, clock_in, "The check-in time is an exact match")
+        self.assertEqual(
+            att.check_in,
+            att.clock_in,
+            "The check-in and clock-in times are an exact match",
+        )
+
+        # Punch out
+        clock_out = self.localize_dt(
+            self.make_datetime(date.today(), "12:00"),
+            self.test_employee.resource_id.tz,
+            reverse=True,
+        )
+        att = self.HrAttendance.create(
+            {
+                "employee_id": self.test_employee.id,
+                "clock_in": clock_in,
+                "clock_out": clock_out,
+            }
+        )
+        self.assertEqual(
+            att.check_out, clock_out, "The check-out time is an exact match"
+        )
+        self.assertEqual(
+            att.check_out,
+            att.clock_out,
+            "The check-out and clock-out times are an exact match",
+        )
+
+    def test_create_in_multi_shift(self):
+
+        # See if we pick up the correct shift when multiple shifts are
+        # available in the same day
+        #
+
+        line_ids = [
+            (
+                0,
+                0,
+                {"attendance_type": "in", "round_type": "down", "round_interval": 5},
+            ),
+        ]
+        self.setup_pg(line_ids)
+
+        # Punch in
+        clock_in, check_in = self.set_in_times("13:33", "13:30")
+        att = self.HrAttendance.create(
+            {
+                "employee_id": self.test_employee.id,
+                "clock_in": clock_in,
+            }
+        )
+        self.assertEqual(
+            att.check_in,
+            check_in,
+            "The check-in is from the correct shift and rounded DOWN by 5 minutes",
+        )
+        self.assertEqual(
+            att.clock_in, clock_in, "The clock-in time contains the original time"
+        )
+
+    def test_create_in_round_down(self):
+
+        line_ids = [
+            (
+                0,
+                0,
+                {"attendance_type": "in", "round_type": "down", "round_interval": 5},
+            ),
+        ]
+        self.setup_pg(line_ids)
+
+        # Punch in
+        clock_in, check_in = self.set_in_times("8:33", "08:30")
+        att = self.HrAttendance.create(
+            {
+                "employee_id": self.test_employee.id,
+                "clock_in": clock_in,
+            }
+        )
+        self.assertEqual(
+            att.check_in, check_in, "The check-in time is rounded DOWN by 5 minutes"
+        )
+        self.assertEqual(
+            att.clock_in, clock_in, "The clock-in time contains the original time"
+        )
+
+    def test_create_in_round_up(self):
+
+        line_ids = [
+            (0, 0, {"attendance_type": "in", "round_type": "up", "round_interval": 5}),
+        ]
+        self.setup_pg(line_ids)
+
+        # Punch in
+        clock_in, check_in = self.set_in_times("8:33", "8:35")
+        att = self.HrAttendance.create(
+            {
+                "employee_id": self.test_employee.id,
+                "clock_in": clock_in,
+            }
+        )
+        self.assertEqual(
+            att.check_in, check_in, "The check-in time is rounded UP by 5 minutes"
+        )
+        self.assertEqual(
+            att.clock_in, clock_in, "The clock-in time contains the original time"
+        )
+
+    def test_create_in_round_avg1(self):
+
+        line_ids = [
+            (
+                0,
+                0,
+                {"attendance_type": "in", "round_type": "avg", "round_interval": 15},
+            ),
+        ]
+        self.setup_pg(line_ids)
+
+        # Punch in
+        clock_in, check_in = self.set_in_times("8:38", "8:45")
+        att = self.HrAttendance.create(
+            {
+                "employee_id": self.test_employee.id,
+                "clock_in": clock_in,
+            }
+        )
+        self.assertEqual(
+            att.check_in, check_in, "The check-in time is rounded UP by 15 minutes"
+        )
+        self.assertEqual(
+            att.clock_in, clock_in, "The clock-in time contains the original time"
+        )
+
+    def test_create_in_round_avg2(self):
+
+        line_ids = [
+            (
+                0,
+                0,
+                {"attendance_type": "in", "round_type": "avg", "round_interval": 15},
+            ),
+        ]
+        self.setup_pg(line_ids)
+
+        # Punch in
+        clock_in, check_in = self.set_in_times("8:37", "8:30")
+        att = self.HrAttendance.create(
+            {
+                "employee_id": self.test_employee.id,
+                "clock_in": clock_in,
+            }
+        )
+        self.assertEqual(
+            att.check_in, check_in, "The check-in time is rounded DOWN by 15 minutes"
+        )
+        self.assertEqual(
+            att.clock_in, clock_in, "The clock-in time contains the original time"
+        )
+
+    def test_create_early_in_round_down(self):
+
+        line_ids = [
+            (
+                0,
+                0,
+                {"attendance_type": "in", "round_type": "down", "round_interval": 5},
+            ),
+        ]
+        self.setup_pg(line_ids)
+
+        # Punch in
+        clock_in, check_in = self.set_in_times("07:59", "7:55")
+        att = self.HrAttendance.create(
+            {
+                "employee_id": self.test_employee.id,
+                "clock_in": clock_in,
+            }
+        )
+        self.assertEqual(
+            att.check_in, check_in, "The check-in time is rounded DOWN by 5 minutes"
+        )
+        self.assertEqual(
+            att.clock_in, clock_in, "The clock-in time contains the original time"
+        )
+
+    def test_create_early_in_round_up(self):
+
+        line_ids = [
+            (0, 0, {"attendance_type": "in", "round_type": "up", "round_interval": 5}),
+        ]
+        self.setup_pg(line_ids)
+
+        # Punch in
+        clock_in, check_in = self.set_in_times("07:55", "7:55")
+        att = self.HrAttendance.create(
+            {
+                "employee_id": self.test_employee.id,
+                "clock_in": clock_in,
+            }
+        )
+        self.assertEqual(
+            att.check_in,
+            check_in,
+            "The check-in time is NOT rounded because it matches the interval",
+        )
+        self.assertEqual(
+            att.clock_in, clock_in, "The clock-in time contains the original time"
+        )
+
+    def test_create_early_in_round_avg1(self):
+
+        line_ids = [
+            (
+                0,
+                0,
+                {"attendance_type": "in", "round_type": "avg", "round_interval": 15},
+            ),
+        ]
+        self.setup_pg(line_ids)
+
+        # Punch in
+        clock_in, check_in = self.set_in_times("07:38", "7:45")
+        att = self.HrAttendance.create(
+            {
+                "employee_id": self.test_employee.id,
+                "clock_in": clock_in,
+            }
+        )
+        self.assertEqual(
+            att.check_in, check_in, "The check-in time is rounded UP by 15 minutes"
+        )
+        self.assertEqual(
+            att.clock_in, clock_in, "The clock-in time contains the original time"
+        )
+
+    def test_create_early_in_round_avg2(self):
+
+        line_ids = [
+            (
+                0,
+                0,
+                {"attendance_type": "in", "round_type": "avg", "round_interval": 15},
+            ),
+        ]
+        self.setup_pg(line_ids)
+
+        # Punch in
+        clock_in, check_in = self.set_in_times("07:37", "7:30")
+        att = self.HrAttendance.create(
+            {
+                "employee_id": self.test_employee.id,
+                "clock_in": clock_in,
+            }
+        )
+        self.assertEqual(
+            att.check_in, check_in, "The check-in time is rounded DOWN by 15 minutes"
+        )
+        self.assertEqual(
+            att.clock_in, clock_in, "The clock-in time contains the original time"
+        )
+
+    def test_create_out_round_down(self):
+
+        line_ids = [
+            (
+                0,
+                0,
+                {"attendance_type": "out", "round_type": "down", "round_interval": 5},
+            ),
+        ]
+        self.setup_pg(line_ids)
+
+        check_in, clock_out, check_out = self.set_out_times("12:00", "17:33", "17:30")
+        att = self.HrAttendance.create(
+            {
+                "employee_id": self.test_employee.id,
+                "check_in": check_in,
+                "clock_out": clock_out,
+            }
+        )
+        self.assertEqual(
+            att.check_out, check_out, "The check-out time is rounded DOWN by 5 minutes"
+        )
+        self.assertEqual(
+            att.clock_out, clock_out, "The clock-out time contains the original time"
+        )
+
+    def test_create_out_round_up(self):
+
+        line_ids = [
+            (0, 0, {"attendance_type": "out", "round_type": "up", "round_interval": 5}),
+        ]
+        self.setup_pg(line_ids)
+
+        check_in, clock_out, check_out = self.set_out_times("12:00", "17:33", "17:35")
+        att = self.HrAttendance.create(
+            {
+                "employee_id": self.test_employee.id,
+                "check_in": check_in,
+                "clock_out": clock_out,
+            }
+        )
+        self.assertEqual(
+            att.check_out, check_out, "The check-out time is rounded UP by 5 minutes"
+        )
+        self.assertEqual(
+            att.clock_out, clock_out, "The clock-out time contains the original time"
+        )
+
+    def test_create_out_round_avg1(self):
+
+        line_ids = [
+            (
+                0,
+                0,
+                {"attendance_type": "out", "round_type": "avg", "round_interval": 15},
+            ),
+        ]
+        self.setup_pg(line_ids)
+
+        check_in, clock_out, check_out = self.set_out_times("12:00", "17:38", "17:45")
+        att = self.HrAttendance.create(
+            {
+                "employee_id": self.test_employee.id,
+                "check_in": check_in,
+                "clock_out": clock_out,
+            }
+        )
+        self.assertEqual(
+            att.check_out, check_out, "The check-out time is rounded UP by 15 minutes"
+        )
+        self.assertEqual(
+            att.clock_out, clock_out, "The clock-out time contains the original time"
+        )
+
+    def test_create_out_round_avg2(self):
+
+        line_ids = [
+            (
+                0,
+                0,
+                {"attendance_type": "out", "round_type": "avg", "round_interval": 15},
+            ),
+        ]
+        self.setup_pg(line_ids)
+
+        check_in, clock_out, check_out = self.set_out_times("12:00", "17:37", "17:30")
+        att = self.HrAttendance.create(
+            {
+                "employee_id": self.test_employee.id,
+                "check_in": check_in,
+                "clock_out": clock_out,
+            }
+        )
+        self.assertEqual(
+            att.check_out, check_out, "The check-out time is rounded DOWN by 15 minutes"
+        )
+        self.assertEqual(
+            att.clock_out, clock_out, "The clock-out time contains the original time"
+        )
+
+    def test_create_early_out_round_down(self):
+
+        line_ids = [
+            (
+                0,
+                0,
+                {"attendance_type": "out", "round_type": "down", "round_interval": 5},
+            ),
+        ]
+        self.setup_pg(line_ids)
+
+        check_in, clock_out, check_out = self.set_out_times("12:00", "16:59", "16:55")
+        att = self.HrAttendance.create(
+            {
+                "employee_id": self.test_employee.id,
+                "check_in": check_in,
+                "clock_out": clock_out,
+            }
+        )
+        self.assertEqual(
+            att.check_out, check_out, "The check-out time is rounded DOWN by 5 minutes"
+        )
+        self.assertEqual(
+            att.clock_out, clock_out, "The clock-out time contains the original time"
+        )
+
+    def test_create_early_out_round_up(self):
+
+        line_ids = [
+            (0, 0, {"attendance_type": "out", "round_type": "up", "round_interval": 5}),
+        ]
+        self.setup_pg(line_ids)
+
+        check_in, clock_out, check_out = self.set_out_times("12:00", "16:51", "16:55")
+        att = self.HrAttendance.create(
+            {
+                "employee_id": self.test_employee.id,
+                "check_in": check_in,
+                "clock_out": clock_out,
+            }
+        )
+        self.assertEqual(
+            att.check_out, check_out, "The check-out time is rounded UP by 5 minutes"
+        )
+        self.assertEqual(
+            att.clock_out, clock_out, "The clock-out time contains the original time"
+        )
+
+    def test_create_early_out_round_avg1(self):
+
+        line_ids = [
+            (
+                0,
+                0,
+                {"attendance_type": "out", "round_type": "avg", "round_interval": 15},
+            ),
+        ]
+        self.setup_pg(line_ids)
+
+        check_in, clock_out, check_out = self.set_out_times("12:00", "16:38", "16:45")
+        att = self.HrAttendance.create(
+            {
+                "employee_id": self.test_employee.id,
+                "check_in": check_in,
+                "clock_out": clock_out,
+            }
+        )
+        self.assertEqual(
+            att.check_out, check_out, "The check-out time is rounded UP by 15 minutes"
+        )
+        self.assertEqual(
+            att.clock_out, clock_out, "The clock-out time contains the original time"
+        )
+
+    def test_create_early_out_round_avg2(self):
+
+        line_ids = [
+            (
+                0,
+                0,
+                {"attendance_type": "out", "round_type": "avg", "round_interval": 15},
+            ),
+        ]
+        self.setup_pg(line_ids)
+
+        check_in, clock_out, check_out = self.set_out_times("12:00", "16:37", "16:30")
+        att = self.HrAttendance.create(
+            {
+                "employee_id": self.test_employee.id,
+                "check_in": check_in,
+                "clock_out": clock_out,
+            }
+        )
+        self.assertEqual(
+            att.check_out, check_out, "The check-out time is rounded DOWN by 15 minutes"
+        )
+        self.assertEqual(
+            att.clock_out, clock_out, "The clock-out time contains the original time"
+        )
+
+    def test_preauth_ot_in(self):
+
+        line_ids = [
+            (
+                0,
+                0,
+                {
+                    "attendance_type": "in",
+                    "round_type": "avg",
+                    "round_interval": 15,
+                    "preauth_ot": True,
+                },
+            ),
+        ]
+        self.setup_pg(line_ids)
+
+        # Punch in
+        clock_in, check_in = self.set_in_times("7:38", "8:00")
+        att = self.HrAttendance.create(
+            {
+                "employee_id": self.test_employee.id,
+                "clock_in": clock_in,
+            }
+        )
+        self.assertEqual(
+            att.check_in, check_in, "The check-in time is the scheduled time"
+        )
+        self.assertEqual(
+            att.clock_in, clock_in, "The clock-in time contains the original time"
+        )
+
+    def test_preauth_ot_out(self):
+
+        line_ids = [
+            (
+                0,
+                0,
+                {
+                    "attendance_type": "out",
+                    "round_type": "up",
+                    "round_interval": 5,
+                    "preauth_ot": True,
+                },
+            ),
+        ]
+        self.setup_pg(line_ids)
+
+        check_in, clock_out, check_out = self.set_out_times("13:00", "17:33", "17:00")
+        att = self.HrAttendance.create(
+            {
+                "employee_id": self.test_employee.id,
+                "check_in": check_in,
+                "clock_out": clock_out,
+            }
+        )
+        self.assertEqual(
+            att.check_out, check_out, "The check-out time is the scheduled time"
+        )
+        self.assertEqual(
+            att.clock_out, clock_out, "The clock-out time contains the original time"
+        )
+
+    def test_create_in_grace(self):
+
+        line_ids = [
+            (
+                0,
+                0,
+                {
+                    "attendance_type": "in",
+                    "round_type": "up",
+                    "round_interval": 15,
+                    "grace": 10,
+                },
+            ),
+        ]
+        self.setup_pg(line_ids)
+
+        # Punch in
+        clock_in, check_in = self.set_in_times("8:07", "8:00")
+        att = self.HrAttendance.create(
+            {
+                "employee_id": self.test_employee.id,
+                "clock_in": clock_in,
+            }
+        )
+        self.assertEqual(
+            att.check_in,
+            check_in,
+            "The clock-in is in grace period so check-in time is actual start time",
+        )
+        self.assertEqual(
+            att.clock_in, clock_in, "The clock-in time contains the original time"
+        )
+
+    def test_create_early_out_grace_period(self):
+
+        line_ids = [
+            (
+                0,
+                0,
+                {
+                    "attendance_type": "out",
+                    "round_type": "down",
+                    "round_interval": 10,
+                    "grace": 5,
+                },
+            ),
+        ]
+        self.setup_pg(line_ids)
+
+        check_in, clock_out, check_out = self.set_out_times("12:00", "16:55", "17:00")
+        att = self.HrAttendance.create(
+            {
+                "employee_id": self.test_employee.id,
+                "check_in": check_in,
+                "clock_out": clock_out,
+            }
+        )
+        self.assertEqual(
+            att.check_out,
+            check_out,
+            "The clock-in is within grace period so check-out time is schedule time",
+        )
+        self.assertEqual(
+            att.clock_out, clock_out, "The clock-out time contains the original time"
+        )
+
+    def test_attach_schedule_sign_in(self):
+
+        line_ids = [
+            (
+                0,
+                0,
+                {
+                    "attendance_type": "in",
+                    "round_type": "up",
+                    "round_interval": 15,
+                    "grace": 10,
+                },
+            ),
+        ]
+        tz = self.test_employee.resource_id.tz
+        self.setup_pg(line_ids, tz)
+
+        # Punch in
+        clock_in, _check_in = self.set_in_times("8:00", "8:00")
+        att = self.HrAttendance.create(
+            {
+                "employee_id": self.test_employee.id,
+                "clock_in": clock_in,
+            }
+        )
+        self.assertTrue(att.schedule_shift_id, "The attendance has a related schedule")
+        self.assertEqual(
+            int(att.schedule_shift_id.dayofweek),
+            att.check_in.weekday(),
+            "The schedule and the attendance are for the same day",
+        )
+        self.assertEqual(
+            att.schedule_shift_id.datetime_start,
+            att.check_in,
+            "The schedule and the attendance have the same time",
+        )
+
+    def test_attach_schedule_sign_out(self):
+
+        line_ids = [
+            (
+                0,
+                0,
+                {
+                    "attendance_type": "out",
+                    "round_type": "down",
+                    "round_interval": 10,
+                    "grace": 5,
+                },
+            ),
+        ]
+        self.setup_pg(line_ids)
+
+        check_in, clock_out, _check_out = self.set_out_times("12:00", "17:00", "17:00")
+        att = self.HrAttendance.create(
+            {
+                "employee_id": self.test_employee.id,
+                "check_in": check_in,
+                "clock_out": clock_out,
+            }
+        )
+        self.assertTrue(att.schedule_shift_id, "The attendance has a related schedule")
+        self.assertEqual(
+            int(att.schedule_shift_id.dayofweek),
+            att.check_in.weekday(),
+            "The schedule and the attendance are for the same day",
+        )
+        self.assertEqual(
+            att.schedule_shift_id.datetime_end,
+            att.check_out,
+            "The schedule and the attendance have the same time",
+        )
+
+    def test_attach_schedule_sign_out2(self):
+
+        line_ids = [
+            (
+                0,
+                0,
+                {
+                    "attendance_type": "out",
+                    "round_type": "down",
+                    "round_interval": 10,
+                    "grace": 5,
+                },
+            ),
+        ]
+        self.setup_pg(line_ids)
+
+        check_in, clock_out, _check_out = self.set_out_times("12:00", "17:00", "17:00")
+        att = self.HrAttendance.create(
+            {
+                "employee_id": self.test_employee.id,
+                "check_in": check_in,
+            }
+        )
+        self.assertFalse(
+            att.schedule_shift_id, "The attendance does NOT have a related schedule"
+        )
+
+        att.clock_out = clock_out
+        self.assertTrue(att.schedule_shift_id, "The attendance has a related schedule")
+        self.assertEqual(
+            int(att.schedule_shift_id.dayofweek),
+            att.check_in.weekday(),
+            "The schedule and the attendance are for the same day",
+        )
+        self.assertEqual(
+            att.schedule_shift_id.datetime_end,
+            att.check_out,
+            "The schedule and the attendance have the same time",
+        )
+
+    def test_write_in_grace(self):
+
+        line_ids = [
+            (
+                0,
+                0,
+                {
+                    "attendance_type": "in",
+                    "round_type": "up",
+                    "round_interval": 15,
+                    "grace": 10,
+                },
+            ),
+        ]
+        self.setup_pg(line_ids)
+
+        # Punch in
+        clock_in, check_in = self.set_in_times("8:07", "8:00")
+        att = self.HrAttendance.create(
+            {
+                "employee_id": self.test_employee.id,
+                "clock_in": clock_in,
+            }
+        )
+        self.assertEqual(
+            att.check_in,
+            check_in,
+            "The clock-in is in grace period so check-in time is actual start time",
+        )
+
+        clock_in2, _check_in2 = self.set_in_times("8:09", "8:00")
+        att.clock_in = clock_in2
+        self.assertEqual(
+            att.check_in,
+            check_in,
+            "The clock-in is in grace period so check-in time hasn't changed",
+        )
+        self.assertEqual(
+            att.clock_in, clock_in2, "The clock-in time contains the original time"
+        )
+
+    def test_write_early_out_grace_period(self):
+
+        line_ids = [
+            (
+                0,
+                0,
+                {
+                    "attendance_type": "out",
+                    "round_type": "down",
+                    "round_interval": 10,
+                    "grace": 5,
+                },
+            ),
+        ]
+        self.setup_pg(line_ids)
+
+        check_in, clock_out, check_out = self.set_out_times("12:00", "16:55", "17:00")
+        att = self.HrAttendance.create(
+            {
+                "employee_id": self.test_employee.id,
+                "check_in": check_in,
+            }
+        )
+        att.clock_out = clock_out
+        self.assertEqual(
+            att.check_out,
+            check_out,
+            "The clock-in is within grace period so check-out time is schedule time",
+        )
+        self.assertEqual(
+            att.clock_out, clock_out, "The clock-out time contains the original time"
+        )
+
+    def test_create_no_shifts(self):
+
+        line_ids = [
+            (
+                0,
+                0,
+                {"attendance_type": "in", "round_type": "down", "round_interval": 5},
+            ),
+        ]
+        self.setup_pg(line_ids)
+        self.test_employee.resource_id.scheduled_shift_ids.unlink()
+
+        # Punch in
+        clock_in, _check_in = self.set_in_times("13:33", "13:30")
+        att = self.HrAttendance.create(
+            {
+                "employee_id": self.test_employee.id,
+                "clock_in": clock_in,
+            }
+        )
+        self.assertEqual(
+            att.check_in,
+            clock_in,
+            "The check-in is the clock-in time",
+        )
+        self.assertEqual(
+            att.clock_in, clock_in, "The clock-in time contains the original time"
+        )
diff --git a/payroll_policy_rounding/tests/test_hr_employee.py b/payroll_policy_rounding/tests/test_hr_employee.py
new file mode 100644
index 00000000..f6ce3b1b
--- /dev/null
+++ b/payroll_policy_rounding/tests/test_hr_employee.py
@@ -0,0 +1,67 @@
+# Copyright (C) 2022 TREVI Software
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from unittest.mock import patch
+
+from odoo import fields
+
+from . import common
+
+
+class TestHrEmployee(common.TestPolicyCommon):
+    def test_create_checkin(self):
+
+        line_ids = [
+            (
+                0,
+                0,
+                {"attendance_type": "in", "round_type": "down", "round_interval": 5},
+            ),
+        ]
+        self.setup_pg(line_ids)
+        self.test_employee.attendance_state = "checked_out"
+
+        # Punch in
+        clock_in, check_in = self.set_in_times("8:33", "08:30")
+        now = clock_in
+        with patch.object(fields.Datetime, "now", lambda *args, **kwargs: now):
+            action = self.test_employee._attendance_action("foo")
+        self.assertEqual(
+            action["action"]["attendance"]["check_in"],
+            check_in,
+            "The check-in time is rounded DOWN by 5 minutes",
+        )
+        self.assertEqual(
+            action["action"]["attendance"]["clock_in"],
+            clock_in,
+            "The clock-in time contains the original time",
+        )
+
+    def test_write_check_out(self):
+
+        line_ids = [
+            (0, 0, {"attendance_type": "out", "round_type": "up", "round_interval": 5}),
+        ]
+        self.setup_pg(line_ids)
+
+        check_in, clock_out, check_out = self.set_out_times("12:00", "16:51", "16:55")
+        att = self.HrAttendance.create(
+            {
+                "employee_id": self.test_employee.id,
+                "check_in": check_in,
+            }
+        )
+        self.test_employee.attendance_state = "checked_in"
+        now = clock_out
+        with patch.object(fields.Datetime, "now", lambda *args, **kwargs: now):
+            action = self.test_employee._attendance_action("foo")
+        self.assertEqual(
+            action["action"]["attendance"]["check_out"],
+            check_out,
+            "The check-out time is rounded UP by 5 minutes",
+        )
+        self.assertEqual(
+            att.clock_out,
+            action["action"]["attendance"]["clock_out"],
+            "The clock-out time contains the original time",
+        )
diff --git a/payroll_policy_rounding/tests/test_payroll_policy_access.py b/payroll_policy_rounding/tests/test_payroll_policy_access.py
new file mode 100644
index 00000000..b45db9be
--- /dev/null
+++ b/payroll_policy_rounding/tests/test_payroll_policy_access.py
@@ -0,0 +1,124 @@
+# Copyright (C) 2021 TREVI Software
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from datetime import date
+
+from odoo.exceptions import AccessError
+
+from . import common
+
+
+class TestPolicyAccess(common.TestPolicyCommon):
+    def test_hrm_access(self):
+        """HRM only has read access"""
+
+        # Create fails
+        with self.assertRaises(AccessError):
+            self.Policy.with_user(self.userHRM).create(
+                {"name": "POLICY2", "date": date.today()}
+            )
+            self.OtPolicyLine.with_user(self.userHRM).create(
+                {"name": "line2", "type": "daily"}
+            )
+        # Unlink fails
+        with self.assertRaises(AccessError):
+            self.policy.with_user(self.userHRM).unlink()
+            self.line.with_user(self.userHRM).unlink()
+        # Read succeeds
+        try:
+            self.Policy.with_user(self.userHRM).browse(self.policy.id)
+        except AccessError:
+            self.fail("Caught an unexpected exception reading hr.policy.presence")
+        try:
+            self.PolicyLine.with_user(self.userHRM).browse(self.policy.id)
+        except AccessError:
+            self.fail("Caught an unexpected exception reading hr.policy.line.presence")
+        # Write fails
+        with self.assertRaises(AccessError):
+            self.Policy.with_user(self.userHRM).browse(self.policy.id).write(
+                {"name": "POLICY3"}
+            )
+            self.PolicyLine.with_user(self.userHRM).browse(self.line.id).write(
+                {"name": "line3"}
+            )
+
+    def test_payroll_user_access(self):
+        """Payroll User only has read access"""
+
+        # Create fails
+        with self.assertRaises(AccessError):
+            self.Policy.with_user(self.userPU).create(
+                {"name": "POL2", "date": date.today()}
+            )
+            self.PolicyLine.with_user(self.userPU).create(
+                {"name": "line2", "type": "daily"}
+            )
+        # Unlink fails
+        with self.assertRaises(AccessError):
+            self.policy.with_user(self.userPU).unlink()
+            self.line.with_user(self.userPU).unlink()
+        # Read succeeds
+        try:
+            self.Policy.with_user(self.userPU).browse(self.policy.id)
+        except AccessError:
+            self.fail("Caught an unexpected exception reading hr.policy.presence")
+        try:
+            self.PolicyLine.with_user(self.userPU).browse(self.policy.id)
+        except AccessError:
+            self.fail("Caught an unexpected exception reading hr.policy.line.presence")
+        # Write fails
+        with self.assertRaises(AccessError):
+            self.Policy.with_user(self.userPU).browse(self.policy.id).write(
+                {"name": "POL3"}
+            )
+            self.PolicyLine.with_user(self.userPU).browse(self.line.id).write(
+                {"name": "line3"}
+            )
+
+    def test_payroll_manager_access(self):
+        """Payroll Manager has complete access"""
+
+        # Read succeeds
+        try:
+            self.Policy.with_user(self.userPM).browse(self.policy.id)
+        except AccessError:
+            self.fail("Caught an unexpected exception reading hr.policy.presence")
+        try:
+            self.PolicyLine.with_user(self.userPM).browse(self.line.id)
+        except AccessError:
+            self.fail("Caught an unexpected exception reading hr.policy.line.presence")
+        # Write succeeds
+        try:
+            self.Policy.with_user(self.userPM).browse(self.policy.id).write(
+                {"name": "XXX"}
+            )
+        except AccessError:
+            self.fail("Caught an unexpected exception writing hr.policy.presence")
+        try:
+            self.PolicyLine.with_user(self.userPM).browse(self.line.id).write(
+                {"round_type": "down"}
+            )
+        except AccessError:
+            self.fail("Caught an unexpected exception writing hr.policy.line.presence")
+        # Create/Unlink succeeds
+        try:
+            pol = self.Policy.with_user(self.userPM).create(
+                {"name": "Policy test pm", "date": date.today(), "tz": "UTC"}
+            )
+            pol.unlink()
+        except AccessError:
+            self.fail(
+                "Caught unexpected exception creating/unlinking hr.policy.presence"
+            )
+        try:
+            line = self.PolicyLine.with_user(self.userPM).create(
+                {
+                    "attendance_type": "in",
+                    "round_type": "avg",
+                }
+            )
+            line.unlink()
+        except AccessError:
+            self.fail(
+                "Caught unexpected exception creating/unlinking hr.policy.line.presence"
+            )
diff --git a/payroll_policy_rounding/tests/test_payroll_policy_rounding.py b/payroll_policy_rounding/tests/test_payroll_policy_rounding.py
new file mode 100644
index 00000000..5e340359
--- /dev/null
+++ b/payroll_policy_rounding/tests/test_payroll_policy_rounding.py
@@ -0,0 +1,45 @@
+# Copyright (C) 2022 TREVI Software
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from datetime import date
+
+from dateutil.relativedelta import relativedelta
+
+from . import common
+
+
+class TestPolicy(common.TestPolicyCommon):
+    def test_get_latest_policy(self):
+
+        pMarch = self.Policy.create(
+            {"name": "P1", "date": date(2020, 3, 1), "tz": "UTC"}
+        )
+        pDec = self.Policy.create(
+            {"name": "P1", "date": date(2020, 12, 1), "tz": "UTC"}
+        )
+        pJan = self.Policy.create({"name": "P1", "date": date(2020, 1, 1), "tz": "UTC"})
+        pg = self.PolicyGroup.create(
+            {
+                "name": "PGroup",
+                "rounding_policy_ids": [(6, 0, [pDec.id, pMarch.id, pJan.id])],
+            }
+        )
+        ap = self.Policy.get_latest_policy(pg, date.today())
+
+        self.assertEqual(ap, pDec, "I got the latest policy from available ones")
+
+    def test_get_latest_policy_with_future(self):
+
+        pastDate = date.today() - relativedelta(days=5)
+        futureDate = date.today() + relativedelta(days=1)
+        pFuture = self.Policy.create({"name": "PF", "date": futureDate, "tz": "UTC"})
+        pPast = self.Policy.create({"name": "PP", "date": pastDate, "tz": "UTC"})
+        pg = self.PolicyGroup.create(
+            {
+                "name": "PGroup",
+                "rounding_policy_ids": [(6, 0, [pFuture.id, pPast.id])],
+            }
+        )
+        ap = self.Policy.get_latest_policy(pg, date.today())
+
+        self.assertEqual(ap, pPast, "The lastest policy is not in the future")
diff --git a/payroll_policy_rounding/views/payroll_policy_view.xml b/payroll_policy_rounding/views/payroll_policy_view.xml
new file mode 100644
index 00000000..93f5d77d
--- /dev/null
+++ b/payroll_policy_rounding/views/payroll_policy_view.xml
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+
+        <!-- Policy Lines -->
+
+        <record id="rounding_policy_line_tree_view" model="ir.ui.view">
+            <field name="name">hr.policy.line.rounding.tree</field>
+            <field name="model">hr.policy.line.rounding</field>
+            <field name="arch" type="xml">
+                <tree string="Rounding Policy Lines">
+                    <field name="policy_id" />
+                    <field name="attendance_type" />
+                    <field name="grace" />
+                    <field name="round_type" />
+                    <field name="round_interval" />
+                    <field name="preauth_ot" />
+                </tree>
+            </field>
+        </record>
+
+        <record id="rounding_policy_line_form_view" model="ir.ui.view">
+            <field name="name">hr.policy.line.rounding.form</field>
+            <field name="model">hr.policy.line.rounding</field>
+            <field name="arch" type="xml">
+                <form string="Rounding Policy Line">
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="attendance_type" />
+                                <field name="grace" />
+                                <field name="round_type" />
+                                <field name="round_interval" />
+                            </group>
+                            <group>
+                                <field name="policy_id" />
+                                <field name="preauth_ot" />
+                            </group>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="open_rounding_policy_line" model="ir.actions.act_window">
+            <field name="name">Rounding Policy Lines</field>
+            <field name="res_model">hr.policy.line.rounding</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <!-- Policy -->
+
+        <record id="rounding_policy_view_tree" model="ir.ui.view">
+            <field name="name">hr.policy.rounding.tree</field>
+            <field name="model">hr.policy.rounding</field>
+            <field name="arch" type="xml">
+                <tree string="Attendance Rounding Policies">
+                    <field name="name" />
+                    <field name="date" />
+                    <field name="tz" />
+                </tree>
+            </field>
+        </record>
+
+        <record id="rounding_policy_view_form" model="ir.ui.view">
+            <field name="name">hr.policy.rounding.form</field>
+            <field name="model">hr.policy.rounding</field>
+            <field name="arch" type="xml">
+                <form string="Attendance Rounding Policy">
+                    <sheet>
+                        <h1>
+                            <label for="name" string="Name" class="oe_edit_only" />
+                            <field name="name" />
+                        </h1>
+                        <group>
+                            <group>
+                                <field name="date" />
+                            </group>
+                            <group>
+                                <field name="tz" />
+                            </group>
+                        </group>
+                        <group string="Rounding Lines">
+                            <field name="line_ids" nolabel="1">
+                                <tree string="Rounding Lines" editable="top">
+                                    <field name="attendance_type" />
+                                    <field name="grace" />
+                                    <field name="round_type" />
+                                    <field name="round_interval" />
+                                    <field name="preauth_ot" />
+                                </tree>
+                            </field>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="open_rounding_policy" model="ir.actions.act_window">
+            <field name="name">Rounding Policies</field>
+            <field name="res_model">hr.policy.rounding</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem
+            action="open_rounding_policy"
+            id="menu_hr_rounding_policy"
+            parent="payroll_policy_group.menu_hr_policy_configuration"
+            sequence="11"
+        />
+
+        <!-- Policy Group -->
+
+        <record id="policy_group_view_form" model="ir.ui.view">
+            <field name="name">hr.policy.group.form.rounding</field>
+            <field name="model">hr.policy.group</field>
+            <field
+                name="inherit_id"
+                ref="payroll_policy_group.policy_group_view_form"
+            />
+            <field name="arch" type="xml">
+                <xpath expr="//group[@name='right']" position="inside">
+                    <field name="rounding_policy_ids" />
+                </xpath>
+            </field>
+        </record>
+
+        <!-- Attendance -->
+
+        <record id="view_attendance_tree" model="ir.ui.view">
+            <field name="name">hr.attendance.tree</field>
+            <field name="model">hr.attendance</field>
+            <field name="type">tree</field>
+            <field name="inherit_id" ref="hr_attendance.view_attendance_tree" />
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='check_in']" position="after">
+                    <field name="clock_in" />
+                </xpath>
+                <xpath expr="//field[@name='check_out']" position="after">
+                    <field name="clock_out" />
+                </xpath>
+            </field>
+        </record>
+
+        <record id="view_attendance_filter" model="ir.ui.view">
+            <field name="name">hr.attendance.filter.inherit.policy</field>
+            <field name="model">hr.attendance</field>
+            <field name="inherit_id" ref="hr_attendance.hr_attendance_view_filter" />
+            <field name="arch" type="xml">
+                <xpath expr="//filter[@name='groupby_check_out']" position="after">
+                    <filter
+                        string="Clock In"
+                        name="groupby_name"
+                        context="{'group_by': 'clock_in'}"
+                    />
+                    <filter
+                        string="Clock Out"
+                        name="groupby_check_out"
+                        context="{'group_by': 'clock_out'}"
+                    />
+                </xpath>
+            </field>
+        </record>
+
+        <record id="view_attendance_form" model="ir.ui.view">
+            <field name="name">hr.attendance.form</field>
+            <field name="model">hr.attendance</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="hr_attendance.hr_attendance_view_form" />
+            <field name="arch" type="xml">
+                <xpath expr="//sheet" position="inside">
+                    <group>
+                        <field name="clock_in" />
+                        <field name="clock_out" />
+                    </group>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/payroll_register/README.rst b/payroll_register/README.rst
new file mode 100644
index 00000000..5b8c9302
--- /dev/null
+++ b/payroll_register/README.rst
@@ -0,0 +1,61 @@
+================
+Payroll Register
+================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:68364d4b3875f4ce98733ac9cab903ae615ee8c502eaf6a34b91c89a8f5daf95
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_register
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+This module links payslips to one payroll register. Payslips are organized by department.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_register%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+* Michael Telahun Makonnen
+
+Other credits
+~~~~~~~~~~~~~
+
+* Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_register>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/payroll_register/__init__.py b/payroll_register/__init__.py
new file mode 100644
index 00000000..60d0d5c0
--- /dev/null
+++ b/payroll_register/__init__.py
@@ -0,0 +1,6 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2011,2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
+from . import wizard
diff --git a/payroll_register/__manifest__.py b/payroll_register/__manifest__.py
new file mode 100644
index 00000000..7044a711
--- /dev/null
+++ b/payroll_register/__manifest__.py
@@ -0,0 +1,23 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2011,2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Payroll Register",
+    "version": "15.0.1.0.0",
+    "category": "Payroll",
+    "license": "AGPL-3",
+    "author": "TREVI Software, Michael Telahun Makonnen",
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "images": ["static/src/img/main_screenshot.png"],
+    "depends": [
+        "res_currency_denomination",
+        "payroll",
+    ],
+    "data": [
+        "security/ir.model.access.csv",
+        "wizard/hr_payroll_register_run_view.xml",
+        "views/hr_payroll_register_view.xml",
+    ],
+    "installable": True,
+}
diff --git a/payroll_register/i18n/payroll_register.pot b/payroll_register/i18n/payroll_register.pot
new file mode 100644
index 00000000..d6e7e190
--- /dev/null
+++ b/payroll_register/i18n/payroll_register.pot
@@ -0,0 +1,301 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* payroll_register
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: payroll_register
+#: model_terms:ir.ui.view,arch_db:payroll_register.view_payroll_register
+msgid "\"This wizard will generate payslips for selected departments.\""
+msgstr ""
+
+#. module: payroll_register
+#: model_terms:ir.ui.view,arch_db:payroll_register.view_payroll_register
+msgid "Cancel"
+msgstr ""
+
+#. module: payroll_register
+#: model:ir.model.fields.selection,name:payroll_register.selection__hr_payroll_register__state__close
+msgid "Close"
+msgstr ""
+
+#. module: payroll_register
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payroll_register__company_id
+#: model_terms:ir.ui.view,arch_db:payroll_register.hr_payroll_register_filter
+msgid "Company"
+msgstr ""
+
+#. module: payroll_register
+#: model_terms:ir.ui.view,arch_db:payroll_register.hr_payroll_register_form
+msgid "Create Payslips"
+msgstr ""
+
+#. module: payroll_register
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payroll_register__create_uid
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payroll_register_denominations__create_uid
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payroll_register_run__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: payroll_register
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payroll_register__create_date
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payroll_register_denominations__create_date
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payroll_register_run__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: payroll_register
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payroll_register__currency_id
+msgid "Currency"
+msgstr ""
+
+#. module: payroll_register
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payroll_register__date_start
+msgid "Date From"
+msgstr ""
+
+#. module: payroll_register
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payroll_register__date_end
+msgid "Date To"
+msgstr ""
+
+#. module: payroll_register
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payroll_register_denominations__denomination
+msgid "Denomination"
+msgstr ""
+
+#. module: payroll_register
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payroll_register__denomination_ids
+msgid "Denomination Quantitiess"
+msgstr ""
+
+#. module: payroll_register
+#: model_terms:ir.ui.view,arch_db:payroll_register.hr_payroll_register_form
+msgid "Denominations"
+msgstr ""
+
+#. module: payroll_register
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payslip_run__department_ids
+msgid "Department"
+msgstr ""
+
+#. module: payroll_register
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payroll_register_run__department_ids
+msgid "Departments"
+msgstr ""
+
+#. module: payroll_register
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payroll_register__name
+msgid "Description"
+msgstr ""
+
+#. module: payroll_register
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payroll_register__display_name
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payroll_register_denominations__display_name
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payroll_register_run__display_name
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payslip_run__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: payroll_register
+#: model:ir.model.fields.selection,name:payroll_register.selection__hr_payroll_register__state__draft
+msgid "Draft"
+msgstr ""
+
+#. module: payroll_register
+#: model:ir.model,name:payroll_register.model_hr_payroll_register_denominations
+msgid "Exact denomination amounts for entire payroll register"
+msgstr ""
+
+#. module: payroll_register
+#: model_terms:ir.ui.view,arch_db:payroll_register.view_payroll_register
+msgid "Generate"
+msgstr ""
+
+#. module: payroll_register
+#: model:ir.actions.act_window,name:payroll_register.action_create_runs
+msgid "Generate Payslips"
+msgstr ""
+
+#. module: payroll_register
+#: model_terms:ir.ui.view,arch_db:payroll_register.hr_payroll_register_filter
+msgid "Group By..."
+msgstr ""
+
+#. module: payroll_register
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payroll_register__id
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payroll_register_denominations__id
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payroll_register_run__id
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payslip_run__id
+msgid "ID"
+msgstr ""
+
+#. module: payroll_register
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payroll_register____last_update
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payroll_register_denominations____last_update
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payroll_register_run____last_update
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payslip_run____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: payroll_register
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payroll_register__write_uid
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payroll_register_denominations__write_uid
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payroll_register_run__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: payroll_register
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payroll_register__write_date
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payroll_register_denominations__write_date
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payroll_register_run__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: payroll_register
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payroll_register__exact_change
+#: model_terms:ir.ui.view,arch_db:payroll_register.hr_payroll_register_form
+msgid "Net Amount"
+msgstr ""
+
+#. module: payroll_register
+#: code:addons/payroll_register/wizard/hr_payroll_register_run.py:0
+#, python-format
+msgid "No departments selected for payslip generation."
+msgstr ""
+
+#. module: payroll_register
+#: model:ir.model,name:payroll_register.model_hr_payroll_register_run
+msgid "Pay Slip Creation"
+msgstr ""
+
+#. module: payroll_register
+#: model:ir.model,name:payroll_register.model_hr_payroll_register
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payroll_register_denominations__register_id
+#: model_terms:ir.ui.view,arch_db:payroll_register.hr_payroll_register_form
+msgid "Payroll Register"
+msgstr ""
+
+#. module: payroll_register
+#: model_terms:ir.ui.view,arch_db:payroll_register.hr_payroll_register_form
+msgid "Payroll Register Denominations"
+msgstr ""
+
+#. module: payroll_register
+#: code:addons/payroll_register/models/hr_payroll_register.py:0
+#: model:ir.model.constraint,message:payroll_register.constraint_hr_payroll_register_unique_name
+#, python-format
+msgid "Payroll Register description must be unique per company."
+msgstr ""
+
+#. module: payroll_register
+#: model_terms:ir.ui.view,arch_db:payroll_register.hr_payroll_register_tree
+msgid "Payroll Registers"
+msgstr ""
+
+#. module: payroll_register
+#: model_terms:ir.ui.view,arch_db:payroll_register.hr_payroll_register_filter
+msgid "Payroll Registers Search View"
+msgstr ""
+
+#. module: payroll_register
+#: code:addons/payroll_register/models/hr_payroll_register.py:0
+#, python-format
+msgid "Payroll for the Month of %s %s"
+msgstr ""
+
+#. module: payroll_register
+#: model:ir.model,name:payroll_register.model_hr_payslip_run
+#: model_terms:ir.ui.view,arch_db:payroll_register.hr_payroll_register_form
+msgid "Payslip Batches"
+msgstr ""
+
+#. module: payroll_register
+#: model_terms:ir.ui.view,arch_db:payroll_register.view_payroll_register
+msgid "Payslip Creation by Department"
+msgstr ""
+
+#. module: payroll_register
+#: model_terms:ir.ui.view,arch_db:payroll_register.hr_payroll_register_form
+msgid "Payslip Runs by Department"
+msgstr ""
+
+#. module: payroll_register
+#: model_terms:ir.ui.view,arch_db:payroll_register.view_payroll_register
+msgid "Payslips by Department"
+msgstr ""
+
+#. module: payroll_register
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payroll_register__period_name
+msgid "Period Name"
+msgstr ""
+
+#. module: payroll_register
+#: code:addons/payroll_register/wizard/hr_payroll_register_run.py:0
+#, python-format
+msgid "Programming Error !"
+msgstr ""
+
+#. module: payroll_register
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payroll_register_denominations__denomination_qty
+msgid "Quantity"
+msgstr ""
+
+#. module: payroll_register
+#: model_terms:ir.ui.view,arch_db:payroll_register.hr_payroll_register_form
+msgid "Re-calculate"
+msgstr ""
+
+#. module: payroll_register
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payslip_run__register_id
+msgid "Register"
+msgstr ""
+
+#. module: payroll_register
+#: model:ir.actions.act_window,name:payroll_register.open_payroll_registers
+#: model:ir.ui.menu,name:payroll_register.menu_payroll_register
+msgid "Registers"
+msgstr ""
+
+#. module: payroll_register
+#: model_terms:ir.ui.view,arch_db:payroll_register.hr_payroll_register_form
+msgid "Remove All Payslips"
+msgstr ""
+
+#. module: payroll_register
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payroll_register__run_ids
+msgid "Run"
+msgstr ""
+
+#. module: payroll_register
+#: model:ir.model.fields,field_description:payroll_register.field_hr_payroll_register__state
+msgid "Status"
+msgstr ""
+
+#. module: payroll_register
+#: model_terms:ir.ui.view,arch_db:payroll_register.hr_payroll_register_form
+msgid ""
+"This will delete all payslip records for this month. Are you sure you want "
+"to continue?"
+msgstr ""
+
+#. module: payroll_register
+#: code:addons/payroll_register/wizard/hr_payroll_register_run.py:0
+#, python-format
+msgid "Unable to determine Payroll Register Id."
+msgstr ""
+
+#. module: payroll_register
+#: code:addons/payroll_register/wizard/hr_payroll_register_run.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
diff --git a/payroll_register/models/__init__.py b/payroll_register/models/__init__.py
new file mode 100644
index 00000000..5abd9a28
--- /dev/null
+++ b/payroll_register/models/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2011,2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import hr_payroll_register
diff --git a/payroll_register/models/hr_payroll_register.py b/payroll_register/models/hr_payroll_register.py
new file mode 100644
index 00000000..a80878b1
--- /dev/null
+++ b/payroll_register/models/hr_payroll_register.py
@@ -0,0 +1,189 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2011,2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import datetime
+
+from odoo import api, fields, models
+from odoo.tools.translate import _
+
+
+class HrPayrollRun(models.Model):
+
+    _name = "hr.payslip.run"
+    _inherit = "hr.payslip.run"
+
+    register_id = fields.Many2one(comodel_name="hr.payroll.register", string="Register")
+    department_ids = fields.Many2many(
+        comodel_name="hr.department",
+        relation="hr_payroll_register_department_rel",
+        column1="register_id",
+        column2="department_id",
+        string="Department",
+    )
+
+
+class HrPayrollRegister(models.Model):
+
+    _name = "hr.payroll.register"
+    _description = "Payroll Register"
+    _sql_constraints = [
+        (
+            "unique_name",
+            "CHECK(1=1)",
+            _("Payroll Register description must be unique per company."),
+        )
+    ]
+
+    @api.model
+    def _get_default_name(self):
+
+        nMonth = datetime.now().strftime("%B")
+        year = datetime.now().year
+        name = _("Payroll for the Month of %s %s" % (nMonth, year))
+        return name
+
+    name = fields.Char(string="Description", required=True, default=_get_default_name)
+    period_name = fields.Char()
+    state = fields.Selection(
+        string="Status",
+        selection=[("draft", "Draft"), ("close", "Close")],
+        index=True,
+        default="draft",
+        readonly=True,
+    )
+    date_start = fields.Datetime(
+        string="Date From",
+        required=True,
+        readonly=True,
+        states={"draft": [("readonly", False)]},
+    )
+    date_end = fields.Datetime(
+        string="Date To",
+        required=True,
+        readonly=True,
+        states={"draft": [("readonly", False)]},
+    )
+    run_ids = fields.One2many(
+        comodel_name="hr.payslip.run",
+        inverse_name="register_id",
+        readonly=True,
+        states={"draft": [("readonly", False)]},
+    )
+    company_id = fields.Many2one(
+        string="Company",
+        comodel_name="res.company",
+        default=lambda self: self.env.company,
+    )
+    denomination_ids = fields.One2many(
+        string="Denomination Quantitiess",
+        comodel_name="hr.payroll.register.denominations",
+        inverse_name="register_id",
+        readonly=True,
+    )
+    exact_change = fields.Monetary(
+        string="Net Amount", compute="_compute_change", readonly=True
+    )
+    currency_id = fields.Many2one(
+        "res.currency",
+        "Currency",
+        required=True,
+        default=lambda self: self.env.company.currency_id,
+    )
+
+    def _compute_change(self):
+
+        res = 0
+        for reg in self:
+            for den in reg.denomination_ids:
+                res += den.denomination * den.denomination_qty
+            reg.exact_change = res
+
+    def name_get(self):
+        res = []
+        for rec in self:
+            if not rec.period_name or rec.period_name in rec.name:
+                res.append((rec.id, f"{rec.name}"))
+            else:
+                res.append((rec.id, f"{rec.period_name} {rec.name}"))
+        return res
+
+    def action_delete_runs(self):
+
+        PayslipRun = self.env["hr.payslip.run"]
+        payslip_run_ids = PayslipRun.search([("register_id", "in", self.ids)])
+        payslip_run_ids.unlink()
+        return True
+
+    @api.model
+    def get_net_payslip_lines_domain(self, run_ids):
+
+        return [
+            ("slip_id.payslip_run_id", "in", run_ids.ids),
+            ("salary_rule_id.code", "=", "NET"),
+        ]
+
+    @api.model
+    def get_net_payslip_lines(self, run_ids):
+
+        net_lines = []
+        PayslipLine = self.env["hr.payslip.line"]
+        slip_line_ids = PayslipLine.search(self.get_net_payslip_lines_domain(run_ids))
+        for line in slip_line_ids:
+            net_lines.append(line.total)
+
+        return net_lines
+
+    def set_denominations(self):
+
+        Denominations = self.env["hr.payroll.register.denominations"]
+        for register in self:
+            if len(register.run_ids) == 0:
+                return
+
+            # Remove current denomination count
+            den_ids = Denominations.search([("register_id", "=", register.id)])
+            den_ids.unlink()
+
+            # Get list of all 'NET' payslip lines
+            #
+            net_lines = self.get_net_payslip_lines(register.run_ids)
+            if len(net_lines) == 0:
+                return
+
+            currency = self.currency_id
+            denominations, smallest_note = currency.get_denomination_list()
+            denom_qty_list = dict.fromkeys(denominations, 0)
+            for net in net_lines:
+                denominations_list = currency.get_denominations_from_amount(net)
+                for line in denominations_list:
+                    denom_qty_list[line["name"]] += line["qty"]
+
+            exact_change = 0.0
+            for k, v in denom_qty_list.items():
+                Denominations.create(
+                    {
+                        "register_id": register.id,
+                        "denomination": k,
+                        "denomination_qty": v,
+                    }
+                )
+                exact_change += k * v
+
+            register.exact_change = exact_change
+
+
+class HrPayrollRegisterDenominations(models.Model):
+
+    _name = "hr.payroll.register.denominations"
+    _description = "Exact denomination amounts for entire payroll register"
+    _order = "denomination"
+
+    register_id = fields.Many2one(
+        string="Payroll Register",
+        comodel_name="hr.payroll.register",
+        required=True,
+        ondelete="cascade",
+    )
+    denomination = fields.Float(digits=(12, 6), required=True)
+    denomination_qty = fields.Integer(string="Quantity")
diff --git a/payroll_register/readme/CREDITS.rst b/payroll_register/readme/CREDITS.rst
new file mode 100644
index 00000000..d264bc7e
--- /dev/null
+++ b/payroll_register/readme/CREDITS.rst
@@ -0,0 +1 @@
+* Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/payroll_register/readme/DESCRIPTION.rst b/payroll_register/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..e1461210
--- /dev/null
+++ b/payroll_register/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+This module links payslips to one payroll register. Payslips are organized by department.
diff --git a/payroll_register/security/ir.model.access.csv b/payroll_register/security/ir.model.access.csv
new file mode 100644
index 00000000..7f64db8e
--- /dev/null
+++ b/payroll_register/security/ir.model.access.csv
@@ -0,0 +1,6 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_payroll_register_user,access_hr_payroll_register,model_hr_payroll_register,hr.group_hr_user,1,0,0,0
+access_hr_payroll_register_denomination_user,access_hr_payroll_register,model_hr_payroll_register_denominations,hr.group_hr_user,1,0,0,0
+access_hr_payroll_register_payroll,access_hr_payroll_register,model_hr_payroll_register,payroll.group_payroll_user,1,1,1,1
+access_hr_payroll_register_denomination_payroll,access_hr_payroll_register,model_hr_payroll_register_denominations,payroll.group_payroll_user,1,1,1,1
+access_hr_payroll_register_run_user,access_hr_payroll_register_run,model_hr_payroll_register_run,payroll.group_payroll_user,1,1,1,1
diff --git a/payroll_register/static/description/icon.png b/payroll_register/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/payroll_register/static/description/icon.png differ
diff --git a/payroll_register/static/description/index.html b/payroll_register/static/description/index.html
new file mode 100644
index 00000000..29fc3cc2
--- /dev/null
+++ b/payroll_register/static/description/index.html
@@ -0,0 +1,417 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Payroll Register</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="payroll-register">
+<h1 class="title">Payroll Register</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:68364d4b3875f4ce98733ac9cab903ae615ee8c502eaf6a34b91c89a8f5daf95
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_register"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<p>This module links payslips to one payroll register. Payslips are organized by department.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-4">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_register%0Aversion:%2014.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="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>TREVI Software</li>
+<li>Michael Telahun Makonnen</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-4">Other credits</a></h2>
+<ul class="simple">
+<li>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_register">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/payroll_register/static/src/img/main_screenshot.png b/payroll_register/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/payroll_register/static/src/img/main_screenshot.png differ
diff --git a/payroll_register/tests/__init__.py b/payroll_register/tests/__init__.py
new file mode 100644
index 00000000..5cfe7a10
--- /dev/null
+++ b/payroll_register/tests/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import test_payroll_register
diff --git a/payroll_register/tests/test_payroll_register.py b/payroll_register/tests/test_payroll_register.py
new file mode 100644
index 00000000..b363e3c4
--- /dev/null
+++ b/payroll_register/tests/test_payroll_register.py
@@ -0,0 +1,140 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import datetime
+
+from odoo import fields
+from odoo.exceptions import UserError, ValidationError
+from odoo.tests import common, new_test_user
+
+
+class TestPayrollRegister(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super(TestPayrollRegister, cls).setUpClass()
+
+        cls.Wizard = cls.env["hr.payroll.register.run"]
+        cls.Register = cls.env["hr.payroll.register"]
+
+        cls.start = datetime(2021, 1, 1)
+        cls.end = datetime(2021, 1, 31)
+        cls.dept1 = cls.env["hr.department"].create({"name": "Dept A"})
+        cls.eeJohn = cls.env["hr.employee"].create(
+            {
+                "name": "John Smith",
+                "department_id": cls.dept1.id,
+            }
+        )
+        cls.pay_struct = cls.env.ref("payroll.structure_base")
+        # Payroll Manager user
+        cls.userPM = new_test_user(
+            cls.env,
+            login="hel",
+            groups="base.group_user,payroll.group_payroll_manager",
+            name="Payroll manager",
+            email="ric@example.com",
+        )
+
+    def create_contract(
+        self, eid, state, kanban_state, start, end=None, trial_end=None
+    ):
+        return self.env["hr.contract"].create(
+            {
+                "name": "Contract",
+                "employee_id": eid,
+                "state": state,
+                "kanban_state": kanban_state,
+                "wage": 989.92,
+                "date_start": start,
+                "trial_date_end": trial_end,
+                "date_end": end,
+                "struct_id": self.pay_struct.id,
+            }
+        )
+
+    def check_denominations(self, reg, d):
+        for den in reg.denomination_ids:
+            key = fields.Float.round(den.denomination, 2)
+            self.assertEqual(
+                0,
+                fields.Float.compare(d[key], den.denomination_qty, 2),
+                "Denomination key: %s" % (key),
+            )
+
+    def setUpCommon(self):
+        self.create_contract(self.eeJohn.id, "open", "normal", self.start.date())
+
+    def test_no_active_id(self):
+        """If 'active_id' is not in the context raise an error"""
+
+        self.setUpCommon()
+        wiz = self.Wizard.create({"department_ids": [(6, 0, [self.dept1.id])]})
+        with self.assertRaises(ValidationError):
+            wiz.create_payslip_runs()
+
+    def test_no_departments(self):
+        """If no departments were selected raise an error"""
+
+        self.setUpCommon()
+        reg = self.Register.create(
+            {
+                "date_start": self.start,
+                "date_end": self.end,
+            }
+        )
+        wiz = self.Wizard.with_context({"active_id": reg.id}).create({})
+        with self.assertRaises(UserError):
+            wiz.create_payslip_runs()
+
+    def test_payroll_register_wizard(self):
+        """
+        Running the wizard with one department should create a payroll
+        register containing a payslip run for that department.
+        """
+
+        self.setUpCommon()
+        reg = self.Register.with_user(self.userPM).create(
+            {
+                "date_start": self.start,
+                "date_end": self.end,
+            }
+        )
+        wiz = self.Wizard.with_context({"active_id": reg.id}).create(
+            {"department_ids": [(6, 0, [self.dept1.id])]}
+        )
+        wiz.create_payslip_runs()
+
+        self.assertEqual(1, len(reg.run_ids))
+        self.assertEqual(self.dept1.complete_name, reg.run_ids[0].name)
+
+    def test_payroll_register_denominations(self):
+        """When the wizard is run it should also create the denominations"""
+
+        self.setUpCommon()
+        reg = self.Register.create(
+            {
+                "date_start": self.start,
+                "date_end": self.end,
+                "currency_id": self.env.ref("base.USD").id,
+            }
+        )
+        wiz = self.Wizard.with_context({"active_id": reg.id}).create(
+            {"department_ids": [(6, 0, [self.dept1.id])]}
+        )
+        wiz.create_payslip_runs()
+
+        res = {
+            0.01: 2,
+            0.05: 1,
+            0.10: 1,
+            0.25: 1,
+            0.50: 1,
+            1: 4,
+            5: 1,
+            10: 1,
+            20: 1,
+            50: 1,
+            100: 9,
+        }
+        self.assertGreater(len(reg.denomination_ids), 0)
+        self.check_denominations(reg, res)
diff --git a/payroll_register/views/hr_payroll_register_view.xml b/payroll_register/views/hr_payroll_register_view.xml
new file mode 100644
index 00000000..ef039429
--- /dev/null
+++ b/payroll_register/views/hr_payroll_register_view.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+
+        <record id="hr_payroll_register_filter" model="ir.ui.view">
+            <field name="name">Payroll Registers Search View</field>
+            <field name="model">hr.payroll.register</field>
+            <field name="arch" type="xml">
+                <search string="Payroll Registers Search View">
+                    <field name="name" />
+                    <field name="company_id" groups="base.group_multi_company" />
+                    <group expand="0" string="Group By...">
+                        <filter
+                            name="group_company"
+                            string="Company"
+                            icon="terp-go-home"
+                            domain="[]"
+                            context="{'group_by':'company_id'}"
+                            groups="base.group_multi_company"
+                        />
+                    </group>
+                </search>
+             </field>
+         </record>
+
+        <record id="hr_payroll_register_tree" model="ir.ui.view">
+            <field name="name">hr.payroll.register.tree</field>
+            <field name="model">hr.payroll.register</field>
+            <field name="arch" type="xml">
+                <tree string="Payroll Registers">
+                    <field name="display_name" />
+                </tree>
+            </field>
+        </record>
+
+        <record id="hr_payroll_register_form" model="ir.ui.view">
+            <field name="name">hr.payroll.register.form</field>
+            <field name="model">hr.payroll.register</field>
+            <field name="arch" type="xml">
+                <form string="Payroll Register">
+                    <sheet>
+                        <header>
+                            <button
+                                name="%(action_create_runs)d"
+                                type="action"
+                                string="Create Payslips"
+                            />
+                            <button
+                                name="action_delete_runs"
+                                type="object"
+                                string="Remove All Payslips"
+                                confirm="This will delete all payslip records for this month. Are you sure you want to continue?"
+                            />
+                            <field name="state" widget="statusbar" />
+                        </header>
+                        <label for="name" class="oe_edit_only" />
+                        <h1>
+                            <field name="name" />
+                        </h1>
+                        <group>
+                            <group>
+                                <field name="date_start" />
+                                <field name="date_end" />
+                                <field name="company_id" />
+                            </group>
+                            <group>
+                                <field name="period_name" />
+                            </group>
+                         </group>
+                        <group>
+                            <group string="Payslip Batches">
+                                <field name="run_ids" colspan="4" nolabel="1">
+                                    <tree string="Payslip Runs by Department">
+                                        <field name="name" />
+                                        <field name="date_start" />
+                                        <field name="date_end" />
+                                        <field name="state" />
+                                    </tree>
+                                </field>
+                            </group>
+                            <group name="denominations" string="Denominations">
+                                <group>
+                                    <field
+                                        name="denomination_ids"
+                                        nolabel="1"
+                                        colspan="2"
+                                    >
+                                        <tree
+                                            string="Payroll Register Denominations"
+                                            default_order="denomination"
+                                        >
+                                            <field name="denomination" />
+                                            <field name="denomination_qty" />
+                                        </tree>
+                                    </field>
+                                    <newline />
+                                    <div name="exact_change">
+                                        <label for="exact_change" string="Net Amount" />
+                                        <field
+                                            name="exact_change"
+                                            nolabel="1"
+                                            widget="monetary"
+                                        />
+                                    </div>
+                                </group>
+                                <newline />
+                                <button
+                                    name="set_denominations"
+                                    type="object"
+                                    string="Re-calculate"
+                                    states="draft"
+                                />
+                            </group>
+                       </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="open_payroll_registers" model="ir.actions.act_window">
+            <field name="name">Registers</field>
+            <field name="res_model">hr.payroll.register</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="hr_payroll_register_tree" />
+        </record>
+        <menuitem
+            id="menu_payroll_register"
+            action="open_payroll_registers"
+            parent="payroll.payroll_menu_root"
+            sequence="30"
+        />
+
+    </data>
+</odoo>
diff --git a/payroll_register/wizard/__init__.py b/payroll_register/wizard/__init__.py
new file mode 100644
index 00000000..5ccb609c
--- /dev/null
+++ b/payroll_register/wizard/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2011,2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import hr_payroll_register_run
diff --git a/payroll_register/wizard/hr_payroll_register_run.py b/payroll_register/wizard/hr_payroll_register_run.py
new file mode 100644
index 00000000..92728981
--- /dev/null
+++ b/payroll_register/wizard/hr_payroll_register_run.py
@@ -0,0 +1,73 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2011,2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import _, exceptions, fields, models
+
+
+class PayrollRegisterRun(models.TransientModel):
+
+    _name = "hr.payroll.register.run"
+    _description = "Pay Slip Creation"
+
+    department_ids = fields.Many2many(
+        string="Departments",
+        comodel_name="hr.department",
+        relation="hr_department_payslip_run_rel",
+        column1="register_id",
+        column2="register_run_id",
+    )
+
+    def create_payslip_runs(self):
+
+        self.ensure_one()
+        Employee = self.env["hr.employee"]
+        Payslip = self.env["hr.payslip"]
+        PayslipRun = self.env["hr.payslip.run"]
+        PayrollRegister = self.env["hr.payroll.register"]
+
+        register_id = self.env.context.get("active_id", False)
+        if not register_id:
+            raise exceptions.ValidationError(
+                _("Programming Error !")
+                + "\n"
+                + _("Unable to determine Payroll Register Id.")
+            )
+        pr = PayrollRegister.browse(register_id)
+
+        if not self.department_ids:
+            raise exceptions.UserError(
+                _("Warning !")
+                + "\n"
+                + _("No departments selected for payslip generation.")
+            )
+
+        # Create a payslip batch for each department, and then for each employee
+        # in a department create a pay slip and attach it to the payslip batch.
+        #
+        for dept in self.department_ids:
+            run_res = {
+                "name": dept.complete_name,
+                "date_start": pr.date_start,
+                "date_end": pr.date_end,
+                "register_id": register_id,
+            }
+            run_id = PayslipRun.create(run_res)
+
+            slip_ids = self.env["hr.payslip"]
+            ee_ids = Employee.search([("department_id", "=", dept.id)], order="name")
+            for ee in ee_ids:
+                res = {
+                    "employee_id": ee.id,
+                    "payslip_run_id": run_id.id,
+                    "date_from": pr.date_start.date(),
+                    "date_to": pr.date_end.date(),
+                }
+                slip_ids |= Payslip.create(res)
+            for s in slip_ids:
+                s.onchange_employee()
+            slip_ids.compute_sheet()
+
+        pr.set_denominations()
+
+        return {"type": "ir.actions.act_window_close"}
diff --git a/payroll_register/wizard/hr_payroll_register_run_view.xml b/payroll_register/wizard/hr_payroll_register_run_view.xml
new file mode 100644
index 00000000..acbe3d65
--- /dev/null
+++ b/payroll_register/wizard/hr_payroll_register_run_view.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+
+        <record id="view_payroll_register" model="ir.ui.view">
+            <field name="name">hr.payroll.register.run.wizard</field>
+            <field name="model">hr.payroll.register.run</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Payslip Creation by Department">
+                    <group colspan="4">
+                        <separator string="Payslips by Department" colspan="4" />
+                        <h3
+                        >"This wizard will generate payslips for selected departments."</h3>
+                        <newline />
+                        <field name="department_ids" nolabel="1" />
+                    </group>
+                    <separator />
+                    <footer>
+                        <button
+                            string="Generate"
+                            name="create_payslip_runs"
+                            type="object"
+                        />
+                        <button special="cancel" string="Cancel" />
+                    </footer>
+               </form>
+            </field>
+        </record>
+
+        <record id="action_create_runs" model="ir.actions.act_window">
+            <field name="name">Generate Payslips</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr.payroll.register.run</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/payroll_register_report/README.rst b/payroll_register_report/README.rst
new file mode 100644
index 00000000..f4de814b
--- /dev/null
+++ b/payroll_register_report/README.rst
@@ -0,0 +1,60 @@
+=======================
+Payroll Register Report
+=======================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:e21ed12091680285b5aa263e9539afbc6d7e112c5d244c63d1faa7ff67e885ef
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_register_report
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+This module prints a payroll register by batch run. Each batch run prints a summary of each payslip by salary rule category. One per line.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_register_report%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+
+Other credits
+~~~~~~~~~~~~~
+
+* Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_register_report>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/payroll_register_report/__init__.py b/payroll_register_report/__init__.py
new file mode 100644
index 00000000..0cfb63e1
--- /dev/null
+++ b/payroll_register_report/__init__.py
@@ -0,0 +1,2 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
diff --git a/payroll_register_report/__manifest__.py b/payroll_register_report/__manifest__.py
new file mode 100644
index 00000000..20c6783f
--- /dev/null
+++ b/payroll_register_report/__manifest__.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Payroll Register Report",
+    "summary": "List payslips with salary categories by batch.",
+    "version": "15.0.1.0.0",
+    "category": "Payroll",
+    "license": "AGPL-3",
+    "author": "TREVI Software",
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "images": ["static/src/img/main_screenshot.png"],
+    "depends": [
+        "payroll",
+        "payroll_payslip_dictionary",
+        "payroll_period_processing",
+        "payroll_register",
+    ],
+    "data": [
+        "report/report.xml",
+        "report/report_payroll_register.xml",
+    ],
+    "installable": True,
+}
diff --git a/payroll_register_report/i18n/payroll_register_report.pot b/payroll_register_report/i18n/payroll_register_report.pot
new file mode 100644
index 00000000..1a6dc9ad
--- /dev/null
+++ b/payroll_register_report/i18n/payroll_register_report.pot
@@ -0,0 +1,85 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* payroll_register_report
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: payroll_register_report
+#: model:ir.actions.report,print_report_name:payroll_register_report.action_report_payroll_register
+msgid ""
+"\n"
+"            '%s' % (object.name)\n"
+"        "
+msgstr ""
+
+#. module: payroll_register_report
+#: model_terms:ir.ui.view,arch_db:payroll_register_report.payroll_register_batch
+#: model_terms:ir.ui.view,arch_db:payroll_register_report.report_payroll_register
+msgid "Allowance"
+msgstr ""
+
+#. module: payroll_register_report
+#: model_terms:ir.ui.view,arch_db:payroll_register_report.payroll_register_batch
+#: model_terms:ir.ui.view,arch_db:payroll_register_report.report_payroll_register
+msgid "Deductions"
+msgstr ""
+
+#. module: payroll_register_report
+#: model_terms:ir.ui.view,arch_db:payroll_register_report.payroll_register_batch
+#: model_terms:ir.ui.view,arch_db:payroll_register_report.report_payroll_register
+msgid "Federal Income Tax"
+msgstr ""
+
+#. module: payroll_register_report
+#: model_terms:ir.ui.view,arch_db:payroll_register_report.payroll_register_batch
+#: model_terms:ir.ui.view,arch_db:payroll_register_report.report_payroll_register
+msgid "Gross"
+msgstr ""
+
+#. module: payroll_register_report
+#: model_terms:ir.ui.view,arch_db:payroll_register_report.payroll_register_batch
+msgid "Name"
+msgstr ""
+
+#. module: payroll_register_report
+#: model_terms:ir.ui.view,arch_db:payroll_register_report.payroll_register_batch
+#: model_terms:ir.ui.view,arch_db:payroll_register_report.report_payroll_register
+msgid "Net"
+msgstr ""
+
+#. module: payroll_register_report
+#: model_terms:ir.ui.view,arch_db:payroll_register_report.payroll_register_batch
+#: model_terms:ir.ui.view,arch_db:payroll_register_report.report_payroll_register
+msgid "Overtime"
+msgstr ""
+
+#. module: payroll_register_report
+#: model:ir.actions.report,name:payroll_register_report.action_report_payroll_register
+msgid "Payroll Register"
+msgstr ""
+
+#. module: payroll_register_report
+#: model_terms:ir.ui.view,arch_db:payroll_register_report.payroll_register_batch
+#: model_terms:ir.ui.view,arch_db:payroll_register_report.report_payroll_register
+msgid "Salary"
+msgstr ""
+
+#. module: payroll_register_report
+#: model_terms:ir.ui.view,arch_db:payroll_register_report.payroll_register_batch
+#: model_terms:ir.ui.view,arch_db:payroll_register_report.report_payroll_register
+msgid "Taxable Gross"
+msgstr ""
+
+#. module: payroll_register_report
+#: model_terms:ir.ui.view,arch_db:payroll_register_report.report_payroll_register
+msgid "Total"
+msgstr ""
diff --git a/payroll_register_report/readme/CREDITS.rst b/payroll_register_report/readme/CREDITS.rst
new file mode 100644
index 00000000..d264bc7e
--- /dev/null
+++ b/payroll_register_report/readme/CREDITS.rst
@@ -0,0 +1 @@
+* Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/payroll_register_report/readme/DESCRIPTION.rst b/payroll_register_report/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..598e1ec5
--- /dev/null
+++ b/payroll_register_report/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+This module prints a payroll register by batch run. Each batch run prints a summary of each payslip by salary rule category. One per line.
diff --git a/payroll_register_report/report/report.xml b/payroll_register_report/report/report.xml
new file mode 100644
index 00000000..329d3da3
--- /dev/null
+++ b/payroll_register_report/report/report.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="paperformat_payroll_register" model="report.paperformat">
+        <field name="name">Custom Paperformat for the Payroll Register</field>
+        <field name="default" eval="False" />
+        <field name="format">A4</field>
+        <field name="page_height">0</field>
+        <field name="page_width">0</field>
+        <field name="orientation">Landscape</field>
+        <field name="margin_top">8</field>
+        <field name="margin_bottom">8</field>
+        <field name="margin_left">0</field>
+        <field name="margin_right">0</field>
+        <field name="dpi">96</field>
+    </record>
+
+    <record id="action_report_payroll_register" model="ir.actions.report">
+        <field name="name">Payroll Register</field>
+        <field name="model">hr.payroll.register</field>
+        <field name="report_type">qweb-pdf</field>
+        <field
+            name="report_name"
+        >payroll_register_report.report_payroll_register</field>
+        <field
+            name="report_file"
+        >payroll_register_report.report_payroll_register</field>
+        <field name="print_report_name">
+            '%s' % (object.name)
+        </field>
+        <field
+            name="binding_model_id"
+            ref="payroll_register.model_hr_payroll_register"
+        />
+        <field name="binding_type">report</field>
+        <field name="paperformat_id" ref="paperformat_payroll_register" />
+    </record>
+
+</odoo>
diff --git a/payroll_register_report/report/report_payroll_register.xml b/payroll_register_report/report/report_payroll_register.xml
new file mode 100644
index 00000000..f2b75a6c
--- /dev/null
+++ b/payroll_register_report/report/report_payroll_register.xml
@@ -0,0 +1,259 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <template id="report_payroll_register">
+        <t t-call="web.html_container">
+            <t t-foreach="docs" t-as="o">
+                <t t-call="web.internal_layout">
+                    <div class="page">
+                        <t t-set="title">
+                            <t t-esc="o.name" />
+                        </t>
+                        <t t-set="payroll_tax_heading" t-value="'Pension Fund 7%'" />
+                        <center>
+                            <h1>
+                                <span t-field="o.company_id.name" />
+                            </h1>
+                            <h2>
+                                <span t-field="o.name" />
+                            </h2>
+                            <h3 t-if="o.period_name not in o.name">
+                                <span t-field="o.period_name" />
+                            </h3>
+                        </center>
+                        <t t-foreach="o.run_ids" t-as="batch">
+                            <t
+                                t-call="payroll_register_report.payroll_register_batch"
+                            />
+                        </t>
+                        <h3>Total</h3>
+                        <table class="table table-sm table-bordered text-right">
+                            <thead class="text-center">
+                                <tr>
+                                    <th scope="col" />
+                                    <th scope="col">Salary</th>
+                                    <th scope="col">Overtime</th>
+                                    <th scope="col">Allowance</th>
+                                    <th scope="col">Gross</th>
+                                    <th scope="col">Taxable Gross</th>
+                                    <th scope="col">Federal Income Tax</th>
+                                    <th scope="col"><t
+                                            t-raw="payroll_tax_heading"
+                                        /></th>
+                                    <th scope="col">Deductions</th>
+                                    <th scope="col">Net</th>
+                                </tr>
+                            </thead>
+                            <tbody />
+                            <tfoot style="font-weight: bold;">
+                                <tr>
+                                    <td class="w-25" />
+                                    <td>
+                                        <t
+                                            t-esc="sum([line.amount*line.quantity*line.rate/100.0 for batch in o.run_ids for line in batch.slip_ids.mapped('line_ids') if line.category_id.code == 'BASIC'])"
+                                            t-options="{'widget': 'float', 'precision': 2}"
+                                        />
+                                    </td>
+                                    <td>
+                                        <t
+                                            t-esc="sum([line.amount*line.quantity*line.rate/100.0 for batch in o.run_ids for line in batch.slip_ids.mapped('line_ids') if line.category_id.code == 'OVERTM'])"
+                                            t-options="{'widget': 'float', 'precision': 2}"
+                                        />
+                                    </td>
+                                    <td>
+                                        <t
+                                            t-esc="sum([line.amount*line.quantity*line.rate/100.0 for batch in o.run_ids for line in batch.slip_ids.mapped('line_ids') if line.category_id.code == 'ALLWNC'])"
+                                            t-options="{'widget': 'float', 'precision': 2}"
+                                        />
+                                    </td>
+                                    <td>
+                                        <t
+                                            t-esc="sum([line.amount*line.quantity*line.rate/100.0 for batch in o.run_ids for line in batch.slip_ids.mapped('line_ids') if line.category_id.code == 'GROSS'])"
+                                            t-options="{'widget': 'float', 'precision': 2}"
+                                        />
+                                    </td>
+                                    <td>
+                                        <t
+                                            t-esc="sum([line.amount*line.quantity*line.rate/100.0 for batch in o.run_ids for line in batch.slip_ids.mapped('line_ids') if line.category_id.code == 'TAXBLE'])"
+                                            t-options="{'widget': 'float', 'precision': 2}"
+                                        />
+                                    </td>
+                                    <td>
+                                        <t
+                                            t-esc="sum([line.amount*line.quantity*line.rate/100.0 for batch in o.run_ids for line in batch.slip_ids.mapped('line_ids') if line.category_id.code == 'INCTAX'])"
+                                            t-options="{'widget': 'float', 'precision': 2}"
+                                        />
+                                    </td>
+                                    <td>
+                                        <t
+                                            t-esc="sum([line.amount*line.quantity*line.rate/100.0 for batch in o.run_ids for line in batch.slip_ids.mapped('line_ids') if line.category_id.code == 'PRLTAX'])"
+                                            t-options="{'widget': 'float', 'precision': 2}"
+                                        />
+                                    </td>
+                                    <td>
+                                        <t
+                                            t-esc="sum([line.amount*line.quantity*line.rate/100.0 for batch in o.run_ids for line in batch.slip_ids.mapped('line_ids') if line.category_id.code in ['DEDUCT', 'EECONT']])"
+                                            t-options="{'widget': 'float', 'precision': 2}"
+                                        />
+                                    </td>
+                                    <td>
+                                        <t
+                                            t-esc="sum([line.amount*line.quantity*line.rate/100.0 for batch in o.run_ids for line in batch.slip_ids.mapped('line_ids') if line.category_id.code == 'NET'])"
+                                            t-options="{'widget': 'float', 'precision': 2}"
+                                        />
+                                    </td>
+                                </tr>
+                            </tfoot>
+                        </table>
+                    </div>
+                </t>
+            </t>
+        </t>
+    </template>
+
+    <template id="payroll_register_batch">
+        <h2><span t-field="batch.name" /></h2>
+        <table class="table table-sm table-striped table-bordered text-right">
+            <thead class="text-center">
+                <tr>
+                    <th scope="col">Name</th>
+                    <th scope="col">Salary</th>
+                    <th scope="col">Overtime</th>
+                    <th scope="col">Allowance</th>
+                    <th scope="col">Gross</th>
+                    <th scope="col">Taxable Gross</th>
+                    <th scope="col">Federal Income Tax</th>
+                    <th scope="col"><t t-raw="payroll_tax_heading" /></th>
+                    <th scope="col">Deductions</th>
+                    <th scope="col">Net</th>
+                </tr>
+            </thead>
+            <tbody>
+                <t
+                    t-foreach="batch.slip_ids.sorted(key=lambda s: s.number)"
+                    t-as="slip"
+                >
+                    <tr>
+                        <t t-call="payroll_register_report.payroll_register_payslip" />
+                    </tr>
+                </t>
+            </tbody>
+            <tfoot style="font-weight: bold;">
+                <tr>
+                    <td class="text-left" />
+                    <td>
+                        <t
+                            t-esc="sum([line.amount*line.quantity*line.rate/100.0 for line in batch.slip_ids.mapped('line_ids') if line.category_id.code == 'BASIC'])"
+                            t-options="{'widget': 'float', 'precision': 2}"
+                        />
+                    </td>
+                    <td>
+                        <t
+                            t-esc="sum([line.amount*line.quantity*line.rate/100.0 for line in batch.slip_ids.mapped('line_ids') if line.category_id.code == 'OVERTM'])"
+                            t-options="{'widget': 'float', 'precision': 2}"
+                        />
+                    </td>
+                    <td>
+                        <t
+                            t-esc="sum([line.amount*line.quantity*line.rate/100.0 for line in batch.slip_ids.mapped('line_ids') if line.category_id.code == 'ALLWNC'])"
+                            t-options="{'widget': 'float', 'precision': 2}"
+                        />
+                    </td>
+                    <td>
+                        <t
+                            t-esc="sum([line.amount*line.quantity*line.rate/100.0 for line in batch.slip_ids.mapped('line_ids') if line.category_id.code == 'GROSS'])"
+                            t-options="{'widget': 'float', 'precision': 2}"
+                        />
+                    </td>
+                    <td>
+                        <t
+                            t-esc="sum([line.amount*line.quantity*line.rate/100.0 for line in batch.slip_ids.mapped('line_ids') if line.category_id.code == 'TAXBLE'])"
+                            t-options="{'widget': 'float', 'precision': 2}"
+                        />
+                    </td>
+                    <td>
+                        <t
+                            t-esc="sum([line.amount*line.quantity*line.rate/100.0 for line in batch.slip_ids.mapped('line_ids') if line.category_id.code == 'INCTAX'])"
+                            t-options="{'widget': 'float', 'precision': 2}"
+                        />
+                    </td>
+                    <td>
+                        <t
+                            t-esc="sum([line.amount*line.quantity*line.rate/100.0 for line in batch.slip_ids.mapped('line_ids') if line.category_id.code == 'PRLTAX'])"
+                            t-options="{'widget': 'float', 'precision': 2}"
+                        />
+                    </td>
+                    <td>
+                        <t
+                            t-esc="sum([line.amount*line.quantity*line.rate/100.0 for line in batch.slip_ids.mapped('line_ids') if line.category_id.code in ['DEDUCT', 'EECONT']])"
+                            t-options="{'widget': 'float', 'precision': 2}"
+                        />
+                    </td>
+                    <td>
+                        <t
+                            t-esc="sum([line.amount*line.quantity*line.rate/100.0 for line in batch.slip_ids.mapped('line_ids') if line.category_id.code == 'NET'])"
+                            t-options="{'widget': 'float', 'precision': 2}"
+                        />
+                    </td>
+                </tr>
+            </tfoot>
+        </table>
+    </template>
+
+    <template id="payroll_register_payslip">
+        <t t-set="salary" t-value="0" />
+        <t t-set="ot" t-value="0" />
+        <t t-set="allow" t-value="0" />
+        <t t-set="gross" t-value="0" />
+        <t t-set="grosstxbl" t-value="0" />
+        <t t-set="fit" t-value="0" />
+        <t t-set="prltax" t-value="0" />
+        <t t-set="deduct" t-value="0" />
+        <t t-set="net" t-value="0" />
+        <t t-foreach="slip.line_ids" t-as="line">
+            <t t-if="line.category_id.code == 'BASIC'">
+                <t t-set="salary" t-value="salary+(line.amount*line.rate/100.0)" />
+            </t>
+            <t t-elif="line.category_id.code == 'OVERTM'">
+                <t t-set="ot" t-value="ot+(line.amount*line.rate/100.0)" />
+            </t>
+            <t t-elif="line.category_id.code == 'ALLWNC'">
+                <t t-set="allow" t-value="allow+(line.amount*line.rate/100.0)" />
+            </t>
+            <t t-elif="line.category_id.code == 'GROSS'">
+                <t t-set="gross" t-value="gross+(line.amount*line.rate/100.0)" />
+            </t>
+            <t t-elif="line.category_id.code == 'TAXBLE'">
+                <t
+                    t-set="grosstxbl"
+                    t-value="grosstxbl+(line.amount*line.rate/100.0)"
+                />
+            </t>
+            <t t-elif="line.category_id.code == 'INCTAX'">
+                <t t-set="fit" t-value="fit+(line.amount*line.rate/100.0)" />
+            </t>
+            <t t-elif="line.category_id.code == 'PRLTAX'">
+                <t t-set="prltax" t-value="prltax+(line.amount*line.rate/100.0)" />
+            </t>
+            <t t-elif="line.category_id.code == 'DEDUCT'">
+                <t t-set="deduct" t-value="deduct+(line.amount*line.rate/100.0)" />
+            </t>
+            <t t-elif="line.category_id.code == 'NET'">
+                <t t-set="net" t-value="net+(line.amount*line.rate/100.0)" />
+            </t>
+        </t>
+        <td class="w-25" style="text-align: left;">
+            <span t-field="slip.employee_id.name" />
+        </td>
+        <td><t t-esc="salary" t-options="{'widget': 'float', 'precision': 2}" /></td>
+        <td><t t-esc="ot" t-options="{'widget': 'float', 'precision': 2}" /></td>
+        <td><t t-esc="allow" t-options="{'widget': 'float', 'precision': 2}" /></td>
+        <td><t t-esc="gross" t-options="{'widget': 'float', 'precision': 2}" /></td>
+        <td><t t-esc="grosstxbl" t-options="{'widget': 'float', 'precision': 2}" /></td>
+        <td><t t-esc="fit" t-options="{'widget': 'float', 'precision': 2}" /></td>
+        <td><t t-esc="prltax" t-options="{'widget': 'float', 'precision': 2}" /></td>
+        <td><t t-esc="deduct" t-options="{'widget': 'float', 'precision': 2}" /></td>
+        <td><t t-esc="net" t-options="{'widget': 'float', 'precision': 2}" /></td>
+    </template>
+
+</odoo>
diff --git a/payroll_register_report/static/description/icon.png b/payroll_register_report/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/payroll_register_report/static/description/icon.png differ
diff --git a/payroll_register_report/static/description/index.html b/payroll_register_report/static/description/index.html
new file mode 100644
index 00000000..48f25177
--- /dev/null
+++ b/payroll_register_report/static/description/index.html
@@ -0,0 +1,416 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Payroll Register Report</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="payroll-register-report">
+<h1 class="title">Payroll Register Report</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:e21ed12091680285b5aa263e9539afbc6d7e112c5d244c63d1faa7ff67e885ef
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_register_report"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<p>This module prints a payroll register by batch run. Each batch run prints a summary of each payslip by salary rule category. One per line.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-4">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20payroll_register_report%0Aversion:%2014.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="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>TREVI Software</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-4">Other credits</a></h2>
+<ul class="simple">
+<li>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/payroll_register_report">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/payroll_register_report/static/src/img/main_screenshot.png b/payroll_register_report/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/payroll_register_report/static/src/img/main_screenshot.png differ
diff --git a/res_currency_denomination/README.rst b/res_currency_denomination/README.rst
new file mode 100644
index 00000000..72b81d77
--- /dev/null
+++ b/res_currency_denomination/README.rst
@@ -0,0 +1,61 @@
+======================
+Currency Denominations
+======================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:5b8881622b9510856b88fab5c7df891294868a36ed5eb63e06dfea9e753d5ac2
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/res_currency_denomination
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+This module provides an extensible method for denoting the denominations of individual currencies.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20res_currency_denomination%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+* Michael Telahun Makonnen
+
+Other credits
+~~~~~~~~~~~~~
+
+* Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/res_currency_denomination>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/res_currency_denomination/__init__.py b/res_currency_denomination/__init__.py
new file mode 100644
index 00000000..ce7bb1be
--- /dev/null
+++ b/res_currency_denomination/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2014 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
diff --git a/res_currency_denomination/__manifest__.py b/res_currency_denomination/__manifest__.py
new file mode 100644
index 00000000..484a65a6
--- /dev/null
+++ b/res_currency_denomination/__manifest__.py
@@ -0,0 +1,22 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2014 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Currency Denominations",
+    "category": "Finance",
+    "author": "TREVI Software, Michael Telahun Makonnen",
+    "license": "AGPL-3",
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "images": ["static/src/img/main_screenshot.png"],
+    "version": "15.0.1.0.0",
+    "depends": [
+        "base",
+    ],
+    "data": [
+        "security/ir.model.access.csv",
+        "data/res_currency_denomination.xml",
+        "views/res_currency_view.xml",
+    ],
+    "installable": True,
+}
diff --git a/res_currency_denomination/data/res_currency_denomination.xml b/res_currency_denomination/data/res_currency_denomination.xml
new file mode 100644
index 00000000..8df56894
--- /dev/null
+++ b/res_currency_denomination/data/res_currency_denomination.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <data noupdate="1">
+
+        <!-- Euros -->
+        <record id="01eucent" model="res.currency.denomination">
+            <field name="currency_id" ref="base.EUR" />
+            <field name="value">0.01</field>
+            <field name="ratio" eval="1.0/100.0" />
+        </record>
+        <record id="02eucent" model="res.currency.denomination">
+            <field name="currency_id" ref="base.EUR" />
+            <field name="value">0.02</field>
+            <field name="ratio" eval="2.0/100.0" />
+        </record>
+        <record id="05eucent" model="res.currency.denomination">
+            <field name="currency_id" ref="base.EUR" />
+            <field name="value">0.05</field>
+            <field name="ratio" eval="5.0/100.0" />
+        </record>
+        <record id="10eucent" model="res.currency.denomination">
+            <field name="currency_id" ref="base.EUR" />
+            <field name="value">0.10</field>
+            <field name="ratio" eval="10.0/100.0" />
+        </record>
+        <record id="20eucent" model="res.currency.denomination">
+            <field name="currency_id" ref="base.EUR" />
+            <field name="value">0.20</field>
+            <field name="ratio" eval="20.0/100.0" />
+        </record>
+        <record id="50eucent" model="res.currency.denomination">
+            <field name="currency_id" ref="base.USD" />
+            <field name="value">0.50</field>
+            <field name="ratio" eval="50.0/100.0" />
+        </record>
+        <record id="01euro" model="res.currency.denomination">
+            <field name="currency_id" ref="base.EUR" />
+            <field name="value">1</field>
+            <field name="ratio" eval="1" />
+        </record>
+        <record id="02euro" model="res.currency.denomination">
+            <field name="currency_id" ref="base.EUR" />
+            <field name="value">2</field>
+            <field name="ratio" eval="2" />
+        </record>
+        <record id="05euro" model="res.currency.denomination">
+            <field name="currency_id" ref="base.EUR" />
+            <field name="value">5</field>
+            <field name="ratio" eval="5" />
+        </record>
+        <record id="10euro" model="res.currency.denomination">
+            <field name="currency_id" ref="base.EUR" />
+            <field name="value">10</field>
+            <field name="ratio" eval="10" />
+        </record>
+        <record id="20euro" model="res.currency.denomination">
+            <field name="currency_id" ref="base.EUR" />
+            <field name="value">20</field>
+            <field name="ratio" eval="20" />
+        </record>
+        <record id="50euro" model="res.currency.denomination">
+            <field name="currency_id" ref="base.EUR" />
+            <field name="value">50</field>
+            <field name="ratio" eval="50" />
+        </record>
+        <record id="100euro" model="res.currency.denomination">
+            <field name="currency_id" ref="base.EUR" />
+            <field name="value">100</field>
+            <field name="ratio" eval="100" />
+        </record>
+        <record id="200euro" model="res.currency.denomination">
+            <field name="currency_id" ref="base.EUR" />
+            <field name="value">200</field>
+            <field name="ratio" eval="200" />
+        </record>
+        <record id="500euro" model="res.currency.denomination">
+            <field name="currency_id" ref="base.EUR" />
+            <field name="value">500</field>
+            <field name="ratio" eval="500" />
+        </record>
+
+        <!-- US Dollars -->
+        <record id="01uscent" model="res.currency.denomination">
+            <field name="currency_id" ref="base.USD" />
+            <field name="value">0.01</field>
+            <field name="ratio" eval="1.0/100.0" />
+        </record>
+        <record id="05uscent" model="res.currency.denomination">
+            <field name="currency_id" ref="base.USD" />
+            <field name="value">0.05</field>
+            <field name="ratio" eval="5.0/100.0" />
+        </record>
+        <record id="10uscent" model="res.currency.denomination">
+            <field name="currency_id" ref="base.USD" />
+            <field name="value">0.10</field>
+            <field name="ratio" eval="10.0/100.0" />
+        </record>
+        <record id="25uscent" model="res.currency.denomination">
+            <field name="currency_id" ref="base.USD" />
+            <field name="value">0.25</field>
+            <field name="ratio" eval="25.0/100.0" />
+        </record>
+        <record id="50uscent" model="res.currency.denomination">
+            <field name="currency_id" ref="base.USD" />
+            <field name="value">0.50</field>
+            <field name="ratio" eval="50.0/100.0" />
+        </record>
+        <record id="01usd" model="res.currency.denomination">
+            <field name="currency_id" ref="base.USD" />
+            <field name="value">1</field>
+            <field name="ratio" eval="1" />
+        </record>
+        <record id="05usd" model="res.currency.denomination">
+            <field name="currency_id" ref="base.USD" />
+            <field name="value">5</field>
+            <field name="ratio" eval="5" />
+        </record>
+        <record id="10usd" model="res.currency.denomination">
+            <field name="currency_id" ref="base.USD" />
+            <field name="value">10</field>
+            <field name="ratio" eval="10" />
+        </record>
+        <record id="20usd" model="res.currency.denomination">
+            <field name="currency_id" ref="base.USD" />
+            <field name="value">20</field>
+            <field name="ratio" eval="20" />
+        </record>
+        <record id="50usd" model="res.currency.denomination">
+            <field name="currency_id" ref="base.USD" />
+            <field name="value">50</field>
+            <field name="ratio" eval="50" />
+        </record>
+        <record id="100usd" model="res.currency.denomination">
+            <field name="currency_id" ref="base.USD" />
+            <field name="value">100</field>
+            <field name="ratio" eval="100" />
+        </record>
+    </data>
+</odoo>
diff --git a/res_currency_denomination/i18n/res_currency_denomination.pot b/res_currency_denomination/i18n/res_currency_denomination.pot
new file mode 100644
index 00000000..f2f427e7
--- /dev/null
+++ b/res_currency_denomination/i18n/res_currency_denomination.pot
@@ -0,0 +1,89 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* res_currency_denomination
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: res_currency_denomination
+#: model:ir.model.fields,field_description:res_currency_denomination.field_res_currency_denomination__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: res_currency_denomination
+#: model:ir.model.fields,field_description:res_currency_denomination.field_res_currency_denomination__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: res_currency_denomination
+#: model:ir.model,name:res_currency_denomination.model_res_currency
+#: model:ir.model.fields,field_description:res_currency_denomination.field_res_currency_denomination__currency_id
+msgid "Currency"
+msgstr ""
+
+#. module: res_currency_denomination
+#: model:ir.model,name:res_currency_denomination.model_res_currency_denomination
+msgid "Currency Denomination"
+msgstr ""
+
+#. module: res_currency_denomination
+#: model_terms:ir.ui.view,arch_db:res_currency_denomination.view_currency_form
+msgid "Currency Denominations"
+msgstr ""
+
+#. module: res_currency_denomination
+#: model:ir.model.fields,field_description:res_currency_denomination.field_res_currency__denomination_ids
+#: model_terms:ir.ui.view,arch_db:res_currency_denomination.view_currency_form
+msgid "Denominations"
+msgstr ""
+
+#. module: res_currency_denomination
+#: model:ir.model.fields,field_description:res_currency_denomination.field_res_currency__display_name
+#: model:ir.model.fields,field_description:res_currency_denomination.field_res_currency_denomination__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: res_currency_denomination
+#: model:ir.model.fields,field_description:res_currency_denomination.field_res_currency__id
+#: model:ir.model.fields,field_description:res_currency_denomination.field_res_currency_denomination__id
+msgid "ID"
+msgstr ""
+
+#. module: res_currency_denomination
+#: model:ir.model.fields,field_description:res_currency_denomination.field_res_currency____last_update
+#: model:ir.model.fields,field_description:res_currency_denomination.field_res_currency_denomination____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: res_currency_denomination
+#: model:ir.model.fields,field_description:res_currency_denomination.field_res_currency_denomination__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: res_currency_denomination
+#: model:ir.model.fields,field_description:res_currency_denomination.field_res_currency_denomination__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: res_currency_denomination
+#: model:ir.model.fields,field_description:res_currency_denomination.field_res_currency_denomination__ratio
+msgid "Ratio"
+msgstr ""
+
+#. module: res_currency_denomination
+#: model:ir.model.fields,help:res_currency_denomination.field_res_currency_denomination__ratio
+msgid "Ratio of this denomination to the smallest integral denomination."
+msgstr ""
+
+#. module: res_currency_denomination
+#: model:ir.model.fields,field_description:res_currency_denomination.field_res_currency_denomination__value
+msgid "Value"
+msgstr ""
diff --git a/res_currency_denomination/models/__init__.py b/res_currency_denomination/models/__init__.py
new file mode 100644
index 00000000..6bafbc5d
--- /dev/null
+++ b/res_currency_denomination/models/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2014 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import res_currency
diff --git a/res_currency_denomination/models/res_currency.py b/res_currency_denomination/models/res_currency.py
new file mode 100644
index 00000000..6cf67aa1
--- /dev/null
+++ b/res_currency_denomination/models/res_currency.py
@@ -0,0 +1,128 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2014 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+import math
+
+from odoo import fields, models
+from odoo.tools.float_utils import float_compare
+
+
+class ResCurrencyDenomination(models.Model):
+
+    _name = "res.currency.denomination"
+    _description = "Currency Denomination"
+    _rec_name = "value"
+
+    currency_id = fields.Many2one(
+        string="Currency",
+        comodel_name="res.currency",
+        required=True,
+        default=lambda self: self.env.company.currency_id,
+    )
+    ratio = fields.Float(
+        help="Ratio of this denomination to the smallest integral denomination."
+    )
+    value = fields.Float(digits=(12, 6))
+
+
+class ResCurrency(models.Model):
+
+    _inherit = "res.currency"
+
+    denomination_ids = fields.One2many(
+        string="Denominations",
+        comodel_name="res.currency.denomination",
+        inverse_name="currency_id",
+    )
+
+    def get_denomination_list(self):
+
+        self.ensure_one()
+        denominations = []
+        smallest_note = 1
+
+        # Get denominations for payroll currency
+        # Arrange in order from largest value to smallest.
+        #
+        for denom in self.denomination_ids:
+            if float_compare(denom.ratio, 1.00, precision_digits=2) == 0:
+                smallest_note = denom.value
+
+            if len(denominations) == 0:
+                denominations.append(denom.value)
+                continue
+
+            idx = 0
+            last_idx = len(denominations) - 1
+            for preexist_val in denominations:
+                if denom.value > preexist_val:
+                    denominations.insert(idx, denom.value)
+                    break
+                elif idx == last_idx:
+                    denominations.append(denom.value)
+                    break
+                idx += 1
+        return denominations, smallest_note
+
+    def get_denominations_from_amount(self, amount):
+        self.ensure_one()
+
+        # Get denominations for currency
+        # Arrange in order from largest value to smallest.
+        #
+        denominations = []
+        smallest_note = 1
+
+        for currency in self:
+            for denom in currency.denomination_ids:
+                if float_compare(denom.ratio, 1.00, precision_digits=2) == 0:
+                    smallest_note = denom.value
+
+                if len(denominations) == 0:
+                    denominations.append(denom.value)
+                    continue
+
+                idx = 0
+                last_idx = len(denominations) - 1
+                for preexist_val in denominations:
+                    if denom.value > preexist_val:
+                        denominations.insert(idx, denom.value)
+                        break
+                    elif idx == last_idx:
+                        denominations.append(denom.value)
+                        break
+                    idx += 1
+
+        denom_qty_list = dict.fromkeys(denominations, 0)
+        cents_factor = float(smallest_note) / (
+            len(denominations) and denominations[-1] or 1
+        )
+        cents, notes = math.modf(amount)
+
+        notes = int(notes)
+        # XXX - rounding to 4 decimal places should work for most currencies... I hope
+        cents = int(round(cents, 4) * cents_factor)
+        for denom in denominations:
+            if notes >= denom:
+                denom_qty_list[denom] += int(notes / denom)
+                notes = (notes > 0) and (notes % denom) or 0
+
+            if notes == 0 and cents >= (denom * cents_factor):
+                cooked_denom = int(denom * cents_factor)
+                if cents >= cooked_denom:
+                    denom_qty_list[denom] += cents / cooked_denom
+                elif denom == denominations[-1]:
+                    denom_qty_list[denom] += cents / cents_factor
+                    cents = 0
+                cents = cents % cooked_denom
+
+        res = []
+        for k, v in denom_qty_list.items():
+            vals = {
+                "name": k,
+                "qty": v,
+            }
+            res.append(vals)
+
+        return res
diff --git a/res_currency_denomination/readme/CREDITS.rst b/res_currency_denomination/readme/CREDITS.rst
new file mode 100644
index 00000000..d264bc7e
--- /dev/null
+++ b/res_currency_denomination/readme/CREDITS.rst
@@ -0,0 +1 @@
+* Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/res_currency_denomination/readme/DESCRIPTION.rst b/res_currency_denomination/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..cc88cca2
--- /dev/null
+++ b/res_currency_denomination/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+This module provides an extensible method for denoting the denominations of individual currencies.
diff --git a/res_currency_denomination/security/ir.model.access.csv b/res_currency_denomination/security/ir.model.access.csv
new file mode 100644
index 00000000..e2a3d77e
--- /dev/null
+++ b/res_currency_denomination/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_currency_denomination_user,access_currency_denomination,model_res_currency_denomination,base.group_user,1,0,0,0
+access_currency_denomination_mgr,access_currency_denomination,model_res_currency_denomination,base.group_multi_currency,1,1,1,1
diff --git a/res_currency_denomination/static/description/icon.png b/res_currency_denomination/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/res_currency_denomination/static/description/icon.png differ
diff --git a/res_currency_denomination/static/description/index.html b/res_currency_denomination/static/description/index.html
new file mode 100644
index 00000000..167679fe
--- /dev/null
+++ b/res_currency_denomination/static/description/index.html
@@ -0,0 +1,417 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Currency Denominations</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="currency-denominations">
+<h1 class="title">Currency Denominations</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:5b8881622b9510856b88fab5c7df891294868a36ed5eb63e06dfea9e753d5ac2
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/res_currency_denomination"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<p>This module provides an extensible method for denoting the denominations of individual currencies.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-4">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20res_currency_denomination%0Aversion:%2014.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="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>TREVI Software</li>
+<li>Michael Telahun Makonnen</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-4">Other credits</a></h2>
+<ul class="simple">
+<li>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/res_currency_denomination">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/res_currency_denomination/static/src/img/main_screenshot.png b/res_currency_denomination/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/res_currency_denomination/static/src/img/main_screenshot.png differ
diff --git a/res_currency_denomination/views/res_currency_view.xml b/res_currency_denomination/views/res_currency_view.xml
new file mode 100644
index 00000000..0995ff6c
--- /dev/null
+++ b/res_currency_denomination/views/res_currency_view.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+
+        <record id="view_currency_form" model="ir.ui.view">
+            <field name="name">res.currency.form.denomination</field>
+            <field name="model">res.currency</field>
+            <field name="inherit_id" ref="base.view_currency_form" />
+            <field name="arch" type="xml">
+                <xpath expr="//sheet/group[1]" position="before">
+                    <group string="Denominations">
+                        <field name="denomination_ids" nolabel="1">
+                            <tree string="Currency Denominations" editable="bottom">
+                                <field name="value" />
+                                <field name="ratio" />
+                            </tree>
+                        </field>
+                    </group>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/resource_schedule/README.rst b/resource_schedule/README.rst
new file mode 100644
index 00000000..74027afc
--- /dev/null
+++ b/resource_schedule/README.rst
@@ -0,0 +1,73 @@
+=========================
+Employee Shift Scheduling
+=========================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:2b3927874bab00c9713a5b7d8e54d881091c2f1a7bd24ad77617bc3aeeab9589
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/resource_schedule
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+Easily create, manage, and track employee shift planning.
+
+#. Work Detail Templates - templates describe a shift for one day. For example: 8 a.m to 5 p.m.
+#. Work Detail - the Odoo record for describing a day in a Work Time. These records can get their settings from a Work Detail Template.
+#. Work Time - the Odoo record for describing a weekly schedule.
+#. Shift Schedule - the actual times that an employee is scheduled to work on a specific day.
+#. Schedule Area - the area the employee is assigned to for a shift. For example, in a hotel with multiple dinning rooms all serving staff may have the same shifts but be assigned to different dinning rooms.
+#. Schedule Group - schedule groups allow an organization to split employees into groups. Schedule groups can have their own work detail templates and managers who are responsible for managing shifts.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Known issues / Roadmap
+======================
+
+* When demo data is enabled and the module is updated you may encounter and error the the demo data failed to install. This error may safely be ignored.
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20resource_schedule%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+* Michael Telahun Makonnen
+
+Other credits
+~~~~~~~~~~~~~
+
+* Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/resource_schedule>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/resource_schedule/__init__.py b/resource_schedule/__init__.py
new file mode 100644
index 00000000..63868e3e
--- /dev/null
+++ b/resource_schedule/__init__.py
@@ -0,0 +1,6 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
+from . import wizard
diff --git a/resource_schedule/__manifest__.py b/resource_schedule/__manifest__.py
new file mode 100644
index 00000000..c7cd8f58
--- /dev/null
+++ b/resource_schedule/__manifest__.py
@@ -0,0 +1,51 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Employee Shift Scheduling",
+    "summary": "Easily create, manage, and track employee shift planning.",
+    "version": "15.0.1.0.0",
+    "category": "Human Resources",
+    "license": "AGPL-3",
+    "author": "TREVI Software, Michael Telahun Makonnen",
+    "images": ["static/src/img/main_screenshot.png"],
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "hr",
+        "hr_attendance",
+        "hr_contract",
+        "hr_holidays",
+        "resource",
+        "web_timeline",
+    ],
+    "data": [
+        "data/ir_module_category.xml",
+        "data/resource_calendar_data.xml",
+        "data/hr_schedule_cron.xml",
+        "security/groups.xml",
+        "security/ir.model.access.csv",
+        # 'security/ir_rule.xml',
+        # 'wizard/restday_view.xml',
+        "views/menus.xml",
+        "wizard/generate_schedules_view.xml",
+        "wizard/validate_schedule_view.xml",
+        "views/hr_employee_view.xml",
+        "views/hr_contract_view.xml",
+        "views/hr_job_view.xml",
+        "views/resource_calendar_view.xml",
+        "views/resource_calendar_attendance_template_view.xml",
+        "views/resource_calendar_attendance_view.xml",
+        "views/resource_calendar_weekday_view.xml",
+        "views/resource_resource_view.xml",
+        "views/resource_schedule_area_view.xml",
+        "views/resource_schedule_group_view.xml",
+        "views/resource_schedule_shift_view.xml",
+        "views/resource_schedule_team_view.xml",
+        "views/res_config_settings_view.xml",
+    ],
+    "demo": [
+        "data/resource_calendar_demo.xml",
+    ],
+    "installable": True,
+}
diff --git a/resource_schedule/data/hr_schedule_cron.xml b/resource_schedule/data/hr_schedule_cron.xml
new file mode 100644
index 00000000..251a98d3
--- /dev/null
+++ b/resource_schedule/data/hr_schedule_cron.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+
+        <!-- Create tentative schedule for all employee en-masse -->
+
+        <record model="ir.cron" id="mass_schedule_cron">
+            <field name="name">Schedule: Mass Scheduling</field>
+            <field name="model_id" ref="model_resource_schedule_shift" />
+            <field name="type">ir.actions.server</field>
+            <field name="state">code</field>
+            <field name="code">model.create_mass_schedule()</field>
+            <field
+                name="nextcall"
+                eval="(DateTime.now() + timedelta(days= +(7-DateTime.now().weekday())))"
+            />
+            <field name="interval_number">2</field>
+            <field name="interval_type">weeks</field>
+            <field name="numbercall">-1</field>
+            <field name="active" eval="False" />
+        </record>
+
+        <!-- Auto-punch attendance -->
+
+        <record model="ir.cron" id="autopunch_schedule_cron">
+            <field name="name">Schedule: Auto-punch</field>
+            <field name="model_id" ref="model_resource_schedule_shift" />
+            <field name="type">ir.actions.server</field>
+            <field name="state">code</field>
+            <field name="code">model.autopunch_shifts()</field>
+            <field name="nextcall" eval="(DateTime.now() + timedelta(minutes=30))" />
+            <field name="interval_number">30</field>
+            <field name="interval_type">minutes</field>
+            <field name="numbercall">-1</field>
+            <field name="active" eval="True" />
+        </record>
+
+        <!-- Automatically punch out attendances -->
+
+        <record model="ir.cron" id="auto_clockout_schedule_cron">
+            <field
+                name="name"
+            >Schedule: Automatically clock-out after max. shift length</field>
+            <field name="model_id" ref="hr_attendance.model_hr_attendance" />
+            <field name="type">ir.actions.server</field>
+            <field name="state">code</field>
+            <field name="code">model.auto_punchout()</field>
+            <field name="nextcall" eval="(DateTime.now() + timedelta(minutes=15))" />
+            <field name="interval_number">30</field>
+            <field name="interval_type">minutes</field>
+            <field name="numbercall">-1</field>
+            <field name="active" eval="True" />
+        </record>
+
+    </data>
+</odoo>
diff --git a/resource_schedule/data/ir_module_category.xml b/resource_schedule/data/ir_module_category.xml
new file mode 100644
index 00000000..e2512d13
--- /dev/null
+++ b/resource_schedule/data/ir_module_category.xml
@@ -0,0 +1,6 @@
+<odoo>
+    <record id="module_category_scheduling" model="ir.module.category">
+        <field name="name">Scheduling</field>
+        <field name="sequence">20</field>
+    </record>
+</odoo>
diff --git a/resource_schedule/data/resource_calendar_data.xml b/resource_schedule/data/resource_calendar_data.xml
new file mode 100644
index 00000000..0199d782
--- /dev/null
+++ b/resource_schedule/data/resource_calendar_data.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data noupdate="1">
+
+        <!-- Template for default workdetails used in upstream Odoo -->
+        <record
+            id="attendance_template_0"
+            model="resource.calendar.attendance.template"
+        >
+            <field name="name">Morning</field>
+            <field name="hour_from">8</field>
+            <field name="hour_to">12</field>
+            <field name="day_period">morning</field>
+        </record>
+        <record
+            id="attendance_template_1"
+            model="resource.calendar.attendance.template"
+        >
+            <field name="name">Afternoon</field>
+            <field name="hour_from">13</field>
+            <field name="hour_to">17</field>
+            <field name="day_period">afternoon</field>
+        </record>
+
+        <!-- resource.calendar.weekday: Week days -->
+        <record id="wd_mon" model="resource.calendar.weekday">
+            <field name="name">Monday</field>
+            <field name="dayofweek">0</field>
+        </record>
+
+        <record id="wd_tue" model="resource.calendar.weekday">
+            <field name="name">Tuesday</field>
+            <field name="dayofweek">1</field>
+        </record>
+
+        <record id="wd_wed" model="resource.calendar.weekday">
+            <field name="name">Wednesday</field>
+            <field name="dayofweek">2</field>
+        </record>
+
+        <record id="wd_thu" model="resource.calendar.weekday">
+            <field name="name">Thursday</field>
+            <field name="dayofweek">3</field>
+        </record>
+
+        <record id="wd_fri" model="resource.calendar.weekday">
+            <field name="name">Friday</field>
+            <field name="dayofweek">4</field>
+        </record>
+
+        <record id="wd_sat" model="resource.calendar.weekday">
+            <field name="name">Saturday</field>
+            <field name="dayofweek">5</field>
+        </record>
+
+        <record id="wd_sun" model="resource.calendar.weekday">
+            <field name="name">Sunday</field>
+            <field name="dayofweek">6</field>
+        </record>
+
+        <!-- Default Settings -->
+
+        <function model="res.company" name="_update_data_resource_calendar" eval="[]" />
+
+        <function
+            model="ir.config_parameter"
+            name="set_param"
+            eval="(
+            'resource_schedule.max_shift_length', 15
+        )"
+        />
+    </data>
+</odoo>
diff --git a/resource_schedule/data/resource_calendar_demo.xml b/resource_schedule/data/resource_calendar_demo.xml
new file mode 100644
index 00000000..5f20b33b
--- /dev/null
+++ b/resource_schedule/data/resource_calendar_demo.xml
@@ -0,0 +1,301 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data noupdate="1">
+
+        <!-- Scheduling Areas -->
+        <record id="schedule_area0" model="resource.schedule.area">
+            <field name="name">Main Dining Room</field>
+            <field name="color" eval="1" />
+        </record>
+        <record id="schedule_area1" model="resource.schedule.area">
+            <field name="name">Pool-side Bar</field>
+            <field name="color" eval="3" />
+        </record>
+        <record id="schedule_area2" model="resource.schedule.area">
+            <field name="name">Lobby</field>
+            <field name="color" eval="5" />
+        </record>
+
+        <!-- Scheduling Groups -->
+        <record id="schedule_group0" model="resource.schedule.group">
+            <field name="name">Kitchen</field>
+        </record>
+        <record id="schedule_group1" model="resource.schedule.group">
+            <field name="name">Housekeeping</field>
+        </record>
+        <record id="schedule_group2" model="resource.schedule.group">
+            <field name="name">Reception</field>
+        </record>
+        <record id="schedule_group3" model="resource.schedule.group">
+            <field name="name">Office</field>
+        </record>
+
+        <!-- Template for some possible workdetails -->
+
+        <record
+            id="attendance_template_demo0"
+            model="resource.calendar.attendance.template"
+        >
+            <field name="name">Weekday Hours</field>
+            <field name="hour_from">8</field>
+            <field name="hour_to">17</field>
+            <field name="day_period">8day</field>
+            <field name="autodeduct_break" eval="True" />
+            <field name="break_minutes">60</field>
+            <field
+                name="schedule_group_ids"
+                eval="[(6, 0, [ref('schedule_group3')])]"
+            />
+        </record>
+
+        <record
+            id="attendance_template_demo1"
+            model="resource.calendar.attendance.template"
+        >
+            <field name="name">Half-day Saturday</field>
+            <field name="hour_from">8</field>
+            <field name="hour_to">12.5</field>
+            <field name="day_period">morning</field>
+            <field
+                name="schedule_group_ids"
+                eval="[(6, 0, [ref('schedule_group3')])]"
+            />
+        </record>
+
+        <record
+            id="attendance_template_demo3"
+            model="resource.calendar.attendance.template"
+        >
+            <field name="name">Morning Reception</field>
+            <field name="hour_from">6</field>
+            <field name="hour_to">14</field>
+            <field name="day_period">morning</field>
+            <field
+                name="schedule_group_ids"
+                eval="[(6, 0, [ref('schedule_group2')])]"
+            />
+            <field name="default_area_id" ref="schedule_area2" />
+        </record>
+
+        <record
+            id="attendance_template_demo4"
+            model="resource.calendar.attendance.template"
+        >
+            <field name="name">Afternooon Reception</field>
+            <field name="hour_from">10</field>
+            <field name="hour_to">18</field>
+            <field name="day_period">afternoon</field>
+            <field
+                name="schedule_group_ids"
+                eval="[(6, 0, [ref('schedule_group2')])]"
+            />
+            <field name="default_area_id" ref="schedule_area2" />
+        </record>
+
+        <record
+            id="attendance_template_demo2"
+            model="resource.calendar.attendance.template"
+        >
+            <field name="name">Evening Reception</field>
+            <field name="hour_from">18</field>
+            <field name="hour_to">23</field>
+            <field name="day_period">evening</field>
+            <field
+                name="schedule_group_ids"
+                eval="[(6, 0, [ref('schedule_group2')])]"
+            />
+            <field name="default_area_id" ref="schedule_area2" />
+        </record>
+
+        <record
+            id="attendance_template_demo5"
+            model="resource.calendar.attendance.template"
+        >
+            <field name="name">Room Cleaning</field>
+            <field name="hour_from">6</field>
+            <field name="hour_to">14</field>
+            <field name="day_period">morning</field>
+            <field
+                name="schedule_group_ids"
+                eval="[(6, 0, [ref('schedule_group1')])]"
+            />
+        </record>
+
+        <record
+            id="attendance_template_demo6"
+            model="resource.calendar.attendance.template"
+        >
+            <field name="name">Common Area Cleaning</field>
+            <field name="hour_from">6</field>
+            <field name="hour_to">9</field>
+            <field name="day_period">morning</field>
+            <field
+                name="schedule_group_ids"
+                eval="[(6, 0, [ref('schedule_group1')])]"
+            />
+        </record>
+
+        <record
+            id="attendance_template_demo7"
+            model="resource.calendar.attendance.template"
+        >
+            <field name="name">Breakfast / Lunch</field>
+            <field name="hour_from">6</field>
+            <field name="hour_to">15</field>
+            <field name="day_period">morning</field>
+            <field
+                name="schedule_group_ids"
+                eval="[(6, 0, [ref('schedule_group0')])]"
+            />
+        </record>
+
+        <record
+            id="attendance_template_demo8"
+            model="resource.calendar.attendance.template"
+        >
+            <field name="name">Dinner</field>
+            <field name="hour_from">15</field>
+            <field name="hour_to">22</field>
+            <field name="day_period">afternoon</field>
+            <field
+                name="schedule_group_ids"
+                eval="[(6, 0, [ref('schedule_group0')])]"
+            />
+        </record>
+
+        <record
+            id="attendance_template_demo9"
+            model="resource.calendar.attendance.template"
+        >
+            <field name="name">12 Hr Night</field>
+            <field name="hour_from">18</field>
+            <field name="hour_to">6</field>
+            <field name="day_period">evening</field>
+            <field name="span_midnight" eval="True" />
+        </record>
+
+        <record
+            id="attendance_template_demo10"
+            model="resource.calendar.attendance.template"
+        >
+            <field name="name">12 Hr Day</field>
+            <field name="hour_from">6</field>
+            <field name="hour_to">18</field>
+            <field name="day_period">12day</field>
+        </record>
+
+        <record
+            id="attendance_template_demo11"
+            model="resource.calendar.attendance.template"
+        >
+            <field name="name">Flex Workday</field>
+            <field name="shift_type">flex</field>
+            <field name="hour_from">6</field>
+            <field name="hour_to">20</field>
+            <field name="flex_core_from">11</field>
+            <field name="flex_core_to">15</field>
+            <field name="flex_scheduled_hrs">8</field>
+            <field name="day_period">8day</field>
+            <field
+                name="schedule_group_ids"
+                eval="[(6, 0, [ref('schedule_group3')])]"
+            />
+        </record>
+
+        <!-- Working Times -->
+
+        <record id="resource_calendar_44h" model="resource.calendar">
+            <field name="name">Standard 44 hours/week</field>
+            <field
+                name="attendance_ids"
+                eval="[
+            (0, 0, {'dayofweek': '0', 'template_id': ref('attendance_template_demo0')}),
+            (0, 0, {'dayofweek': '1', 'template_id': ref('attendance_template_demo0')}),
+            (0, 0, {'dayofweek': '2', 'template_id': ref('attendance_template_demo0')}),
+            (0, 0, {'dayofweek': '3', 'template_id': ref('attendance_template_demo0')}),
+            (0, 0, {'dayofweek': '4', 'template_id': ref('attendance_template_demo0')}),
+            (0, 0, {'dayofweek': '5', 'template_id': ref('attendance_template_demo1')})
+            ]"
+            />
+        </record>
+
+        <record id="resource_calendar_56h" model="resource.calendar">
+            <field name="name">Full Week Schedule</field>
+            <field name="dayoff_type">fix_one</field>
+            <field
+                name="default_dayoff_ids"
+                eval="[
+            (6, 0, [ref('wd_sun')])
+            ]"
+            />
+            <field
+                name="attendance_ids"
+                eval="[
+            (0, 0, {'dayofweek': '0', 'template_id': ref('attendance_template_demo0')}),
+            (0, 0, {'dayofweek': '1', 'template_id': ref('attendance_template_demo0')}),
+            (0, 0, {'dayofweek': '2', 'template_id': ref('attendance_template_demo0')}),
+            (0, 0, {'dayofweek': '3', 'template_id': ref('attendance_template_demo0')}),
+            (0, 0, {'dayofweek': '4', 'template_id': ref('attendance_template_demo0')}),
+            (0, 0, {'dayofweek': '5', 'template_id': ref('attendance_template_demo0')}),
+            (0, 0, {'dayofweek': '6', 'template_id': ref('attendance_template_demo0')})
+            ]"
+            />
+        </record>
+
+        <record id="resource_calendar_dupont" model="resource.calendar">
+            <field name="name">Dupont Schedule</field>
+            <field name="dayoff_type">fix_all</field>
+            <field name="two_weeks_calendar" eval="True" />
+            <field
+                name="attendance_ids"
+                eval="[
+            (0, 0, {'sequence': 10, 'dayofweek': '0', 'name': 'First Week', 'hour_from': 0, 'hour_to': 0, 'display_type': 'line_section'}),
+            (0, 0, {'sequence': 11, 'dayofweek': '0', 'template_id': ref('attendance_template_demo9')}),
+            (0, 0, {'sequence': 12, 'dayofweek': '1', 'template_id': ref('attendance_template_demo9')}),
+            (0, 0, {'sequence': 13, 'dayofweek': '2', 'template_id': ref('attendance_template_demo9')}),
+            (0, 0, {'sequence': 14, 'dayofweek': '3', 'template_id': ref('attendance_template_demo9')}),
+            (0, 0, {'sequence': 20, 'dayofweek': '0', 'name': 'Second Week', 'hour_from': 0, 'hour_to': 0, 'display_type': 'line_section'}),
+            (0, 0, {'sequence': 21, 'dayofweek': '0', 'template_id': ref('attendance_template_demo10')}),
+            (0, 0, {'sequence': 22, 'dayofweek': '1', 'template_id': ref('attendance_template_demo10')}),
+            (0, 0, {'sequence': 23, 'dayofweek': '2', 'template_id': ref('attendance_template_demo10')}),
+            (0, 0, {'sequence': 24, 'dayofweek': '4', 'template_id': ref('attendance_template_demo9')}),
+            (0, 0, {'sequence': 25, 'dayofweek': '5', 'template_id': ref('attendance_template_demo9')}),
+            (0, 0, {'sequence': 26, 'dayofweek': '6', 'template_id': ref('attendance_template_demo9')}),
+            (0, 0, {'sequence': 30, 'dayofweek': '0', 'name': 'Third Week', 'hour_from': 0, 'hour_to': 0, 'display_type': 'line_section'}),
+            (0, 0, {'sequence': 31, 'dayofweek': '3', 'template_id': ref('attendance_template_demo10')}),
+            (0, 0, {'sequence': 32, 'dayofweek': '4', 'template_id': ref('attendance_template_demo10')}),
+            (0, 0, {'sequence': 33, 'dayofweek': '5', 'template_id': ref('attendance_template_demo10')}),
+            (0, 0, {'sequence': 34, 'dayofweek': '6', 'template_id': ref('attendance_template_demo10')}),
+            (0, 0, {'sequence': 40, 'dayofweek': '0', 'name': 'Fourth Week', 'hour_from': 0, 'hour_to': 0, 'display_type': 'line_section'})
+            ]"
+            />
+        </record>
+
+        <!-- Scheduling Teams -->
+        <record id="schedule_team0" model="resource.schedule.team">
+            <field name="name">Alpha</field>
+            <field name="color" eval="2" />
+            <field name="resource_calendar_id" ref="resource_calendar_dupont" />
+            <field name="start_week" eval="0" />
+        </record>
+        <record id="schedule_team1" model="resource.schedule.team">
+            <field name="name">Bravo</field>
+            <field name="color" eval="4" />
+            <field name="resource_calendar_id" ref="resource_calendar_dupont" />
+            <field name="start_week" eval="1" />
+        </record>
+        <record id="schedule_team2" model="resource.schedule.team">
+            <field name="name">Charlie</field>
+            <field name="color" eval="6" />
+            <field name="resource_calendar_id" ref="resource_calendar_dupont" />
+            <field name="start_week" eval="2" />
+        </record>
+        <record id="schedule_team3" model="resource.schedule.team">
+            <field name="name">Delta</field>
+            <field name="color" eval="8" />
+            <field name="resource_calendar_id" ref="resource_calendar_dupont" />
+            <field name="start_week" eval="3" />
+        </record>
+
+    </data>
+</odoo>
diff --git a/resource_schedule/i18n/resource_schedule.pot b/resource_schedule/i18n/resource_schedule.pot
new file mode 100644
index 00000000..1c5fdcb6
--- /dev/null
+++ b/resource_schedule/i18n/resource_schedule.pot
@@ -0,0 +1,1302 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* resource_schedule
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: resource_schedule
+#: model:ir.model.fields,help:resource_schedule.field_resource_calendar__dayoff_type
+msgid ""
+"\n"
+"        Fixed for all - the unscheduled days in the working time apply to all resources.\n"
+"        Fixed individually - the days off will be specified in each resource's record. If\n"
+"        it is not, the default days off will be used.\n"
+"        Rolling weekly - each reasource's day(s) off changes on a weekly basis. For\n"
+"        example, if the resource was off on Saturday last week, this week it will be\n"
+"        Friday, and next week it will be Thursday.\n"
+"        "
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields.selection,name:resource_schedule.selection__resource_calendar_attendance__day_period__12day
+#: model:ir.model.fields.selection,name:resource_schedule.selection__resource_calendar_attendance_open__day_period__12day
+#: model:ir.model.fields.selection,name:resource_schedule.selection__resource_schedule_shift__day_period__12day
+msgid "12 Hour Day"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields.selection,name:resource_schedule.selection__resource_calendar_attendance__day_period__12night
+#: model:ir.model.fields.selection,name:resource_schedule.selection__resource_calendar_attendance_open__day_period__12night
+#: model:ir.model.fields.selection,name:resource_schedule.selection__resource_schedule_shift__day_period__12night
+msgid "12 Hour Night"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields.selection,name:resource_schedule.selection__resource_calendar_attendance__day_period__8day
+#: model:ir.model.fields.selection,name:resource_schedule.selection__resource_calendar_attendance_open__day_period__8day
+#: model:ir.model.fields.selection,name:resource_schedule.selection__resource_schedule_shift__day_period__8day
+msgid "8 Hour Day"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.res_config_settings_form
+msgid ""
+"<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-"
+"specific.\" role=\"img\" aria-label=\"Values set here are company-"
+"specific.\" groups=\"base.group_multi_company\"/>"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_template__active
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_area__active
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_group__active
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_team__active
+msgid "Active"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.resource_calendar_form
+msgid "Add a new week"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.resource_calendar_form
+msgid "Add a workday"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields.selection,name:resource_schedule.selection__resource_calendar_attendance_template__day_period__afternoon
+msgid "Afternoon"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields.selection,name:resource_schedule.selection__resource_calendar_attendance_template__day_period__12day
+msgid "All day"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields.selection,name:resource_schedule.selection__resource_calendar_attendance_template__day_period__12night
+msgid "All night"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,help:resource_schedule.field_resource_calendar_attendance__autopunch
+#: model:ir.model.fields,help:resource_schedule.field_resource_calendar_attendance_open__autopunch
+#: model:ir.model.fields,help:resource_schedule.field_resource_calendar_attendance_template__autopunch
+#: model:ir.model.fields,help:resource_schedule.field_resource_schedule_shift__autopunch
+msgid "An attendance record will be created automatically for the resource."
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_attendance_template_form
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_area_form
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_area_search
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_group_form
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_group_search
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_team_form
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_team_search
+msgid "Archived"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_resource_search
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_search
+msgid "Area"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model,name:resource_schedule.model_hr_attendance
+msgid "Attendance"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__hr_attendance_ids
+msgid "Attendance Records"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_template__autodeduct_break
+msgid "Auto-deduct break"
+msgstr ""
+
+#. module: resource_schedule
+#: code:addons/resource_schedule/models/resource_calendar_attendance_template.py:0
+#, python-format
+msgid "Auto-deduct break time cannot be used with a Flex Shift"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_hr_attendance__autopunch
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance__autopunch
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_open__autopunch
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__autopunch
+msgid "Auto-punch"
+msgstr ""
+
+#. module: resource_schedule
+#: code:addons/resource_schedule/models/resource_calendar_attendance.py:0
+#: code:addons/resource_schedule/models/resource_calendar_attendance.py:0
+#: code:addons/resource_schedule/models/resource_calendar_attendance_template.py:0
+#, python-format
+msgid "Auto-punch cannot be used with a Flex Shift"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_template__auto_splitshift
+msgid "Automatically split shifts at midnight"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_template__autopunch
+msgid "Autopunch"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_open__available
+msgid "Available"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_template__break_minutes
+msgid "Break Minutes"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model,name:resource_schedule.model_resource_calendar_weekday
+msgid "Calendar Weekdays"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_open__two_weeks_calendar
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__two_weeks_calendar
+msgid "Calendar in 2 weeks mode"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_department_selection
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_schedule_employee_selection
+msgid "Cancel"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,help:resource_schedule.field_resource_schedule_generate__type
+msgid ""
+"Choose how to schedule shifts.Employee - Directly choose the employees for "
+"which to schedule shifts.Team - Shifts will be scheduled for all the "
+"employees in the team(s).Working Schedule - All employees (and teams) that "
+"have been assigned thatschedule will have shifts scheduled."
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_area__color
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_team__color
+msgid "Color Index"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model,name:resource_schedule.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_template__company_id
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_area__company_id
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_group__company_id
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__company_id
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_team__company_id
+msgid "Company"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model,name:resource_schedule.model_res_config_settings
+msgid "Config Settings"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.ui.menu,name:resource_schedule.menu_schedule_config
+msgid "Configuration"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_attendance_template_form
+msgid "Core Hours"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_open__create_uid
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_template__create_uid
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_weekday__create_uid
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_area__create_uid
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_autopunch_lastrun__create_uid
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_generate__create_uid
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_group__create_uid
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__create_uid
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_team__create_uid
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_validate_departments__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_open__create_date
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_template__create_date
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_weekday__create_date
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_area__create_date
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_autopunch_lastrun__create_date
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_generate__create_date
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_group__create_date
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__create_date
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_team__create_date
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_validate_departments__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_search
+msgid "Date"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__day
+msgid "Day"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance__day_period
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_open__day_period
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_template__day_period
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__day_period
+msgid "Day Period"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_open__dayofweek
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__dayofweek
+msgid "Day of Week"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar__dayoff_type
+msgid "Day off type"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_weekday__dayofweek
+msgid "Dayofweek"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar__default_dayoff_ids
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_resource__dayoff_ids
+msgid "Days off"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance__default_area_id
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_open__default_area_id
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_template__default_area_id
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__default_area_id
+msgid "Default Area"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_hr_contract__default_area_id
+#: model:ir.model.fields,field_description:resource_schedule.field_hr_employee__default_area_id
+#: model:ir.model.fields,field_description:resource_schedule.field_hr_job__default_area_id
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_resource__default_area_id
+msgid "Default shift area"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.res_config_settings_form
+msgid "Defaults"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__department_id
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_search
+msgid "Department"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model,name:resource_schedule.model_resource_schedule_validate_departments
+msgid "Department Selection for Validation"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_validate_departments__department_ids
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_department_selection
+msgid "Departments"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_department_selection
+msgid "Departmet Selection"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,help:resource_schedule.field_hr_attendance__autopunch
+msgid ""
+"Designates whether or not this attendance record was created automatically."
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_hr_attendance__display_name
+#: model:ir.model.fields,field_description:resource_schedule.field_hr_contract__display_name
+#: model:ir.model.fields,field_description:resource_schedule.field_hr_employee__display_name
+#: model:ir.model.fields,field_description:resource_schedule.field_hr_job__display_name
+#: model:ir.model.fields,field_description:resource_schedule.field_hr_leave__display_name
+#: model:ir.model.fields,field_description:resource_schedule.field_res_company__display_name
+#: model:ir.model.fields,field_description:resource_schedule.field_res_config_settings__display_name
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar__display_name
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance__display_name
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_open__display_name
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_template__display_name
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_weekday__display_name
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_resource__display_name
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_area__display_name
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_autopunch_lastrun__display_name
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_generate__display_name
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_group__display_name
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__display_name
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_team__display_name
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_validate_departments__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_open__display_type
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__display_type
+msgid "Display Type"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance__duration
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_open__duration
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__duration
+msgid "Duration"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,help:resource_schedule.field_resource_calendar_attendance__duration
+#: model:ir.model.fields,help:resource_schedule.field_resource_calendar_attendance_open__duration
+#: model:ir.model.fields,help:resource_schedule.field_resource_schedule_shift__duration
+msgid "Duration of period in seconds"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model,name:resource_schedule.model_hr_employee
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__employee_id
+#: model:ir.model.fields.selection,name:resource_schedule.selection__resource_schedule_generate__type__employee
+msgid "Employee"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model,name:resource_schedule.model_hr_contract
+msgid "Employee Contract"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_generate__employee_ids
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_schedule_employee_selection
+msgid "Employees"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__datetime_end
+msgid "End"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_open__date_to
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__date_to
+msgid "End Date"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields.selection,name:resource_schedule.selection__resource_calendar_attendance__day_period__evening
+#: model:ir.model.fields.selection,name:resource_schedule.selection__resource_calendar_attendance_open__day_period__evening
+#: model:ir.model.fields.selection,name:resource_schedule.selection__resource_calendar_attendance_template__day_period__evening
+#: model:ir.model.fields.selection,name:resource_schedule.selection__resource_schedule_shift__day_period__evening
+msgid "Evening"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields.selection,name:resource_schedule.selection__resource_calendar__dayoff_type__fix_all
+msgid "Fixed for all"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields.selection,name:resource_schedule.selection__resource_calendar__dayoff_type__fix_one
+msgid "Fixed individualy"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance__flex_core_from
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_open__flex_core_from
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_template__flex_core_from
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__flex_core_from
+msgid "Flex Core From"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance__flex_core_to
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_open__flex_core_to
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_template__flex_core_to
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__flex_core_to
+msgid "Flex Core To"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance__flex_scheduled_avg
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_open__flex_scheduled_avg
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_template__flex_scheduled_avg
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__flex_scheduled_avg
+msgid "Flex Scheduled Avg"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance__flex_scheduled_hrs
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_open__flex_scheduled_hrs
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_template__flex_scheduled_hrs
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__flex_scheduled_hrs
+msgid "Flex Scheduled Hrs"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields.selection,name:resource_schedule.selection__resource_calendar_attendance__shift_type__flex
+#: model:ir.model.fields.selection,name:resource_schedule.selection__resource_calendar_attendance_open__shift_type__flex
+#: model:ir.model.fields.selection,name:resource_schedule.selection__resource_calendar_attendance_template__shift_type__flex
+#: model:ir.model.fields.selection,name:resource_schedule.selection__resource_schedule_shift__shift_type__flex
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_attendance_template_form
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_calendar_attendance_form
+msgid "Flex Shift"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance__flex_weekly_hrs
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_open__flex_weekly_hrs
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_template__flex_weekly_hrs
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__flex_weekly_hrs
+msgid "Flex Weekly Hrs"
+msgstr ""
+
+#. module: resource_schedule
+#: code:addons/resource_schedule/models/resource_calendar.py:0
+#, python-format
+msgid "Format of working hours is incorrect"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_schedule_employee_selection
+msgid "Generate"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.actions.act_window,name:resource_schedule.action_schedules_by_employee
+#: model:ir.ui.menu,name:resource_schedule.menu_schedules_by_employee
+msgid "Generate Schedules"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model,name:resource_schedule.model_resource_schedule_generate
+msgid "Generate Schedules Wizard"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,help:resource_schedule.field_resource_calendar_attendance_open__sequence
+#: model:ir.model.fields,help:resource_schedule.field_resource_schedule_shift__sequence
+msgid "Gives the sequence of this line when displaying the resource calendar."
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_search
+msgid "Group By..."
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_attendance_template_form
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_calendar_attendance_form
+msgid "Hours"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.res_config_settings_form
+msgid "Hrs"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_search
+msgid "Human"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_hr_attendance__id
+#: model:ir.model.fields,field_description:resource_schedule.field_hr_contract__id
+#: model:ir.model.fields,field_description:resource_schedule.field_hr_employee__id
+#: model:ir.model.fields,field_description:resource_schedule.field_hr_job__id
+#: model:ir.model.fields,field_description:resource_schedule.field_hr_leave__id
+#: model:ir.model.fields,field_description:resource_schedule.field_res_company__id
+#: model:ir.model.fields,field_description:resource_schedule.field_res_config_settings__id
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar__id
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance__id
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_open__id
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_template__id
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_weekday__id
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_resource__id
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_area__id
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_autopunch_lastrun__id
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_generate__id
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_group__id
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__id
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_team__id
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_validate_departments__id
+msgid "ID"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.res_config_settings_form
+msgid ""
+"If an employee hasn't clocked out in this amount of time the system will "
+"automatically clock the employee out."
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,help:resource_schedule.field_resource_calendar_attendance__flex_scheduled_avg
+#: model:ir.model.fields,help:resource_schedule.field_resource_calendar_attendance_open__flex_scheduled_avg
+#: model:ir.model.fields,help:resource_schedule.field_resource_calendar_attendance_template__flex_scheduled_avg
+#: model:ir.model.fields,help:resource_schedule.field_resource_schedule_shift__flex_scheduled_avg
+msgid ""
+"If this option is checked scheduled hours denotes a daily averageover a "
+"period of one week."
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,help:resource_schedule.field_resource_calendar_attendance__flex_weekly_hrs
+#: model:ir.model.fields,help:resource_schedule.field_resource_calendar_attendance_open__flex_weekly_hrs
+#: model:ir.model.fields,help:resource_schedule.field_resource_calendar_attendance_template__flex_weekly_hrs
+#: model:ir.model.fields,help:resource_schedule.field_resource_schedule_shift__flex_weekly_hrs
+msgid ""
+"If this value is set the resource must work this number ofhours total during"
+" the week."
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,help:resource_schedule.field_resource_schedule_team__start_week
+msgid ""
+"In multi-week schedule rotation this denotes the week number onwhich this "
+"team will start the rotation. In single week schedules leavethis value at 0."
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model,name:resource_schedule.model_hr_job
+msgid "Job Position"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_hr_attendance____last_update
+#: model:ir.model.fields,field_description:resource_schedule.field_hr_contract____last_update
+#: model:ir.model.fields,field_description:resource_schedule.field_hr_employee____last_update
+#: model:ir.model.fields,field_description:resource_schedule.field_hr_job____last_update
+#: model:ir.model.fields,field_description:resource_schedule.field_hr_leave____last_update
+#: model:ir.model.fields,field_description:resource_schedule.field_res_company____last_update
+#: model:ir.model.fields,field_description:resource_schedule.field_res_config_settings____last_update
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar____last_update
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance____last_update
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_open____last_update
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_template____last_update
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_weekday____last_update
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_resource____last_update
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_area____last_update
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_autopunch_lastrun____last_update
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_generate____last_update
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_group____last_update
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift____last_update
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_team____last_update
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_validate_departments____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_open__write_uid
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_template__write_uid
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_weekday__write_uid
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_area__write_uid
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_autopunch_lastrun__write_uid
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_generate__write_uid
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_group__write_uid
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__write_uid
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_team__write_uid
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_validate_departments__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_open__write_date
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_template__write_date
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_weekday__write_date
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_area__write_date
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_autopunch_lastrun__write_date
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_generate__write_date
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_group__write_date
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__write_date
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_team__write_date
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_validate_departments__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_group__manager_ids
+#: model:res.groups,name:resource_schedule.group_scheduling_manager
+msgid "Manager"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_group_form
+msgid "Managers"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_search
+msgid "Material"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_res_config_settings__max_shift_length
+msgid "Maximum Shift Length"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields.selection,name:resource_schedule.selection__resource_calendar_attendance_template__day_period__morning
+msgid "Morning"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_search
+msgid "My Area"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_search
+msgid "My Department"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.actions.act_window,name:resource_schedule.open_dept_schedule_view
+#: model:ir.ui.menu,name:resource_schedule.menu_dept_schedule_view
+msgid "My Department Schedule"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.actions.act_window,name:resource_schedule.open_my_schedule_view
+#: model:ir.ui.menu,name:resource_schedule.menu_my_schedule_view
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_search
+msgid "My Schedule"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_search
+msgid "My Team"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.actions.act_window,name:resource_schedule.open_team_schedule_view
+#: model:ir.ui.menu,name:resource_schedule.menu_team_schedule_view
+msgid "My Team Schedule"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_open__name
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_template__name
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_weekday__name
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_area__name
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_autopunch_lastrun__name
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_group__name
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__name
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_team__name
+msgid "Name"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_generate__no_weeks
+msgid "Number of weeks"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.ui.menu,name:resource_schedule.menu_schedule_ops
+msgid "Operations"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__published
+msgid "Publish"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.actions.act_window,name:resource_schedule.action_schedules_by_department
+#: model:ir.ui.menu,name:resource_schedule.menu_schedules_generate
+msgid "Publish Schedules"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_autopunch_lastrun__record_ids
+msgid "Record"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_autopunch_lastrun__record_count
+msgid "Record Count"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_open__resource_id
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_area__resource_ids
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__resource_id
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_search
+msgid "Resource"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_area__resource_count
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_team__resource_count
+msgid "Resource Count"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model,name:resource_schedule.model_resource_calendar_attendance_open
+msgid "Resource Open Shift Template"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_area_search
+msgid "Resource Scheduling Area Search"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model,name:resource_schedule.model_resource_schedule_group
+msgid "Resource Scheduling Group"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_group_search
+msgid "Resource Scheduling Group Search"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_team_search
+msgid "Resource Scheduling Team Search"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model,name:resource_schedule.model_resource_schedule_shift
+msgid "Resource Shift"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_search
+msgid "Resource Shift Search"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance__resource_type
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_open__resource_type
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__resource_type
+msgid "Resource Type"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model,name:resource_schedule.model_resource_calendar
+msgid "Resource Working Time"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_open__calendar_id
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__calendar_id
+msgid "Resource's Calendar"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model,name:resource_schedule.model_resource_resource
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_team__resource_ids
+#: model:ir.ui.menu,name:resource_schedule.menu_resource_resource
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_team_form
+msgid "Resources"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields.selection,name:resource_schedule.selection__resource_calendar__dayoff_type__rolling
+msgid "Rolling weekly"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.actions.act_window,name:resource_schedule.open_employee_schedule_view
+#: model:ir.ui.menu,name:resource_schedule.menu_root_schedule
+#: model:ir.ui.menu,name:resource_schedule.menu_schedule_schedule
+msgid "Schedule"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance__schedule_group_ids
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_open__schedule_group_ids
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_template__schedule_group_ids
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__schedule_group_ids
+msgid "Schedule Group"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_schedule_employee_selection
+msgid "Schedule Shifts"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model,name:resource_schedule.model_resource_schedule_autopunch_lastrun
+msgid "Schedule auto-punch last run-time"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.actions.server,name:resource_schedule.autopunch_schedule_cron_ir_actions_server
+#: model:ir.cron,cron_name:resource_schedule.autopunch_schedule_cron
+#: model:ir.cron,name:resource_schedule.autopunch_schedule_cron
+msgid "Schedule: Auto-punch"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.actions.server,name:resource_schedule.auto_clockout_schedule_cron_ir_actions_server
+#: model:ir.cron,cron_name:resource_schedule.auto_clockout_schedule_cron
+#: model:ir.cron,name:resource_schedule.auto_clockout_schedule_cron
+msgid "Schedule: Automatically clock-out after max. shift length"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.actions.server,name:resource_schedule.mass_schedule_cron_ir_actions_server
+#: model:ir.cron,cron_name:resource_schedule.mass_schedule_cron
+#: model:ir.cron,name:resource_schedule.mass_schedule_cron
+msgid "Schedule: Mass Scheduling"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_hr_employee__scheduled_shift_ids
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_resource__scheduled_shift_ids
+msgid "Scheduled Shift"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_team__scheduled_shift_ids
+msgid "Scheduled Shifts"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.hr_employee_view_form
+msgid "Schedules"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.module.category,name:resource_schedule.module_category_scheduling
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_shift_calendar
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_shift_form
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_shift_tree
+msgid "Scheduling"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.actions.act_window,name:resource_schedule.open_schedule_area_view
+#: model:ir.model,name:resource_schedule.model_resource_schedule_area
+#: model:ir.ui.menu,name:resource_schedule.menu_schedule_area_view
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_area_form
+msgid "Scheduling Area"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_area_tree
+msgid "Scheduling Areas"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.actions.act_window,name:resource_schedule.open_schedule_group_view
+#: model:ir.ui.menu,name:resource_schedule.menu_schedule_group_view
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_group_form
+msgid "Scheduling Group"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_group_form
+msgid "Scheduling Group Managers"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_group_form
+msgid "Scheduling Group Work Detail Templates"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_attendance_template_form
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_group_tree
+msgid "Scheduling Groups"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model,name:resource_schedule.model_resource_schedule_team
+msgid "Scheduling Shift Team"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_team_form
+msgid "Scheduling Team"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.actions.act_window,name:resource_schedule.open_schedule_team_view
+#: model:ir.ui.menu,name:resource_schedule.menu_schedule_team_view
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_team_tree
+msgid "Scheduling Teams"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_hr_employee__schedule_group_id
+msgid "Scheduling group"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_open__sequence
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__sequence
+msgid "Sequence"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.actions.act_window,name:resource_schedule.action_config_settings
+#: model:ir.ui.menu,name:resource_schedule.menu_config_settings
+msgid "Settings"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_hr_attendance__schedule_shift_id
+msgid "Shift"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_shift_form
+msgid "Shift Information"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.res_config_settings_form
+msgid "Shift Scheduling"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance__shift_type
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_open__shift_type
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_template__shift_type
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__shift_type
+msgid "Shift Type"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_timeline
+msgid "Shift hours"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_resource__schedule_team_id
+msgid "Shift team"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance__span_midnight
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_open__span_midnight
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_template__span_midnight
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__span_midnight
+msgid "Span Midnight"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields.selection,name:resource_schedule.selection__resource_calendar_attendance_template__shift_type__std
+msgid "Standard"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields.selection,name:resource_schedule.selection__resource_calendar_attendance__shift_type__std
+#: model:ir.model.fields.selection,name:resource_schedule.selection__resource_calendar_attendance_open__shift_type__std
+#: model:ir.model.fields.selection,name:resource_schedule.selection__resource_schedule_shift__shift_type__std
+msgid "Standard Shift"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_generate__date_start
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__datetime_start
+msgid "Start"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_team__start_week
+msgid "Start Week"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,help:resource_schedule.field_resource_calendar_attendance_open__hour_from
+#: model:ir.model.fields,help:resource_schedule.field_resource_schedule_shift__hour_from
+msgid ""
+"Start and End time of working.\n"
+"A specific value of 24:00 is interpreted as 23:59:59.999999."
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_open__date_from
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__date_from
+msgid "Starting Date"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.resource_calendar_form
+msgid "Switch to multi-week calendar"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__schedule_team_id
+#: model:ir.model.fields.selection,name:resource_schedule.selection__resource_schedule_generate__type__team
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_search
+msgid "Team"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_generate__schedule_team_ids
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_schedule_employee_selection
+msgid "Teams"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,help:resource_schedule.field_resource_calendar_attendance_open__display_type
+#: model:ir.model.fields,help:resource_schedule.field_resource_schedule_shift__display_type
+msgid "Technical field for UX purpose."
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance__template_id
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_open__template_id
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__template_id
+msgid "Template"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_group__template_count
+msgid "Template Count"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,help:resource_schedule.field_resource_calendar_attendance_template__break_minutes
+msgid "The number of minutes to deduct for breaks from the scheduled time."
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,help:resource_schedule.field_resource_calendar_attendance_open__available
+msgid "The number of shifts available for pickup."
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,help:resource_schedule.field_resource_calendar_attendance__flex_scheduled_hrs
+#: model:ir.model.fields,help:resource_schedule.field_resource_calendar_attendance_open__flex_scheduled_hrs
+#: model:ir.model.fields,help:resource_schedule.field_resource_schedule_shift__flex_scheduled_hrs
+msgid "The resource must work this number of hours per day."
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,help:resource_schedule.field_hr_attendance__schedule_shift_id
+msgid "The shift related to this attendance."
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,help:resource_schedule.field_resource_calendar_attendance__week_nbr
+#: model:ir.model.fields,help:resource_schedule.field_resource_calendar_attendance_open__week_nbr
+#: model:ir.model.fields,help:resource_schedule.field_resource_schedule_shift__week_nbr
+msgid "The week number in the weekly rotation"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,help:resource_schedule.field_resource_schedule_shift__tz
+msgid ""
+"This field is used in order to define in which timezone the resources will "
+"work."
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,help:resource_schedule.field_resource_calendar_attendance__span_midnight
+#: model:ir.model.fields,help:resource_schedule.field_resource_calendar_attendance_open__span_midnight
+#: model:ir.model.fields,help:resource_schedule.field_resource_calendar_attendance_template__span_midnight
+#: model:ir.model.fields,help:resource_schedule.field_resource_schedule_shift__span_midnight
+msgid "This shift crosses over midnight into a new day."
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model,name:resource_schedule.model_hr_leave
+msgid "Time Off"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__tz
+msgid "Timezone"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_search
+msgid "Today"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_generate__type
+msgid "Type"
+msgstr ""
+
+#. module: resource_schedule
+#: model:res.groups,name:resource_schedule.group_scheduling_user
+msgid "User"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_department_selection
+msgid "Validate All"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_department_selection
+msgid "View Schedules"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance__week_nbr
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_open__week_nbr
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__week_nbr
+msgid "Week"
+msgstr ""
+
+#. module: resource_schedule
+#: code:addons/resource_schedule/models/resource_calendar.py:0
+#, python-format
+msgid "Week 0"
+msgstr ""
+
+#. module: resource_schedule
+#: code:addons/resource_schedule/models/resource_calendar.py:0
+#, python-format
+msgid "Week 1"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_calendar_weekday_tree
+msgid "Week Days"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_open__week_type
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__week_type
+msgid "Week Even/Odd"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_calendar_weekday_form
+msgid "Weekday"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.actions.act_window,name:resource_schedule.open_calendar_weekday_view
+#: model:ir.ui.menu,name:resource_schedule.menu_calendar_weekday_view
+msgid "Weekdays"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,help:resource_schedule.field_resource_calendar_attendance_template__auto_splitshift
+msgid ""
+"When a shift crosses over into a new calendar day close out thecurrent shift"
+" and start a new shift."
+msgstr ""
+
+#. module: resource_schedule
+#: code:addons/resource_schedule/models/resource_schedule_shift.py:0
+#, python-format
+msgid "While creating schedules end date cannot be less than start date."
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_shift_form
+msgid "Work Area"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_shift_form
+msgid "Work Calendar"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model,name:resource_schedule.model_resource_calendar_attendance
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_shift_form
+msgid "Work Detail"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.actions.act_window,name:resource_schedule.open_attendance_template_view
+#: model:ir.model,name:resource_schedule.model_resource_calendar_attendance_template
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_group__attendance_template_ids
+#: model:ir.ui.menu,name:resource_schedule.menu_attendance_template_view
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_attendance_template_form
+msgid "Work Detail Template"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_attendance_template_tree
+#: model_terms:ir.ui.view,arch_db:resource_schedule.view_resource_schedule_group_form
+msgid "Work Detail Templates"
+msgstr ""
+
+#. module: resource_schedule
+#: model_terms:ir.ui.view,arch_db:resource_schedule.resource_calendar_form
+msgid "Work Details"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields.selection,name:resource_schedule.selection__resource_calendar_attendance_template__day_period__8day
+msgid "Work day"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_open__hour_from
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_template__hour_from
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__hour_from
+msgid "Work from"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_open__hour_to
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_calendar_attendance_template__hour_to
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_shift__hour_to
+msgid "Work to"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_generate__resource_calendar_id
+#: model:ir.model.fields.selection,name:resource_schedule.selection__resource_schedule_generate__type__calendar
+msgid "Working Schedule"
+msgstr ""
+
+#. module: resource_schedule
+#: model:ir.model.fields,field_description:resource_schedule.field_resource_schedule_team__resource_calendar_id
+#: model:ir.ui.menu,name:resource_schedule.menu_resource_calendar
+msgid "Working Times"
+msgstr ""
+
+#. module: resource_schedule
+#: model:res.groups,comment:resource_schedule.group_scheduling_manager
+msgid "the user will be able to configure the scheduling module"
+msgstr ""
+
+#. module: resource_schedule
+#: model:res.groups,comment:resource_schedule.group_scheduling_user
+msgid ""
+"the user will be able to create shifts, shift templates, and assign users"
+msgstr ""
diff --git a/resource_schedule/models/__init__.py b/resource_schedule/models/__init__.py
new file mode 100644
index 00000000..61702b05
--- /dev/null
+++ b/resource_schedule/models/__init__.py
@@ -0,0 +1,22 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import hr_attendance
+from . import hr_contract
+from . import hr_employee
+from . import hr_job
+from . import hr_leave
+from . import res_company
+from . import res_config_settings
+from . import resource_calendar
+from . import resource_calendar_attendance
+from . import resource_calendar_attendance_open
+from . import resource_calendar_attendance_template
+from . import resource_calendar_weekday
+from . import resource_resource
+from . import resource_schedule_area
+from . import resource_schedule_autopunch
+from . import resource_schedule_group
+from . import resource_schedule_shift
+from . import resource_schedule_team
diff --git a/resource_schedule/models/hr_attendance.py b/resource_schedule/models/hr_attendance.py
new file mode 100644
index 00000000..00523100
--- /dev/null
+++ b/resource_schedule/models/hr_attendance.py
@@ -0,0 +1,54 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import timedelta
+
+from odoo import api, fields, models
+
+
+class HrAttendance(models.Model):
+
+    _inherit = "hr.attendance"
+
+    autopunch = fields.Boolean(
+        string="Auto-punch",
+        help="Designates whether or not this attendance record was created automatically.",
+    )
+    schedule_shift_id = fields.Many2one(
+        "resource.schedule.shift", "Shift", help="The shift related to this attendance."
+    )
+
+    @api.model
+    def auto_punchout(self):
+        now = fields.Datetime.now()
+        return self._auto_punchout(now)
+
+    @api.model
+    def _auto_punchout(self, now):
+        """
+        This method automatically clocks out attendance records that have
+        exceeded the maximum shift length.
+        :param datetime now: the current UTC datetime in naive datetime format.
+        :returns: :class:`~hr.attendance`
+        """
+        res = self.env["hr.attendance"]
+        max_shift_length = int(
+            self.env["ir.config_parameter"]
+            .sudo()
+            .get_param("resource_schedule.max_shift_length")
+        )
+        if max_shift_length == 0 or max_shift_length is False:
+            return res
+
+        atts = self.search([("check_out", "=", False), ("check_in", "!=", False)])
+        atts = atts.filtered(lambda att: att._exceeds_max_duration(now))
+        if len(atts) > 0:
+            for at in atts:
+                at.check_out = at.check_in + timedelta(hours=int(max_shift_length))
+            res = atts
+        return res
+
+    def _exceeds_max_duration(self, now):
+
+        duration = now - self.check_in
+        return int(duration.total_seconds() / 60.0 / 60.0) >= 15
diff --git a/resource_schedule/models/hr_contract.py b/resource_schedule/models/hr_contract.py
new file mode 100644
index 00000000..bafc2933
--- /dev/null
+++ b/resource_schedule/models/hr_contract.py
@@ -0,0 +1,91 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013,2014 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import timedelta
+
+from odoo import api, fields, models
+
+
+class HrContract(models.Model):
+
+    _inherit = "hr.contract"
+
+    default_area_id = fields.Many2one("resource.schedule.area", "Default shift area")
+
+    @api.onchange("resource_calendar_id")
+    def _onchange_resource_calendar_id(self):
+        for c in self:
+            c.employee_id.resource_id.calendar_id = c.resource_calendar_id
+
+    @api.model
+    def create(self, vals):
+
+        res = super(HrContract, self).create(vals)
+
+        # Update resource.calendar on employee resource record
+        if "resource_calendar_id" in vals:
+            resource_ids = res.mapped("employee_id").mapped("resource_id")
+            resource_ids.update({"calendar_id": vals["resource_calendar_id"]})
+
+        ee = res.employee_id
+        dToday = fields.Date.today()
+        dStart = res.date_start
+
+        # Only create schedule when the employee is first hired. Do not
+        # create a schedule if the contract is in the past.
+        if len(ee.contract_ids) != 1 or (res.date_end and res.date_end < dToday):
+            return res
+
+        # Get End date by trying to figure out when the next mass schedule will be created
+        #
+        dEnd = None
+        xref = self.env.ref("resource_schedule.mass_schedule_cron")
+        if xref:
+            dEnd = fields.Datetime.from_string(xref.nextcall).date()
+
+        if dEnd is None or dEnd < dStart:
+            dEnd = dStart
+        while dEnd.weekday() != 6:
+            dEnd += timedelta(days=+1)
+
+        # The contract start date may be way back in the past, so use today's date
+        # as the start date if the contract started before today.
+        if dStart < dToday:
+            dStart = dToday
+        # Go back to Monday of this week
+        while dStart.weekday() != 0:
+            dStart += timedelta(days=-1)
+
+        sched_obj = self.env["resource.schedule.shift"]
+        dTmp = dStart
+        while dTmp < dEnd:
+            calendar = res.resource_calendar_id
+
+            # Only create the schedule if there isn't one already.
+            #
+            prev_sched_ids = sched_obj.search(
+                [
+                    ("resource_id", "=", ee.resource_id.id),
+                    ("day", "=", dTmp),
+                ]
+            )
+            if len(prev_sched_ids) == 0:
+                sched_obj.sudo().create_schedule(
+                    ee.resource_id, dTmp, dTmp + timedelta(days=6), calendar
+                )
+
+            dTmp += timedelta(days=7)
+
+        return res
+
+    def write(self, values):
+
+        res = super().write(values)
+
+        # Update resource.calendar on employee resource record
+        if "resource_calendar_id" in values:
+            resource_ids = self.mapped("employee_id").mapped("resource_id")
+            resource_ids.update({"calendar_id": values["resource_calendar_id"]})
+
+        return res
diff --git a/resource_schedule/models/hr_employee.py b/resource_schedule/models/hr_employee.py
new file mode 100644
index 00000000..4a032836
--- /dev/null
+++ b/resource_schedule/models/hr_employee.py
@@ -0,0 +1,34 @@
+# 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 HrEmployee(models.Model):
+    _inherit = "hr.employee"
+
+    default_area_id = fields.Many2one(
+        "resource.schedule.area",
+        related="resource_id.default_area_id",
+        string="Default shift area",
+    )
+    schedule_group_id = fields.Many2one("resource.schedule.group", "Scheduling group")
+    scheduled_shift_ids = fields.One2many(
+        "resource.schedule.shift", related="resource_id.scheduled_shift_ids"
+    )
+
+    def action_view_schedule(self):
+
+        action_schedule = self.env.ref(
+            "resource_schedule.open_employee_schedule_view"
+        ).read()[0]
+        action_schedule["context"] = {
+            "search_default_resource_id": self.resource_id.id,
+            "default_resource_id": self.resource_id.id,
+        }
+        return action_schedule
+
+    def create_schedule(self, date_start, date_end, calendar=None):
+
+        resources = self.mapped("resource_id")
+        return resources.create_schedule(date_start, date_end, calendar)
diff --git a/resource_schedule/models/hr_job.py b/resource_schedule/models/hr_job.py
new file mode 100644
index 00000000..966d658a
--- /dev/null
+++ b/resource_schedule/models/hr_job.py
@@ -0,0 +1,11 @@
+# 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 HrJob(models.Model):
+
+    _inherit = "hr.job"
+
+    default_area_id = fields.Many2one("resource.schedule.area", "Default shift area")
diff --git a/resource_schedule/models/hr_leave.py b/resource_schedule/models/hr_leave.py
new file mode 100644
index 00000000..8c042f8a
--- /dev/null
+++ b/resource_schedule/models/hr_leave.py
@@ -0,0 +1,126 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013,2014 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import timedelta
+
+from odoo import models
+
+
+class HrLeave(models.Model):
+
+    _inherit = "hr.leave"
+
+    def action_validate(self):
+
+        res = super(HrLeave, self).action_validate()
+
+        lv_requests = self.filtered(lambda lv: lv.holiday_type == "employee")
+
+        Attendance = self.env["hr.attendance"]
+        for lv in lv_requests:
+
+            # Adjust shifts around the leave
+            dictIds = self.adjust_schedule_by_leave()
+
+            # Adjust attendances
+            #
+            if len(dictIds["removed_ids"]) > 0:
+                att_ids = Attendance.sudo().search(
+                    [("id", "in", dictIds["removed_ids"])],
+                )
+                att_ids.unlink()
+            if len(dictIds["in_altered_ids"]) > 0:
+                _unlink_ids = self.env["hr.attendance"]
+                att_ids = Attendance.sudo().search(
+                    [("id", "in", dictIds["in_altered_ids"])],
+                )
+                for att in att_ids:
+                    if att.check_in < lv.date_to and att.check_out > lv.date_to:
+                        att.check_in = lv.date_to + timedelta(seconds=1)
+                    elif att.check_in < lv.date_to and att.check_out <= lv.date_to:
+                        _unlink_ids |= att
+                    if _unlink_ids:
+                        _unlink_ids.unlink()
+            if len(dictIds["out_altered_ids"]) > 0:
+                _unlink_ids = self.env["hr.attendance"]
+                att_ids = Attendance.sudo().search(
+                    [("id", "in", dictIds["out_altered_ids"])],
+                )
+                for att in att_ids:
+                    if att.check_out > lv.date_from and att.check_in < lv.date_from:
+                        att.check_out = lv.date_from - timedelta(seconds=1)
+                    elif att.check_out <= lv.date_from and att.check_in < lv.date_from:
+                        _unlink_ids |= att
+                    if _unlink_ids:
+                        _unlink_ids.unlink()
+
+        return res
+
+    def adjust_schedule_by_leave(self):
+        """Returns a dictionary of hr.attendance records:
+        {
+            'removed_ids': []       # record ids related to removed shifts
+            'in_altered_ids': []    # record ids who's check-in was altered
+            'out_altered_ids': []   # record ids who's check-out was altered
+        }
+        """
+
+        res = {
+            "removed_ids": [],
+            "in_altered_ids": [],
+            "out_altered_ids": [],
+        }
+        unlink_ids = self.env["resource.schedule.shift"]
+        Shift = self.env["resource.schedule.shift"]
+        for leave in self:
+
+            shifts = Shift.search(
+                [
+                    ("employee_id", "=", leave.employee_id.id),
+                    ("datetime_start", "<=", leave.date_to),
+                    ("datetime_end", ">=", leave.date_from),
+                ],
+                order="datetime_start",
+            )
+            for shift in shifts:
+
+                # Remove shifts completely covered by leave
+                if (
+                    leave.date_from <= shift.datetime_start
+                    and leave.date_to >= shift.datetime_end
+                ):
+                    if shift not in unlink_ids:
+                        unlink_ids |= shift
+
+                # Partial day on first day of leave
+                elif (
+                    leave.date_from > shift.datetime_start
+                    and leave.date_from <= shift.datetime_end
+                ):
+                    dtLv = leave.date_from
+                    if (
+                        leave.date_from == shift.datetime_end
+                        and shift not in unlink_ids
+                    ):
+                        unlink_ids |= shift
+                    else:
+                        shift.sudo().datetime_end = dtLv + timedelta(seconds=-1)
+                        res["out_altered_ids"] += shift.sudo().hr_attendance_ids.ids
+
+                # Partial day on last day of leave
+                elif (
+                    leave.date_to < shift.datetime_end
+                    and leave.date_to >= shift.datetime_start
+                ):
+                    dtLv = leave.date_to
+                    if leave.date_to != shift.datetime_start:
+                        shift.sudo().datetime_start = dtLv + timedelta(seconds=+1)
+                        res["in_altered_ids"] += shift.sudo().hr_attendance_ids.ids
+
+        att_ids = []
+        for shift in unlink_ids:
+            att_ids += shift.sudo().hr_attendance_ids.ids
+        res["removed_ids"] = att_ids
+        unlink_ids.sudo().unlink()
+        return res
diff --git a/resource_schedule/models/res_company.py b/resource_schedule/models/res_company.py
new file mode 100644
index 00000000..8d1cb119
--- /dev/null
+++ b/resource_schedule/models/res_company.py
@@ -0,0 +1,26 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import api, models
+
+
+class ResCompany(models.Model):
+
+    _inherit = "res.company"
+
+    @api.model
+    def _update_data_resource_calendar(self):
+        self.search([("resource_calendar_id", "!=", False)])._create_resource_calendar()
+
+    def _create_resource_calendar(self):
+
+        super()._create_resource_calendar()
+
+        for company in self:
+            for att in company.resource_calendar_id.attendance_ids:
+                morning = self.env.ref("resource_schedule.attendance_template_0")
+                afternoon = self.env.ref("resource_schedule.attendance_template_1")
+                if not att.template_id and att.hour_from == 8 and att.hour_to == 12:
+                    att.template_id = morning
+                elif not att.template_id and att.hour_from == 13 and att.hour_to == 17:
+                    att.template_id = afternoon
diff --git a/resource_schedule/models/res_config_settings.py b/resource_schedule/models/res_config_settings.py
new file mode 100644
index 00000000..8508f895
--- /dev/null
+++ b/resource_schedule/models/res_config_settings.py
@@ -0,0 +1,14 @@
+# 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 ResConfigSettings(models.TransientModel):
+
+    _inherit = "res.config.settings"
+
+    max_shift_length = fields.Integer(
+        string="Maximum Shift Length",
+        config_parameter="resource_schedule.max_shift_length",
+    )
diff --git a/resource_schedule/models/resource_calendar.py b/resource_schedule/models/resource_calendar.py
new file mode 100644
index 00000000..4eae8ce4
--- /dev/null
+++ b/resource_schedule/models/resource_calendar.py
@@ -0,0 +1,200 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013,2014 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import datetime, timedelta
+
+from odoo import _, api, fields, models
+from odoo.exceptions import ValidationError
+
+
+class ResourceCalendar(models.Model):
+
+    _inherit = "resource.calendar"
+
+    dayoff_type = fields.Selection(
+        [
+            ("fix_all", "Fixed for all"),
+            ("fix_one", "Fixed individualy"),
+            ("rolling", "Rolling weekly"),
+        ],
+        default="fix_all",
+        string="Day off type",
+        help="""
+        Fixed for all - the unscheduled days in the working time apply to all resources.
+        Fixed individually - the days off will be specified in each resource's record. If
+        it is not, the default days off will be used.
+        Rolling weekly - each reasource's day(s) off changes on a weekly basis. For
+        example, if the resource was off on Saturday last week, this week it will be
+        Friday, and next week it will be Thursday.
+        """,
+    )
+    default_dayoff_ids = fields.Many2many(
+        "resource.calendar.weekday", string="Days off"
+    )
+
+    @api.model
+    def default_get(self, fields):
+
+        res = super().default_get(fields)
+
+        # Inject the default work detail templates into the default values
+        #
+        if "attendance_ids" in fields and res.get("attendance_ids", False):
+            morning = self.env.ref("resource_schedule.attendance_template_0")
+            afternoon = self.env.ref("resource_schedule.attendance_template_1")
+            company_id = res.get("company_id", self.env.company.id)
+            company = self.env["res.company"].browse(company_id)
+            company_attendance_ids = company.resource_calendar_id.attendance_ids
+            if company_attendance_ids:
+                for i, attendance in enumerate(company_attendance_ids):
+                    if attendance.template_id:
+                        res["attendance_ids"][i][2].update(
+                            {"template_id": attendance.template_id.id}
+                        )
+            else:
+                for line in res["attendance_ids"]:
+                    if line[2]["hour_from"] == 8:
+                        line[2].update({"template_id": morning.id})
+                    elif line[2]["hour_from"] == 13:
+                        line[2].update({"template_id": afternoon.id})
+
+        return res
+
+    @api.onchange("attendance_ids")
+    def _onchange_attendance_ids(self):
+
+        section_ids = self.attendance_ids.filtered(
+            lambda a: a.display_type == "line_section"
+        )
+        if self.two_weeks_calendar and len(section_ids) > 2:
+            for line in self.attendance_ids:
+                wtype = (line.week_nbr % 2) == 0 and "0" or "1"
+                line.week_type = wtype
+        else:
+            super()._onchange_attendance_ids()
+
+    @api.constrains("attendance_ids")
+    def _check_attendance(self):
+
+        filtered = self.env["resource.calendar"]
+        for calendar in self:
+            # For the moment, don't check work items that contain a night shift
+            #
+            if calendar.attendance_ids.filtered(lambda att: att.span_midnight):
+                continue
+
+            # Check multi-week calendars because the _check_overlap() method in the
+            # parent class expects to check only 2 weeks
+            if calendar.two_weeks_calendar:
+                section_ids = calendar.attendance_ids.filtered(
+                    lambda att: att.display_type == "line_section"
+                )
+                attendance_ids = calendar.attendance_ids.filtered(
+                    lambda attendance: not attendance.resource_id
+                    and attendance.display_type is False
+                )
+                week_list = section_ids.mapped("week_nbr")
+                for nbr in week_list:
+                    attendances = attendance_ids.filtered(
+                        lambda attendance: attendance.week_nbr == nbr
+                    )
+                    if attendances:
+                        calendar._check_overlap(attendances)
+                continue
+
+            # Pass on all the rest
+            filtered |= calendar
+
+        return super(ResourceCalendar, filtered)._check_attendance()
+
+    # Over-ride parent class method to handle more than two weeks and flex schedule
+    def _compute_hours_per_day(self, attendances):
+        if not attendances:
+            return super()._compute_hours_per_day(attendances)
+
+        hour_count = 0.0
+        for attendance in attendances:
+            if attendance.shift_type != "flex":
+                hour_count += attendance.hour_to - attendance.hour_from
+            elif attendance.shift_type == "flex":
+                hour_count += attendance.flex_scheduled_hrs
+            if (
+                attendance.shift_type != "flex"
+                and attendance.template_id
+                and attendance.template_id.autodeduct_break
+            ):
+                hour_count -= float(attendance.template_id.break_minutes) / 60.0
+
+        number_of_days = 0
+        dayofweek = False
+        for att in attendances.sorted("sequence"):
+            if dayofweek is False or att.dayofweek != dayofweek:
+                number_of_days += 1
+                dayofweek = att.dayofweek
+        return fields.Float.round(
+            hour_count / float(number_of_days), precision_digits=2
+        )
+
+    def switch_calendar_type(self):
+
+        super().switch_calendar_type()
+
+        if not self.two_weeks_calendar:
+            return
+
+        for att in self.attendance_ids:
+            if att.sequence < 25:
+                if att.sequence == 0:
+                    att.name = _("Week 0")
+                att.week_nbr = 0
+            else:
+                if att.sequence == 25:
+                    att.name = _("Week 1")
+                att.week_nbr = 1
+
+    def get_rest_days(self):
+        """If the rest day(s) have been explicitly specified that's what is returned, otherwise
+        a guess is returned based on the week days that are not scheduled. If an explicit
+        rest day(s) has not been specified an empty list is returned. If it is able to figure
+        out the rest days it will return a list of week day integers with Monday being 0."""
+
+        res = []
+        for tpl in self:
+            if tpl.restday_ids:
+                res = [rd.sequence for rd in tpl.restday_ids]
+            else:
+                weekdays = ["0", "1", "2", "3", "4", "5", "6"]
+                scheddays = []
+                scheddays = [
+                    wt.dayofweek
+                    for wt in tpl.attendance_ids
+                    if wt.dayofweek not in scheddays
+                ]
+                res = [int(d) for d in weekdays if d not in scheddays]
+                # If there are no work days return nothing instead of *ALL* the days in the week
+                if len(res) == 7:
+                    res = []
+
+        return res
+
+    @api.model
+    def get_hours_by_weekday(self, tpl, day_no):
+        """Return the number working hours in the template for day_no.
+        For day_no 0 is Monday."""
+
+        delta = timedelta(seconds=0)
+        for worktime in tpl.worktime_ids:
+            if int(worktime.dayofweek) != day_no:
+                continue
+
+            fromHour, fromSep, fromMin = worktime.hour_from.partition(":")
+            toHour, toSep, toMin = worktime.hour_to.partition(":")
+            if len(fromSep) == 0 or len(toSep) == 0:
+                raise ValidationError(_("Format of working hours is incorrect"))
+
+            delta += datetime.strptime(
+                toHour + ":" + toMin, "%H:%M"
+            ) - datetime.strptime(fromHour + ":" + fromMin, "%H:%M")
+
+        return float(delta.seconds / 60) / 60.0
diff --git a/resource_schedule/models/resource_calendar_attendance.py b/resource_schedule/models/resource_calendar_attendance.py
new file mode 100644
index 00000000..63f22a85
--- /dev/null
+++ b/resource_schedule/models/resource_calendar_attendance.py
@@ -0,0 +1,298 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import _, api, fields, models
+from odoo.exceptions import ValidationError
+from odoo.tools.float_utils import float_split
+
+
+class ResourceCalendarAttendance(models.Model):
+
+    _inherit = "resource.calendar.attendance"
+    _order = "sequence, week_nbr, dayofweek, hour_from"
+
+    day_period = fields.Selection(
+        selection_add=[
+            ("morning",),
+            ("afternoon",),
+            ("evening", "Evening"),
+            ("8day", "8 Hour Day"),
+            ("12day", "12 Hour Day"),
+            ("12night", "12 Hour Night"),
+        ],
+        ondelete={
+            "evening": "set default",
+            "8day": "set default",
+            "12day": "set default",
+            "12night": "set default",
+        },
+    )
+    template_id = fields.Many2one("resource.calendar.attendance.template")
+    week_nbr = fields.Integer(
+        string="Week", help="The week number in the weekly rotation"
+    )
+    duration = fields.Integer(
+        compute="_compute_duration",
+        store=True,
+        readonly=True,
+        help="Duration of period in seconds",
+    )
+    span_midnight = fields.Boolean(
+        help="This shift crosses over midnight into a new day."
+    )
+    autopunch = fields.Boolean(
+        string="Auto-punch",
+        help="An attendance record will be created automatically for the resource.",
+    )
+    default_area_id = fields.Many2one("resource.schedule.area", check_company=True)
+    schedule_group_ids = fields.Many2many("resource.schedule.group", check_company=True)
+    resource_type = fields.Selection(
+        related="resource_id.resource_type", readonly=True, store=True, index=True
+    )
+    shift_type = fields.Selection(
+        selection=[("std", "Standard Shift"), ("flex", "Flex Shift")],
+        default="std",
+        required=True,
+    )
+    flex_core_from = fields.Float()
+    flex_core_to = fields.Float()
+    flex_scheduled_hrs = fields.Float(
+        help="The resource must work this number of hours per day."
+    )
+    flex_scheduled_avg = fields.Boolean(
+        help="If this option is checked scheduled hours denotes a daily average"
+        "over a period of one week."
+    )
+    flex_weekly_hrs = fields.Float(
+        help="If this value is set the resource must work this number of"
+        "hours total during the week."
+    )
+
+    @api.constrains("shift_type", "autopunch")
+    def _check_autopunch(self):
+        for rec in self:
+            if rec.shift_type == "flex" and rec.autopunch is True:
+                raise ValidationError(_("Auto-punch cannot be used with a Flex Shift"))
+
+    def _copy_attendance_vals(self):
+        self.ensure_one()
+        res = super()._copy_attendance_vals()
+        res.update(
+            {
+                "template_id": self.template_id.id,
+                "span_midnight": self.span_midnight,
+                "autopunch": self.autopunch,
+                "default_area_id": self.default_area_id.id,
+                "schedule_group_ids": [(6, 0, [g.id for g in self.schedule_group_ids])],
+                "shift_type": self.shift_type,
+                "flex_scheduled_hrs": self.flex_scheduled_hrs,
+                "flex_scheduled_avg": self.flex_scheduled_avg,
+                "flex_core_from": self.flex_core_from,
+                "flex_core_to": self.flex_core_to,
+                "flex_weekly_hrs": self.flex_weekly_hrs,
+            }
+        )
+        return res
+
+    @api.onchange("flex_scheduled_hrs")
+    def _onchange_flex_scheduled_hrs(self):
+        for rec in self:
+            if rec.flex_scheduled_hrs < 0:
+                rec.flex_scheduled_hrs = 0
+            elif rec.flex_scheduled_hrs > 24:
+                rec.flex_scheduled_hrs = 24
+
+    @api.onchange("flex_core_from", "flex_core_to", "hour_from", "hour_to")
+    def _onchange_flex(self):
+        for rec in self:
+            # flex_core_* must be 0 or larger than their respective hour_* values
+            if rec.flex_core_from != 0 and rec.hour_from > rec.flex_core_from:
+                rec.hour_from = rec.flex_core_from
+            if rec.flex_core_to != 0 and rec.hour_to < rec.flex_core_to:
+                rec.hour_to = rec.flex_core_to
+
+            # _core_to must be larger than _core_from
+            rec.flex_core_to = max(rec.flex_core_to, rec.flex_core_from)
+
+    @api.onchange("sequence")
+    def _onchange_sequence(self):
+
+        for rec in self:
+            if not rec.calendar_id:
+                continue
+            sections = rec.calendar_id.attendance_ids.filtered(
+                lambda a: a.display_type == "line_section"
+                and a.sequence <= rec.sequence
+            ).sorted("sequence")
+            if sections and sections[-1].sequence == rec.sequence:
+                # If workday was moved into the place of a section header, the section
+                # header sequence hasn't been bumped up yet so it will match the
+                # above filter
+                if len(sections) > 1:
+                    rec.week_nbr = sections[-2].week_nbr
+                    rec._onchange_week_nbr()
+            elif sections:
+                rec.week_nbr = sections[-1].week_nbr
+
+    @api.onchange("week_nbr")
+    def _onchange_week_nbr(self):
+
+        for rec in self:
+            rec.week_type = rec.week_nbr % 2 == 0 and "0" or "1"
+
+    @api.model
+    def _compute_duration_common(self, hour_from, hour_to, span_midnight=False):
+        if not span_midnight:
+            hours, mins = float_split(hour_to - hour_from, precision_digits=2)
+            mins = int(mins * 60 / 100)
+        else:
+            hours, mins = float_split(hour_to - 0, precision_digits=2)
+            _hours, _mins = float_split(24 - hour_from, precision_digits=2)
+            hours += _hours
+            mins += _mins
+        return (hours * 60 * 60) + (mins * 60)
+
+    @api.depends("hour_from", "hour_to")
+    def _compute_duration(self):
+
+        for rec in self:
+            _duration = rec._compute_duration_common(
+                rec.hour_from, rec.hour_to, rec.span_midnight
+            )
+            if rec.template_id and rec.template_id.autodeduct_break:
+                rec.duration = _duration - (rec.template_id.break_minutes * 60)
+            else:
+                rec.duration = _duration
+
+    # This method was created to put all the possible ways of updating a
+    # work record in one place. I don't like that it operates on self
+    # sometimes and returns a dictionary other times. But I thought that
+    # having it all in one method was better than scattered in _onchange()
+    # and create() methods. During testing I kept repeatedly banging against
+    # this problem because I would change the code in one place but forgot
+    # the other place where the values were updated.
+    #
+    def _update_from_template(self, template, is_create=False, values=False):
+
+        if values is False:
+            values = {}
+        if not template:
+            return values
+        if is_create is False:
+            self.name = template.name
+            self.shift_type = template.shift_type
+            self.hour_from = template.hour_from
+            self.hour_to = template.hour_to
+            self.day_period = template.day_period
+            self.span_midnight = template.span_midnight
+            self.autopunch = template.autopunch
+            self.flex_scheduled_hrs = template.flex_scheduled_hrs
+            self.flex_scheduled_avg = template.flex_scheduled_avg
+            self.flex_core_from = template.flex_core_from
+            self.flex_core_to = template.flex_core_to
+            self.flex_weekly_hrs = template.flex_weekly_hrs
+        else:
+            if "shift_type" not in values:
+                values.update({"shift_type": template.shift_type})
+            if "name" not in values:
+                values.update({"name": template.name})
+            if "hour_from" not in values:
+                values.update({"hour_from": template.hour_from})
+            if "hour_to" not in values:
+                values.update({"hour_to": template.hour_to})
+            if "day_period" not in values:
+                values.update({"day_period": template.day_period})
+            if "span_midnight" not in values:
+                values.update({"span_midnight": template.span_midnight})
+            if "autopunch" not in values:
+                values.update({"autopunch": template.autopunch})
+            if "flex_core_from" not in values:
+                values.update({"flex_core_from": template.flex_core_from})
+            if "flex_core_to" not in values:
+                values.update({"flex_core_to": template.flex_core_to})
+            if "flex_scheduled_hrs" not in values:
+                values.update({"flex_scheduled_hrs": template.flex_scheduled_hrs})
+            if "flex_scheduled_avg" not in values:
+                values.update({"flex_scheduled_avg": template.flex_scheduled_avg})
+            if "flex_weekly_hrs" not in values:
+                values.update({"flex_weekly_hrs": template.flex_weekly_hrs})
+        return values
+
+    @api.onchange("template_id")
+    def _onchange_template_id(self):
+        for rec in self:
+            tpl = rec.template_id
+            if tpl:
+                rec._update_from_template(tpl)
+
+    def _fix_week_nbr(self):
+        self.ensure_one()
+
+        sections = self.calendar_id.attendance_ids.filtered(
+            lambda a: a.display_type == "line_section"
+        )
+
+        if len(sections) == 0:
+            # Single week
+            self.week_nbr = 0
+        else:
+            # Multi-week
+            prev_att = False
+            for att in self.calendar_id.attendance_ids.sorted("sequence"):
+                if att.display_type == "line_section":
+                    prev_att = att
+                    continue
+                if att == self:
+                    break
+                prev_att = att
+            if prev_att is False:
+                self.week_nbr = 0
+            else:
+                self.week_nbr = prev_att.week_nbr
+
+    @api.model_create_multi
+    def create(self, values_list):
+
+        for values in values_list:
+            if (
+                "shift_type" in values
+                and values["shift_type"] == "flex"
+                and "autopunch" in values
+                and values["autopunch"] is True
+            ):
+                raise ValidationError(_("Auto-punch cannot be used with a Flex Shift"))
+
+            if "template_id" in values:
+                tpl = self.env["resource.calendar.attendance.template"].browse(
+                    values["template_id"]
+                )
+                res = self._update_from_template(tpl, is_create=True, values=values)
+                values.update(res)
+
+        res = super().create(values_list)
+
+        # First, set the week number for section headers. Keep in mind the created
+        # records may not all belong to the same calendar.
+        for rec in res.filtered(lambda a: a.display_type == "line_section").sorted(
+            "sequence"
+        ):
+            for idx, att in enumerate(
+                rec.calendar_id.attendance_ids.filtered(
+                    lambda a: a.display_type == "line_section"
+                )
+            ):
+                att.week_nbr = idx
+
+        # Handle work days
+        for rec in res.filtered(lambda a: a.display_type is False).sorted("sequence"):
+            rec._fix_week_nbr()
+            rec.week_type = rec.week_nbr % 2 == 0 and "0" or "1"
+
+        return res
+
+    def write(self, values):
+
+        res = super().write(values)
+        if "sequence" in values:
+            self._onchange_sequence()
+        return res
diff --git a/resource_schedule/models/resource_calendar_attendance_open.py b/resource_schedule/models/resource_calendar_attendance_open.py
new file mode 100644
index 00000000..107b1157
--- /dev/null
+++ b/resource_schedule/models/resource_calendar_attendance_open.py
@@ -0,0 +1,12 @@
+# 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 ResourceCalendarShiftTemplateOpen(models.Model):
+    _name = "resource.calendar.attendance.open"
+    _inherit = "resource.calendar.attendance"
+    _description = "Resource Open Shift Template"
+
+    available = fields.Integer(help="The number of shifts available for pickup.")
diff --git a/resource_schedule/models/resource_calendar_attendance_template.py b/resource_schedule/models/resource_calendar_attendance_template.py
new file mode 100644
index 00000000..df7db291
--- /dev/null
+++ b/resource_schedule/models/resource_calendar_attendance_template.py
@@ -0,0 +1,96 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import _, api, fields, models
+from odoo.exceptions import ValidationError
+
+
+class ResourceCalendarAttendanceTemplate(models.Model):
+
+    _name = "resource.calendar.attendance.template"
+    _description = "Work Detail Template"
+
+    name = fields.Char(required=True)
+    hour_from = fields.Float(string="Work from", required=True, index=True)
+    hour_to = fields.Float(string="Work to", required=True)
+    day_period = fields.Selection(
+        selection=[
+            ("morning", "Morning"),
+            ("afternoon", "Afternoon"),
+            ("evening", "Evening"),
+            ("8day", "Work day"),
+            ("12day", "All day"),
+            ("12night", "All night"),
+        ],
+        required=True,
+    )
+    span_midnight = fields.Boolean(
+        help="This shift crosses over midnight into a new day."
+    )
+    auto_splitshift = fields.Boolean(
+        string="Automatically split shifts at midnight",
+        help="When a shift crosses over into a new calendar day close out the"
+        "current shift and start a new shift.",
+    )
+    autopunch = fields.Boolean(
+        help="An attendance record will be created automatically for the resource."
+    )
+    autodeduct_break = fields.Boolean(string="Auto-deduct break")
+    break_minutes = fields.Integer(
+        help="The number of minutes to deduct for breaks from the scheduled time."
+    )
+    default_area_id = fields.Many2one("resource.schedule.area")
+    schedule_group_ids = fields.Many2many(
+        "resource.schedule.group", "resource_attendance_template_schedule_group_rel"
+    )
+    shift_type = fields.Selection(
+        selection=[("std", "Standard"), ("flex", "Flex Shift")],
+        default="std",
+        required=True,
+    )
+    flex_core_from = fields.Float(default=0)
+    flex_core_to = fields.Float(default=0)
+    flex_scheduled_hrs = fields.Float()
+    flex_scheduled_avg = fields.Boolean(
+        help="If this option is checked scheduled hours denotes a daily average"
+        "over a period of one week."
+    )
+    flex_weekly_hrs = fields.Float(
+        help="If this value is set the resource must work this number of"
+        "hours total during the week."
+    )
+    active = fields.Boolean(default=True)
+    company_id = fields.Many2one("res.company", default=lambda s: s.env.company)
+
+    @api.constrains("shift_type", "autopunch")
+    def _check_autopunch(self):
+        for rec in self:
+            if rec.shift_type == "flex" and rec.autopunch is True:
+                raise ValidationError(_("Auto-punch cannot be used with a Flex Shift"))
+
+    @api.constrains("shift_type", "autodeduct_break")
+    def _check_autodeduct_break(self):
+        for rec in self:
+            if rec.shift_type == "flex" and rec.autodeduct_break is True:
+                raise ValidationError(
+                    _("Auto-deduct break time cannot be used with a Flex Shift")
+                )
+
+    @api.onchange("flex_scheduled_hrs")
+    def _onchange_flex_scheduled_hrs(self):
+        for rec in self:
+            if rec.flex_scheduled_hrs < 0:
+                rec.flex_scheduled_hrs = 0
+            elif rec.flex_scheduled_hrs > 24:
+                rec.flex_scheduled_hrs = 24
+
+    @api.onchange("flex_core_from", "flex_core_to", "hour_from", "hour_to")
+    def _onchange_flex(self):
+        for rec in self:
+            if rec.flex_core_from != 0 and rec.hour_from > rec.flex_core_from:
+                rec.hour_from = rec.flex_core_from
+            if rec.flex_core_to != 0 and rec.hour_to < rec.flex_core_to:
+                rec.hour_to = rec.flex_core_to
+            if rec.flex_core_from != 0 and rec.flex_core_to != 0:
+                if rec.flex_core_to < rec.flex_core_from:
+                    rec.flex_core_to = rec.flex_core_from
diff --git a/resource_schedule/models/resource_calendar_weekday.py b/resource_schedule/models/resource_calendar_weekday.py
new file mode 100644
index 00000000..d8deb1b4
--- /dev/null
+++ b/resource_schedule/models/resource_calendar_weekday.py
@@ -0,0 +1,13 @@
+# 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 ResourceCalendarWeekday(models.Model):
+
+    _name = "resource.calendar.weekday"
+    _description = "Calendar Weekdays"
+
+    name = fields.Char(required=True)
+    dayofweek = fields.Char(required=True)
diff --git a/resource_schedule/models/resource_resource.py b/resource_schedule/models/resource_resource.py
new file mode 100644
index 00000000..af3f651c
--- /dev/null
+++ b/resource_schedule/models/resource_resource.py
@@ -0,0 +1,19 @@
+# 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 ResourceResource(models.Model):
+    _inherit = "resource.resource"
+
+    dayoff_ids = fields.Many2many("resource.calendar.weekday", string="Days off")
+    default_area_id = fields.Many2one("resource.schedule.area", "Default shift area")
+    scheduled_shift_ids = fields.One2many("resource.schedule.shift", "resource_id")
+    schedule_team_id = fields.Many2one("resource.schedule.team", "Shift team")
+
+    def create_schedule(self, date_start, date_end, calendar=None):
+
+        resources = self
+        ScheduleShift = self.env["resource.schedule.shift"]
+        return ScheduleShift.create_schedule(resources, date_start, date_end, calendar)
diff --git a/resource_schedule/models/resource_schedule_area.py b/resource_schedule/models/resource_schedule_area.py
new file mode 100644
index 00000000..1027cb7d
--- /dev/null
+++ b/resource_schedule/models/resource_schedule_area.py
@@ -0,0 +1,21 @@
+# 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 HrScheduleArea(models.Model):
+    _name = "resource.schedule.area"
+    _description = "Scheduling Area"
+    _check_company_auto = True
+
+    name = fields.Char(required=True)
+    company_id = fields.Many2one("res.company", default=lambda self: self.env.company)
+    active = fields.Boolean(default=True)
+    resource_ids = fields.One2many("resource.resource", "default_area_id")
+    resource_count = fields.Integer(compute="_compute_resource_count")
+    color = fields.Integer(string="Color Index")
+
+    def _compute_resource_count(self):
+        for area in self:
+            area.resource_count = len(area.resource_ids)
diff --git a/resource_schedule/models/resource_schedule_autopunch.py b/resource_schedule/models/resource_schedule_autopunch.py
new file mode 100644
index 00000000..ef7fc0cc
--- /dev/null
+++ b/resource_schedule/models/resource_schedule_autopunch.py
@@ -0,0 +1,21 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import api, fields, models
+
+
+class AutopunchLastrun(models.Model):
+
+    _name = "resource.schedule.autopunch.lastrun"
+    _description = "Schedule auto-punch last run-time"
+    _order = "name desc"
+
+    name = fields.Datetime()
+    record_ids = fields.Many2many("hr.attendance")
+    record_count = fields.Integer(compute="_compute_record_count")
+
+    @api.depends("record_ids")
+    def _compute_record_count(self):
+
+        for rec in self:
+            rec.record_count = len(rec.record_ids)
diff --git a/resource_schedule/models/resource_schedule_group.py b/resource_schedule/models/resource_schedule_group.py
new file mode 100644
index 00000000..21ca8619
--- /dev/null
+++ b/resource_schedule/models/resource_schedule_group.py
@@ -0,0 +1,25 @@
+# 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 HrScheduleGroup(models.Model):
+    _name = "resource.schedule.group"
+    _description = "Resource Scheduling Group"
+    _check_company_auto = True
+
+    name = fields.Char(required=True)
+    company_id = fields.Many2one("res.company", default=lambda self: self.env.company)
+    manager_ids = fields.Many2many("res.users")
+    attendance_template_ids = fields.Many2many(
+        "resource.calendar.attendance.template",
+        "resource_attendance_template_schedule_group_rel",
+        string="Work Detail Template",
+    )
+    template_count = fields.Integer(compute="_compute_template_count")
+    active = fields.Boolean(default=True)
+
+    def _compute_template_count(self):
+        for rec in self:
+            rec.template_count = len(rec.attendance_template_ids)
diff --git a/resource_schedule/models/resource_schedule_shift.py b/resource_schedule/models/resource_schedule_shift.py
new file mode 100644
index 00000000..f8d69517
--- /dev/null
+++ b/resource_schedule/models/resource_schedule_shift.py
@@ -0,0 +1,574 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import date, datetime, timedelta
+
+from dateutil.relativedelta import relativedelta
+from pytz import timezone, utc
+
+from odoo import _, api, fields, models
+from odoo.exceptions import ValidationError
+
+from odoo.addons.resource.models.resource import float_to_time
+
+
+class ResourceScheduleShift(models.Model):
+
+    _name = "resource.schedule.shift"
+    _inherit = "resource.calendar.attendance"
+    _description = "Resource Shift"
+    _order = "datetime_start"
+    _check_company_auto = True
+
+    calendar_id = fields.Many2one(ondelete="restrict")
+    name = fields.Char(
+        compute="_compute_name", required=False, readonly=True, store=True
+    )
+    hour_from = fields.Float(
+        compute="_compute_name", required=False, index=False, store=True
+    )
+    hour_to = fields.Float(
+        compute="_compute_name", required=False, index=False, store=True
+    )
+    autopunch = fields.Boolean(index=True)
+    datetime_start = fields.Datetime(string="Start", required=True)
+    datetime_end = fields.Datetime(string="End", required=True)
+    day = fields.Date(compute="_compute_name", store=True, index=True)
+    employee_id = fields.Many2one(
+        "hr.employee",
+        compute="_compute_employee_id",
+        store=True,
+        index=True,
+        check_company=True,
+    )
+    department_id = fields.Many2one(
+        comodel_name="hr.department",
+        string="Department",
+        related="employee_id.department_id",
+        store=True,
+        check_company=True,
+    )
+    schedule_team_id = fields.Many2one(
+        "resource.schedule.team", related="resource_id.schedule_team_id", string="Team"
+    )
+    company_id = fields.Many2one("res.company", default=lambda self: self.env.company)
+    tz = fields.Selection(
+        related="resource_id.tz",
+        default=lambda self: self._context.get("tz") or self.env.user.tz or "UTC",
+        readonly=True,
+        store=True,
+    )
+    published = fields.Boolean(string="Publish")
+    hr_attendance_ids = fields.One2many(
+        "hr.attendance", "schedule_shift_id", "Attendance Records"
+    )
+
+    def name_get(self):
+
+        HOUR_FORMAT = "%I:%M %p"
+        res = []
+        for rec in self:
+            if not rec.datetime_start or not rec.datetime_end:
+                continue
+            local_tz = timezone(rec.tz)
+            tzDtStart = utc.localize(rec.datetime_start, is_dst=False).astimezone(
+                local_tz
+            )
+            tzDtEnd = utc.localize(rec.datetime_end, is_dst=False).astimezone(local_tz)
+            strFrom = tzDtStart.strftime(HOUR_FORMAT)
+            strTo = tzDtEnd.strftime(HOUR_FORMAT)
+            mins, _secs = divmod(rec.duration, 60)
+            hours, mins = divmod(mins, 60)
+            res.append((rec.id, f"{strFrom} - {strTo} ({hours}h{mins}m)"))
+
+        return res
+
+    # https://www.odoo.com/forum/help-1/convert-hours-and-minute-into-float-value-168236
+    @api.model
+    def time2float(self, value):
+        vals = value.split(":")
+        t, hours = divmod(float(vals[0]), 24)
+        t, minutes = divmod(float(vals[1]), 60)
+        minutes = minutes / 60.0
+        return hours + minutes
+
+    @api.depends("datetime_start", "datetime_end")
+    def _compute_name(self):
+
+        for rec in self:
+            if not rec.datetime_start or not rec.datetime_end:
+                continue
+            rec.name = rec.name_get()[0][1]
+            rec.day = rec.datetime_start.date()
+            rec.hour_from = rec.time2float(
+                rec.localize_dt(rec.datetime_start, rec.tz).strftime("%H:%M")
+            )
+            rec.hour_to = rec.time2float(
+                rec.localize_dt(rec.datetime_end, rec.tz).strftime("%H:%M")
+            )
+        return
+
+    @api.depends("resource_id")
+    def _compute_employee_id(self):
+        for shift in self:
+            employee = self.env["hr.employee"].search(
+                [("resource_id", "=", shift.resource_id.id)],
+                limit=1,
+            )
+            shift.employee_id = employee
+
+    def _update_default_area(self):
+        for rec in self:
+            # Default area on resource takes precedence.
+            if rec.resource_id.default_area_id:
+                rec.default_area_id = rec.resource_id.default_area_id
+            elif rec.template_id.default_area_id:
+                rec.default_area_id = rec.template_id.default_area_id
+
+    # Over-ride behaviour in parent class
+    # @api.depends("template_id")
+    # def _onchange_template_id(self):
+    #     return
+
+    @api.onchange("resource_id")
+    def onchange_resource_id(self):
+        for rec in self:
+            rec.calendar_id = rec.resource_id.calendar_id
+            rec._update_default_area()
+
+    @api.onchange("calendar_id")
+    def onchange_calendar_id(self):
+        for rec in self:
+            today = date.today()
+            if rec.datetime_start:
+                today = rec.datetime_start.date()
+            if rec.calendar_id:
+                attendance = False
+                for detail in rec.calendar_id.attendance_ids:
+                    if detail.dayofweek == str(today.weekday()):
+                        attendance = detail
+                        break
+                if attendance:
+                    dtStart = datetime.combine(
+                        today, float_to_time(attendance.hour_from)
+                    )
+                    dtEnd = datetime.combine(today, float_to_time(attendance.hour_to))
+                    dtStart = self.localize_dt(dtStart, rec.tz, reverse=True)
+                    dtEnd = self.localize_dt(dtEnd, rec.tz, reverse=True)
+                    rec.template_id = attendance.template_id
+                    rec.day_period = attendance.day_period
+                    rec.datetime_start = dtStart
+                    rec.datetime_end = dtEnd
+                    rec.dayofweek = str(dtStart.date().weekday())
+                else:
+                    rec.template_id = False
+                    rec.day_period = False
+                    rec.dayofweek = str(today.weekday())
+                    rec.hour_from = False
+                    rec.hour_to = False
+
+    @api.onchange("template_id")
+    def onchange_template_id(self):
+        for rec in self:
+            rec._update_default_area()
+
+    def datetimes_naive_utc(self):
+
+        res = [shift._datetimes_naive_utc() for shift in self]
+        return res
+
+    def _datetimes_naive_utc(self):
+
+        self.ensure_one()
+        return (self.datetime_start, self.datetime_end, self)
+
+    def datetimes_naive_tz(self):
+
+        res = [shift._datetimes_naive_tz() for shift in self]
+        return res
+
+    def _datetimes_naive_tz(self):
+
+        self.ensure_one()
+        ltz = timezone(self.tz)
+        return (
+            utc.localize(self.datetime_start, is_dst=False)
+            .astimezone(ltz)
+            .replace(tzinfo=None),
+            utc.localize(self.datetime_end, is_dst=False)
+            .astimezone(ltz)
+            .replace(tzinfo=None),
+            self,
+        )
+
+    @api.model
+    def localize_dt(self, dt, tz, reverse=False):
+        """
+        Localize naive dt from database (UTC) to timzezone tz. If reverse is True
+        a naive dt that is in timezone tz is converted to naive dt for storage in db.
+        """
+
+        local_tz = timezone(tz)
+        if not reverse:
+            res = utc.localize(dt, is_dst=False).astimezone(local_tz)
+        else:
+            res = (
+                local_tz.localize(dt, is_dst=False).astimezone(utc).replace(tzinfo=None)
+            )
+        return res
+
+    @api.model
+    def get_daysoff(self, resource, calendar, date_start, date_end):
+        def _get_preceding_weekday(day_list):
+            _d = int(day_list[-1])
+            _daysoff = []
+            # Rolling days off means every 7 weeks both monday and sunday are off.
+            # If we get either in a  week it means both. So, saturday is next.
+            if _d in [0, 6]:
+                _daysoff = ["5"]
+            elif _d == 1:
+                # Same as above. If last week was tuesday, this week is mon & sun
+                _daysoff = ["0", "6"]
+            else:
+                _daysoff = [str(_d - 1)]
+            return _daysoff
+
+        res = []
+        weeks = abs(date_end - date_start).days // 7 + 2
+        if calendar.dayoff_type == "fix_one":
+            daysoff = calendar.default_dayoff_ids.mapped("dayofweek")
+            if len(resource.dayoff_ids) > 0:
+                daysoff = resource.dayoff_ids.mapped("dayofweek")
+            for _i in range(weeks):
+                res.append(daysoff)
+        elif calendar.dayoff_type == "rolling":
+            # Was there a day off within the last
+            # 7 days? If so, move backward one day. Otherwise, use the
+            # default days in the resource or the working times.
+            #
+            daysoff = []
+            week_list = ["0", "1", "2", "3", "4", "5", "6"]
+            date_lastweek = date_start - timedelta(days=7)
+            shifts = self.search(
+                [
+                    ("resource_id", "=", resource.id),
+                    ("datetime_start", "<", date_start),
+                    ("datetime_start", ">=", date_lastweek),
+                ],
+            )
+            if len(shifts) > 0:
+                _tmp = shifts.mapped("dayofweek")
+                daysoff = [x for x in week_list if x not in _tmp]
+                daysoff = _get_preceding_weekday(daysoff)
+            else:
+                if len(resource.dayoff_ids) > 0:
+                    daysoff = resource.dayoff_ids.mapped("dayofweek")
+                else:
+                    daysoff = calendar.default_dayoff_ids.mapped("dayofweek")
+
+            # Set the days off for the rest of the weeks
+            #
+            res.append(daysoff)
+            for _i in range(weeks - 1):
+                daysoff = _get_preceding_weekday(daysoff)
+                res.append(daysoff)
+
+        else:
+            # Fixed day off for all
+            for _i in range(weeks):
+                res.append([])
+
+        return res
+
+    @api.model
+    def autopunch_shifts(self):
+        now = fields.Datetime.now()
+        return self._autopunch_shifts(now)
+
+    @api.model
+    def _autopunch_shifts(self, now):
+
+        res = self.env["hr.attendance"]
+        dToday = now.date()
+        dLastRun = dToday
+        today = False
+
+        # Begin creating autopunches from the last time this code ran
+        lastrun = self.env["resource.schedule.autopunch.lastrun"].search([], limit=1)
+        if len(lastrun) > 0:
+            dLastRun = lastrun.name.date()
+        if dLastRun < dToday:
+            today = dLastRun
+        elif dLastRun == dToday:
+            today = dToday
+        else:
+            return res
+
+        while today <= dToday:
+            _now = now
+            if today < dToday:
+                _now = datetime.combine(today, datetime.max.time())
+
+            shifts = self.search(
+                [
+                    ("autopunch", "=", True),
+                    ("day", "=", today),
+                ]
+            )
+            employees = shifts.mapped("employee_id")
+            for ee in employees:
+                details = shifts.filtered(lambda sh: sh.employee_id == ee)
+                if len(details) == 0:
+                    continue
+
+                res |= self.check_and_create_autopunch(ee, details, _now)
+
+            today += timedelta(days=1)
+
+        # Log this run
+        self.env["resource.schedule.autopunch.lastrun"].create(
+            {
+                "name": now,
+                "record_ids": [(6, 0, res.ids)],
+            }
+        )
+
+        return res.sorted(None)
+
+    @api.model
+    def check_and_create_autopunch(self, employee, details, now):
+        """Checks for attendance records that match the details given and if none
+        exist it will create attendance records according to those details. If any
+        are created it will return the records created.
+        :param employee: the employee whose shift schedule to check
+        :type employee: :class:`~hr.employee`
+        :param :class:`~resource.schedule.shift` details: The work details to check
+        :param datetime now: the current UTC datetime in naive datetime format.
+        :returns: :class:`~hr.attendance`
+        """
+
+        res = self.env["hr.attendance"]
+        details = details.filtered(lambda d: d.autopunch is True)
+        if not details:
+            return res
+
+        # We assume details are in correct order
+        dtStart = details[0].datetime_start
+        dtEnd = details[-1].datetime_end
+
+        # Are there already attendance records for today?
+        punches = self.env["hr.attendance"].search(
+            [
+                ("employee_id", "=", employee.id),
+                ("check_in", ">=", dtStart),
+                ("check_in", "<", dtEnd),
+                "|",
+                ("check_out", "=", False),
+                ("check_out", "<", dtEnd),
+            ]
+        )
+
+        HrAttendance = self.env["hr.attendance"]
+
+        # No attendance, do all up to now
+        if len(punches) == 0:
+            for detail in details:
+                if detail.datetime_start > now:
+                    continue
+
+                values = {
+                    "employee_id": employee.id,
+                    "check_in": detail.datetime_start,
+                    "autopunch": True,
+                    "schedule_shift_id": detail.id,
+                }
+                if detail.datetime_end <= now:
+                    values.update({"check_out": detail.datetime_end})
+                res |= HrAttendance.create(values)
+        # We have partial or full attendance records
+        elif len(punches) > 0:
+            for detail in details:
+                if detail.datetime_start > now:
+                    continue
+                # We have a detail who's start time has passed
+
+                found = False
+                for punch in punches:
+                    if punch.check_in == detail.datetime_start:
+                        # We've found a corresponding punch time
+                        found = True
+                        if not punch.check_out:
+                            punch.check_out = detail.datetime_end
+                            res |= punch
+                            break
+                # If we didn't find a matching punch create a new one
+                if found is False:
+                    values = {
+                        "employee_id": employee.id,
+                        "check_in": detail.datetime_start,
+                        "autopunch": True,
+                        "schedule_shift_id": detail.id,
+                    }
+                    if detail.datetime_end <= now:
+                        values.update({"check_out": detail.datetime_end})
+                    res |= HrAttendance.create(values)
+        return res.sorted(None)
+
+    @api.model
+    def _get_calendar_and_start_week(self, resource, calendar):
+
+        # If no calendar is specified use working time (calendar) in following order:
+        #     - Team working time
+        #     - Resource working time
+        #
+        start_week = 0
+        if calendar is None:
+            if resource.schedule_team_id:
+                start_week = resource.schedule_team_id.start_week
+                calendar = resource.schedule_team_id.resource_calendar_id
+            else:
+                calendar = resource.calendar_id
+        return (calendar, start_week)
+
+    @api.model
+    def create_schedule(self, resources, date_start, date_end, calendar=None):
+
+        res = self.env["resource.schedule.shift"]
+        for resource in resources:
+            res |= self._create_schedule(resource, date_start, date_end, calendar)
+        return res
+
+    @api.model
+    def _create_schedule(self, resource, date_start, date_end, calendar=None):
+        """
+        Create schedule (shifts) for resource based on calendar (or calendar_id
+        of resource, if not specified) between date_start and date_end.
+        """
+
+        if date_start > date_end:
+            raise ValidationError(
+                _("While creating schedules end date cannot be less than start date.")
+            )
+
+        schedule_week = 0
+        max_week = 0
+        calendar, schedule_week = self._get_calendar_and_start_week(resource, calendar)
+        if calendar.attendance_ids:
+            max_week = calendar.attendance_ids.sorted("sequence")[-1].week_nbr
+
+        week = 0
+        values_list = []
+        daysoff = self.get_daysoff(resource, calendar, date_start, date_end)
+        delta = timedelta(days=1)
+        dTmp = date_start
+        while dTmp <= date_end:
+
+            if calendar.two_weeks_calendar:
+                scheduled_days = calendar.attendance_ids.filtered(
+                    lambda a: a.week_nbr == schedule_week and a.display_type is False
+                ).mapped("dayofweek")
+            else:
+                scheduled_days = calendar.attendance_ids.mapped("dayofweek")
+
+            startFlag = True
+            prev_weekday = str(dTmp.weekday())
+            for attendance in calendar.attendance_ids.filtered(
+                lambda a: a.display_type is False and a.week_nbr == schedule_week
+            ):
+
+                # skip ahead to the attendance_id corresponding to the
+                # week day of date_start
+                if startFlag and int(attendance.dayofweek) < dTmp.weekday():
+                    continue
+                else:
+                    startFlag = False
+
+                # If the week day of the attendance is different than the
+                # previous processed record move the date forward one day.
+                if attendance.dayofweek != prev_weekday:
+                    dTmp += delta
+
+                # If we're past the end date stop any further processing
+                if dTmp > date_end:
+                    break
+
+                # If this is a day off skip ahead to the next attendance_id
+                if attendance.dayofweek in daysoff[week]:
+                    continue
+
+                # If the week day is not in attendance_ids move the date
+                # forward one day until we hit next scheduled day.
+                if str(dTmp.weekday()) not in scheduled_days:
+                    break
+
+                dtStart = datetime.combine(dTmp, float_to_time(attendance.hour_from))
+                if attendance.span_midnight:
+                    dtEnd = datetime.combine(
+                        dTmp + timedelta(days=1), float_to_time(attendance.hour_to)
+                    )
+                else:
+                    dtEnd = datetime.combine(dTmp, float_to_time(attendance.hour_to))
+                dtStart = self.localize_dt(dtStart, calendar.tz, reverse=True)
+                dtEnd = self.localize_dt(dtEnd, calendar.tz, reverse=True)
+                values = {
+                    "resource_id": resource.id,
+                    "calendar_id": calendar.id,
+                    "template_id": attendance.template_id.id,
+                    "datetime_start": dtStart,
+                    "datetime_end": dtEnd,
+                    "dayofweek": str(dTmp.weekday()),
+                    "day_period": attendance.day_period,
+                    "span_midnight": attendance.span_midnight,
+                    "autopunch": attendance.autopunch,
+                    "sequence": attendance.sequence,
+                    "shift_type": attendance.shift_type,
+                    "flex_core_from": attendance.flex_core_from,
+                    "flex_core_to": attendance.flex_core_to,
+                    "flex_scheduled_hrs": attendance.flex_scheduled_hrs,
+                    "flex_scheduled_avg": attendance.flex_scheduled_avg,
+                    "flex_weekly_hrs": attendance.flex_weekly_hrs,
+                }
+                values_list.append(values)
+                prev_weekday = str(dTmp.weekday())
+
+            dTmp += delta
+            if dTmp != date_start and dTmp.weekday() == 0:
+                week += 1
+                if max_week and schedule_week == max_week:
+                    schedule_week = 0
+                elif max_week:
+                    schedule_week += 1
+
+        return self.create(values_list)
+
+    @api.model
+    def creat_mass_schedule(self):
+
+        # Create a two-week schedule beginning from Monday of next week.
+        #
+        dt = datetime.today()
+        days = 7 - dt.weekday()
+        dt += relativedelta(days=+days)
+        dStart = dt.date()
+        dEnd = dStart + relativedelta(weeks=+1, days=-1)
+
+        # Create schedules for each employee in each department
+        #
+        depts = self.env["hr.department"].search([])
+        for dept in depts:
+            ee_ids = self.env["hr.employee"].search(
+                [("department_id", "=", dept.id)], order="name"
+            )
+            ee_ids.filtered(
+                lambda ee: ee.contract_id and ee.contract_id.resource_calendar_id
+            )
+            for ee in ee_ids:
+                ee.create_schedule(dStart, dEnd)
+
+    def publish(self):
+
+        self.published = True
+
+    def unpublish(self):
+
+        self.published = False
diff --git a/resource_schedule/models/resource_schedule_team.py b/resource_schedule/models/resource_schedule_team.py
new file mode 100644
index 00000000..4720d86c
--- /dev/null
+++ b/resource_schedule/models/resource_schedule_team.py
@@ -0,0 +1,31 @@
+# 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 ResourceScheduleTeam(models.Model):
+
+    _name = "resource.schedule.team"
+    _description = "Scheduling Shift Team"
+
+    name = fields.Char()
+    resource_ids = fields.One2many("resource.resource", "schedule_team_id", "Resources")
+    resource_count = fields.Integer(compute="_compute_resource_count")
+    resource_calendar_id = fields.Many2one("resource.calendar", "Working Times")
+    start_week = fields.Integer(
+        default=0,
+        help="In multi-week schedule rotation this denotes the week number on"
+        "which this team will start the rotation. In single week schedules leave"
+        "this value at 0.",
+    )
+    company_id = fields.Many2one("res.company", default=lambda self: self.env.company)
+    active = fields.Boolean(default=True)
+    color = fields.Integer(string="Color Index")
+    scheduled_shift_ids = fields.One2many(
+        "resource.schedule.shift", "schedule_team_id", "Scheduled Shifts"
+    )
+
+    def _compute_resource_count(self):
+        for team in self:
+            team.resource_count = len(team.resource_ids)
diff --git a/resource_schedule/readme/CREDITS.rst b/resource_schedule/readme/CREDITS.rst
new file mode 100644
index 00000000..d264bc7e
--- /dev/null
+++ b/resource_schedule/readme/CREDITS.rst
@@ -0,0 +1 @@
+* Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/resource_schedule/readme/DESCRIPTION.rst b/resource_schedule/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..8deb51cb
--- /dev/null
+++ b/resource_schedule/readme/DESCRIPTION.rst
@@ -0,0 +1,8 @@
+Easily create, manage, and track employee shift planning.
+
+#. Work Detail Templates - templates describe a shift for one day. For example: 8 a.m to 5 p.m.
+#. Work Detail - the Odoo record for describing a day in a Work Time. These records can get their settings from a Work Detail Template.
+#. Work Time - the Odoo record for describing a weekly schedule.
+#. Shift Schedule - the actual times that an employee is scheduled to work on a specific day.
+#. Schedule Area - the area the employee is assigned to for a shift. For example, in a hotel with multiple dinning rooms all serving staff may have the same shifts but be assigned to different dinning rooms.
+#. Schedule Group - schedule groups allow an organization to split employees into groups. Schedule groups can have their own work detail templates and managers who are responsible for managing shifts.
diff --git a/resource_schedule/readme/ROADMAP.rst b/resource_schedule/readme/ROADMAP.rst
new file mode 100644
index 00000000..1015d58a
--- /dev/null
+++ b/resource_schedule/readme/ROADMAP.rst
@@ -0,0 +1 @@
+* When demo data is enabled and the module is updated you may encounter and error the the demo data failed to install. This error may safely be ignored.
diff --git a/resource_schedule/security/groups.xml b/resource_schedule/security/groups.xml
new file mode 100644
index 00000000..9df6803f
--- /dev/null
+++ b/resource_schedule/security/groups.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data noupdate="1">
+
+        <!-- Scheduling Security -->
+
+        <record id="group_scheduling_user" model="res.groups">
+            <field name="name">User</field>
+            <field name="category_id" ref="module_category_scheduling" />
+            <field name="users" eval="[(4, ref('base.user_admin'))]" />
+            <field
+                name="comment"
+            >the user will be able to create shifts, shift templates, and assign users</field>
+        </record>
+
+        <record id="group_scheduling_manager" model="res.groups">
+            <field name="name">Manager</field>
+            <field name="category_id" ref="module_category_scheduling" />
+            <field name="users" eval="[(4, ref('base.user_admin'))]" />
+            <field
+                name="comment"
+            >the user will be able to configure the scheduling module</field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/resource_schedule/security/ir.model.access.csv b/resource_schedule/security/ir.model.access.csv
new file mode 100644
index 00000000..e3d1eaf4
--- /dev/null
+++ b/resource_schedule/security/ir.model.access.csv
@@ -0,0 +1,22 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_schedule_user,access_hr_schedule,model_resource_schedule_shift,base.group_user,1,0,0,0
+access_hr_schedule_hruser,access_hr_schedule,model_resource_schedule_shift,group_scheduling_user,1,1,1,1
+access_resource_calendar_attendance_template_user,access_resource_calendar_attendance_template,model_resource_calendar_attendance_template,base.group_user,1,0,0,0
+access_resource_calendar_attendance_template_manager,access_resource_calendar_attendance_template,model_resource_calendar_attendance_template,group_scheduling_manager,1,1,1,1
+access_resource_calendar_attendance_open_user,access_resource_calendar_attendance_open,model_resource_calendar_attendance_open,base.group_user,1,0,0,0
+access_resource_calendar_attendance_open_hruser,access_resource_calendar_attendance_open,model_resource_calendar_attendance_open,group_scheduling_user,1,1,1,1
+access_hr_schedule_detail_hruser,access_hr_schedule_detail,resource.model_resource_calendar_attendance,group_scheduling_user,1,0,0,0
+access_hr_schedule_detail_manager,access_hr_schedule_detail,resource.model_resource_calendar_attendance,group_scheduling_manager,1,1,1,1
+access_hr_schedule_template_hruser,access_hr_schedule_template,resource.model_resource_calendar,group_scheduling_user,1,0,0,0
+access_hr_schedule_template_manager,access_hr_schedule_template,resource.model_resource_calendar,group_scheduling_manager,1,1,1,1
+access_resource_schedule_area_hruser,access_resource_schedule_area,model_resource_schedule_area,group_scheduling_user,1,0,0,0
+access_resource_schedule_area_manager,access_resource_schedule_area,model_resource_schedule_area,group_scheduling_manager,1,1,1,1
+access_resource_schedule_group_hruser,access_resource_schedule_group,model_resource_schedule_group,group_scheduling_user,1,0,0,0
+access_resource_schedule_group_manager,access_resource_schedule_group,model_resource_schedule_group,group_scheduling_manager,1,1,1,1
+access_resource_schedule_generate_officer,access_resource_schedule_generate,model_resource_schedule_generate,group_scheduling_user,1,1,1,1
+access_resource_calendar_weekday,access_resource_calendar_weekday,model_resource_calendar_weekday,base.group_user,1,0,0,0
+access_resource_calendar_weekday_manager,access_resource_calendar_weekday,model_resource_calendar_weekday,group_scheduling_manager,1,1,1,1
+access_resource_schedule_validate_departments,access_resource_schedule_validate_departments,model_resource_schedule_validate_departments,group_scheduling_user,1,1,1,1
+access_resource_schedule_shift_autopunch_lastrun,access_resource_schedule_shift_autopunch_lastrun,model_resource_schedule_autopunch_lastrun,base.group_user,1,0,0,0
+access_resource_schedule_team,access_resource_schedule_team,model_resource_schedule_team,base.group_user,1,0,0,0
+access_resource_schedule_team_manager,access_resource_schedule_team,model_resource_schedule_team,group_scheduling_manager,1,1,1,1
diff --git a/resource_schedule/security/ir_rule.xml b/resource_schedule/security/ir_rule.xml
new file mode 100644
index 00000000..81caaf08
--- /dev/null
+++ b/resource_schedule/security/ir_rule.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" ?>
+<odoo>
+  <data noupdate="1">
+
+    <!-- Record Rules: Schedules -->
+
+    <record id="property_rule_schedule_employee" model="ir.rule">
+        <field name="name">Schedule: Own and Employees</field>
+        <field name="model_id" ref="model_hr_schedule" />
+        <field name="domain_force">
+            [
+                '|',
+                ('employee_id.user_id','=',user.id),
+                ('employee_id.department_id.manager_id.user_id', '=', user.id),
+            ]
+        </field>
+        <field name="groups" eval="[(4,ref('base.group_user'))]" />
+    </record>
+
+    <record id="property_rule_schedule_officer" model="ir.rule">
+        <field name="name">Schedule: Scheduling group manager</field>
+        <field name="model_id" ref="model_hr_schedule" />
+        <field name="domain_force">
+            [
+                ('employee_id.schedule_group_id.manager_ids.user_id', '=', user.id),
+            ]
+        </field>
+        <field
+                name="groups"
+                eval="[(4,ref('resource_schedule.group_scheduling_user'))]"
+            />
+    </record>
+
+    <record id="property_rule_schedule_admin" model="ir.rule">
+        <field name="name">Schedule: Administrator</field>
+        <field name="model_id" ref="model_hr_schedule" />
+        <field name="domain_force">[(1,'=',1)]</field>
+        <field
+                name="groups"
+                eval="[(4,ref('resource_schedule.group_scheduling_manager'))]"
+            />
+    </record>
+
+  </data>
+</odoo>
diff --git a/resource_schedule/static/description/icon.png b/resource_schedule/static/description/icon.png
new file mode 100644
index 00000000..d3cbfef7
Binary files /dev/null and b/resource_schedule/static/description/icon.png differ
diff --git a/resource_schedule/static/description/index.html b/resource_schedule/static/description/index.html
new file mode 100644
index 00000000..181d3fff
--- /dev/null
+++ b/resource_schedule/static/description/index.html
@@ -0,0 +1,432 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Employee Shift Scheduling</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="employee-shift-scheduling">
+<h1 class="title">Employee Shift Scheduling</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:2b3927874bab00c9713a5b7d8e54d881091c2f1a7bd24ad77617bc3aeeab9589
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/resource_schedule"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<p>Easily create, manage, and track employee shift planning.</p>
+<ol class="arabic simple">
+<li>Work Detail Templates - templates describe a shift for one day. For example: 8 a.m to 5 p.m.</li>
+<li>Work Detail - the Odoo record for describing a day in a Work Time. These records can get their settings from a Work Detail Template.</li>
+<li>Work Time - the Odoo record for describing a weekly schedule.</li>
+<li>Shift Schedule - the actual times that an employee is scheduled to work on a specific day.</li>
+<li>Schedule Area - the area the employee is assigned to for a shift. For example, in a hotel with multiple dinning rooms all serving staff may have the same shifts but be assigned to different dinning rooms.</li>
+<li>Schedule Group - schedule groups allow an organization to split employees into groups. Schedule groups can have their own work detail templates and managers who are responsible for managing shifts.</li>
+</ol>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#known-issues-roadmap" id="toc-entry-1">Known issues / Roadmap</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-2">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-3">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-4">Authors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-5">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-6">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="known-issues-roadmap">
+<h1><a class="toc-backref" href="#toc-entry-1">Known issues / Roadmap</a></h1>
+<ul class="simple">
+<li>When demo data is enabled and the module is updated you may encounter and error the the demo data failed to install. This error may safely be ignored.</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20resource_schedule%0Aversion:%2014.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="#toc-entry-3">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-4">Authors</a></h2>
+<ul class="simple">
+<li>TREVI Software</li>
+<li>Michael Telahun Makonnen</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-5">Other credits</a></h2>
+<ul class="simple">
+<li>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/resource_schedule">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/resource_schedule/static/src/img/main_screenshot.png b/resource_schedule/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/resource_schedule/static/src/img/main_screenshot.png differ
diff --git a/resource_schedule/tests/__init__.py b/resource_schedule/tests/__init__.py
new file mode 100644
index 00000000..8727fa87
--- /dev/null
+++ b/resource_schedule/tests/__init__.py
@@ -0,0 +1,15 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import test_hr_attendance
+from . import test_hr_contract
+from . import test_hr_employee
+from . import test_hr_leave
+from . import test_resource_calendar
+from . import test_resource_calendar_attendance
+from . import test_resource_schedule_area
+from . import test_resource_schedule_group
+from . import test_resource_schedule_shift
+from . import test_resource_schedule_team
+from . import test_wizard_generate_schedule
+from . import test_wizard_validate_schedule
diff --git a/resource_schedule/tests/common.py b/resource_schedule/tests/common.py
new file mode 100644
index 00000000..dbd93cba
--- /dev/null
+++ b/resource_schedule/tests/common.py
@@ -0,0 +1,335 @@
+# Copyright (C) 2022,2023 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo.tests import common
+
+
+class TestResourceScheduleCommon(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.HrAttendance = cls.env["hr.attendance"]
+        cls.HrEmployee = cls.env["hr.employee"]
+        cls.HrContract = cls.env["hr.contract"]
+        cls.ScheduleShift = cls.env["resource.schedule.shift"]
+        cls.AttendanceTemplate = cls.env["resource.calendar.attendance.template"]
+        cls.ScheduleGroup = cls.env["resource.schedule.group"]
+        cls.ScheduleArea = cls.env["resource.schedule.area"]
+        cls.ScheduleTeam = cls.env["resource.schedule.team"]
+        cls.Calendar = cls.env["resource.calendar"]
+
+        # Areas
+        cls.area_1 = cls.ScheduleArea.create({"name": "Main Dining", "color": 1})
+        cls.area_2 = cls.ScheduleArea.create({"name": "Bar", "color": 3})
+        cls.area_3 = cls.ScheduleArea.create({"name": "Lobby", "color": 5})
+
+        # Schedule Groups
+        cls.schedule_group_0 = cls.ScheduleGroup.create({"name": "Kitchen"})
+        cls.schedule_group_3 = cls.ScheduleGroup.create({"name": "Office"})
+
+        # Attendance Templates
+        cls.att_template = cls.AttendanceTemplate.create(
+            {
+                "name": "Weekday hours",
+                "hour_from": 8,
+                "hour_to": 17,
+                "day_period": "8day",
+                "autodeduct_break": True,
+                "break_minutes": 60,
+                "schedule_group_ids": [(6, 0, [cls.schedule_group_3.id])],
+            }
+        )
+        cls.half_day_template = cls.AttendanceTemplate.create(
+            {
+                "name": "Half-day saturday",
+                "hour_from": 8,
+                "hour_to": 12.5,
+                "day_period": "morning",
+                "schedule_group_ids": [(6, 0, [cls.schedule_group_0.id])],
+            }
+        )
+        cls.flex_workday_template = cls.AttendanceTemplate.create(
+            {
+                "name": "Flex Workday",
+                "shift_type": "flex",
+                "hour_from": 6,
+                "hour_to": 20,
+                "flex_core_from": 11,
+                "flex_core_to": 15,
+                "flex_scheduled_hrs": 8,
+                "day_period": "8day",
+                "schedule_group_ids": [(6, 0, [cls.schedule_group_3.id])],
+            }
+        )
+        cls.att_template_12hr_night = cls.AttendanceTemplate.create(
+            {
+                "name": "12 Hour Night",
+                "hour_from": 18,
+                "hour_to": 6,
+                "day_period": "evening",
+                "span_midnight": True,
+            }
+        )
+        cls.att_template_12hr_day = cls.AttendanceTemplate.create(
+            {
+                "name": "12 Hour Day",
+                "hour_from": 6,
+                "hour_to": 18,
+                "day_period": "12day",
+            }
+        )
+
+        # 44Hr Week Calendar
+        cls.office_calendar = cls.Calendar.create(
+            {
+                "name": "44 Hour/Week",
+                "attendance_ids": [
+                    (0, 0, {"dayofweek": "0", "template_id": cls.att_template.id}),
+                    (0, 0, {"dayofweek": "1", "template_id": cls.att_template.id}),
+                    (0, 0, {"dayofweek": "2", "template_id": cls.att_template.id}),
+                    (0, 0, {"dayofweek": "3", "template_id": cls.att_template.id}),
+                    (0, 0, {"dayofweek": "4", "template_id": cls.att_template.id}),
+                    (0, 0, {"dayofweek": "5", "template_id": cls.half_day_template.id}),
+                ],
+            }
+        )
+
+        # Full-week (56Hr) Calendar
+        cls.seven_day_calendar = cls.Calendar.create(
+            {
+                "name": "Full week schedule",
+                "dayoff_type": "fix_one",
+                "attendance_ids": [
+                    (0, 0, {"dayofweek": "0", "template_id": cls.att_template.id}),
+                    (0, 0, {"dayofweek": "1", "template_id": cls.att_template.id}),
+                    (0, 0, {"dayofweek": "2", "template_id": cls.att_template.id}),
+                    (0, 0, {"dayofweek": "3", "template_id": cls.att_template.id}),
+                    (0, 0, {"dayofweek": "4", "template_id": cls.att_template.id}),
+                    (0, 0, {"dayofweek": "5", "template_id": cls.att_template.id}),
+                    (0, 0, {"dayofweek": "6", "template_id": cls.att_template.id}),
+                ],
+                "default_dayoff_ids": [
+                    (6, 0, [cls.env.ref("resource_schedule.wd_sun").id])
+                ],
+            }
+        )
+
+        # Dupont calendar
+        cls.dupont_calendar = cls.Calendar.create(
+            {
+                "name": "Dupont Schedule",
+                "dayoff_type": "fix_all",
+                "two_weeks_calendar": True,
+                "attendance_ids": [
+                    (
+                        0,
+                        0,
+                        {
+                            "sequence": 10,
+                            "dayofweek": "0",
+                            "name": "First Week",
+                            "hour_from": 0,
+                            "hour_to": 0,
+                            "display_type": "line_section",
+                        },
+                    ),
+                    (
+                        0,
+                        0,
+                        {
+                            "sequence": 11,
+                            "dayofweek": "0",
+                            "template_id": cls.att_template_12hr_night.id,
+                        },
+                    ),
+                    (
+                        0,
+                        0,
+                        {
+                            "sequence": 12,
+                            "dayofweek": "1",
+                            "template_id": cls.att_template_12hr_night.id,
+                        },
+                    ),
+                    (
+                        0,
+                        0,
+                        {
+                            "sequence": 13,
+                            "dayofweek": "2",
+                            "template_id": cls.att_template_12hr_night.id,
+                        },
+                    ),
+                    (
+                        0,
+                        0,
+                        {
+                            "sequence": 14,
+                            "dayofweek": "3",
+                            "template_id": cls.att_template_12hr_night.id,
+                        },
+                    ),
+                    (
+                        0,
+                        0,
+                        {
+                            "sequence": 20,
+                            "dayofweek": "0",
+                            "name": "Second Week",
+                            "hour_from": 0,
+                            "hour_to": 0,
+                            "display_type": "line_section",
+                        },
+                    ),
+                    (
+                        0,
+                        0,
+                        {
+                            "sequence": 21,
+                            "dayofweek": "0",
+                            "template_id": cls.att_template_12hr_day.id,
+                        },
+                    ),
+                    (
+                        0,
+                        0,
+                        {
+                            "sequence": 22,
+                            "dayofweek": "1",
+                            "template_id": cls.att_template_12hr_day.id,
+                        },
+                    ),
+                    (
+                        0,
+                        0,
+                        {
+                            "sequence": 23,
+                            "dayofweek": "2",
+                            "template_id": cls.att_template_12hr_day.id,
+                        },
+                    ),
+                    (
+                        0,
+                        0,
+                        {
+                            "sequence": 24,
+                            "dayofweek": "4",
+                            "template_id": cls.att_template_12hr_night.id,
+                        },
+                    ),
+                    (
+                        0,
+                        0,
+                        {
+                            "sequence": 25,
+                            "dayofweek": "5",
+                            "template_id": cls.att_template_12hr_night.id,
+                        },
+                    ),
+                    (
+                        0,
+                        0,
+                        {
+                            "sequence": 26,
+                            "dayofweek": "6",
+                            "template_id": cls.att_template_12hr_night.id,
+                        },
+                    ),
+                    (
+                        0,
+                        0,
+                        {
+                            "sequence": 30,
+                            "dayofweek": "0",
+                            "name": "Third Week",
+                            "hour_from": 0,
+                            "hour_to": 0,
+                            "display_type": "line_section",
+                        },
+                    ),
+                    (
+                        0,
+                        0,
+                        {
+                            "sequence": 31,
+                            "dayofweek": "3",
+                            "template_id": cls.att_template_12hr_day.id,
+                        },
+                    ),
+                    (
+                        0,
+                        0,
+                        {
+                            "sequence": 32,
+                            "dayofweek": "4",
+                            "template_id": cls.att_template_12hr_day.id,
+                        },
+                    ),
+                    (
+                        0,
+                        0,
+                        {
+                            "sequence": 33,
+                            "dayofweek": "5",
+                            "template_id": cls.att_template_12hr_day.id,
+                        },
+                    ),
+                    (
+                        0,
+                        0,
+                        {
+                            "sequence": 34,
+                            "dayofweek": "6",
+                            "template_id": cls.att_template_12hr_day.id,
+                        },
+                    ),
+                    (
+                        0,
+                        0,
+                        {
+                            "sequence": 40,
+                            "dayofweek": "0",
+                            "name": "Fourth Week",
+                            "hour_from": 0,
+                            "hour_to": 0,
+                            "display_type": "line_section",
+                        },
+                    ),
+                ],
+            }
+        )
+
+        # Teams
+        cls.team_alpha = cls.ScheduleTeam.create(
+            {
+                "name": "Alpha",
+                "color": 2,
+                "start_week": 0,
+                "resource_calendar_id": cls.dupont_calendar.id,
+            }
+        )
+        cls.team_bravo = cls.ScheduleTeam.create(
+            {
+                "name": "Bravo",
+                "color": 4,
+                "start_week": 1,
+                "resource_calendar_id": cls.dupont_calendar.id,
+            }
+        )
+        cls.team_charlie = cls.ScheduleTeam.create(
+            {
+                "name": "Charlie",
+                "color": 6,
+                "start_week": 2,
+                "resource_calendar_id": cls.dupont_calendar.id,
+            }
+        )
+        cls.team_delta = cls.ScheduleTeam.create(
+            {
+                "name": "Delta",
+                "color": 8,
+                "start_week": 3,
+                "resource_calendar_id": cls.dupont_calendar.id,
+            }
+        )
diff --git a/resource_schedule/tests/test_hr_attendance.py b/resource_schedule/tests/test_hr_attendance.py
new file mode 100644
index 00000000..09fb0322
--- /dev/null
+++ b/resource_schedule/tests/test_hr_attendance.py
@@ -0,0 +1,102 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import date, datetime, timedelta
+
+from odoo.tests import common
+
+
+class TestHrAttendance(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.HrAttendance = cls.env["hr.attendance"]
+        cls.HrEmployee = cls.env["hr.employee"]
+
+        cls.employee = cls.HrEmployee.create({"name": "John"})
+        cls.eeSally = cls.HrEmployee.create({"name": "Sally"})
+
+    def test_auto_punchout(self):
+
+        self.env["ir.config_parameter"].set_param(
+            "resource_schedule.max_shift_length", 15
+        )
+        today = date.today()
+        att = self.HrAttendance.create(
+            {
+                "employee_id": self.employee.id,
+                "check_in": datetime.combine(
+                    today, datetime.strptime("05:00", "%H:%M").time()
+                ),
+            }
+        )
+
+        now = datetime.combine(today, datetime.strptime("19:59", "%H:%M").time())
+        res = self.HrAttendance._auto_punchout(now)
+
+        self.assertEqual(res, self.HrAttendance, "The returned attendace is empty")
+        self.assertFalse(
+            att.check_out,
+            "The attendance hasn't been punched out because it's not yet max shift length",
+        )
+
+        self.env["ir.config_parameter"].set_param(
+            "resource_schedule.max_shift_length", 0
+        )
+        now = datetime.combine(today, datetime.strptime("23:00", "%H:%M").time())
+        res = self.HrAttendance._auto_punchout(now)
+        self.assertFalse(
+            att.check_out,
+            "The attendance hasn't been punched out because max shift length hasn't been set",
+        )
+
+        att2 = self.HrAttendance.create(
+            {
+                "employee_id": self.eeSally.id,
+                "check_in": datetime.combine(
+                    today, datetime.strptime("03:00", "%H:%M").time()
+                ),
+            }
+        )
+
+        self.env["ir.config_parameter"].set_param(
+            "resource_schedule.max_shift_length", 15
+        )
+        now = datetime.combine(today, datetime.strptime("23:00", "%H:%M").time())
+        res = self.HrAttendance._auto_punchout(now)
+        self.assertEqual(
+            res, att + att2, "The returned attendace item is the one I created"
+        )
+        self.assertEqual(
+            res[0].check_out,
+            datetime.combine(today, datetime.strptime("20:00", "%H:%M").time()),
+            "The attendance record has been clocked out after 15 hours",
+        )
+        self.assertEqual(
+            att2.check_out,
+            datetime.combine(today, datetime.strptime("18:00", "%H:%M").time()),
+            "Sally's attendance has been clocked out 15 hours after *its* start",
+        )
+
+    def test_auto_punchout2(self):
+
+        check_in = datetime.now() - timedelta(hours=14)
+        att = self.HrAttendance.create(
+            {"employee_id": self.employee.id, "check_in": check_in}
+        )
+
+        self.HrAttendance.auto_punchout()
+        self.assertFalse(
+            att.check_out,
+            "The attendance hasn't been punched out because it's not yet max shift length",
+        )
+
+        check_in = datetime.now() - timedelta(hours=16)
+        att.check_in = check_in
+        self.HrAttendance.auto_punchout()
+        self.assertEqual(
+            att.check_out,
+            check_in + timedelta(hours=15),
+            "The attendance record has been clocked out after 15 hours",
+        )
diff --git a/resource_schedule/tests/test_hr_contract.py b/resource_schedule/tests/test_hr_contract.py
new file mode 100644
index 00000000..4eaeebed
--- /dev/null
+++ b/resource_schedule/tests/test_hr_contract.py
@@ -0,0 +1,177 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+
+from datetime import date
+
+from dateutil.relativedelta import relativedelta
+
+from .common import TestResourceScheduleCommon
+
+
+class TestContract(TestResourceScheduleCommon):
+    @classmethod
+    def setUpClass(cls):
+        super(TestContract, cls).setUpClass()
+
+        cls.HrEmployee = cls.env["hr.employee"]
+        cls.HrContract = cls.env["hr.contract"]
+        cls.employee = cls.HrEmployee.create({"name": "John"})
+        cls.empty_calendar = cls.env["resource.calendar"].create(
+            {
+                "name": "Standard 0 hours/week",
+            }
+        )
+        cls.empty_calendar.attendance_ids.unlink()
+        cls.default_calendar = cls.office_calendar
+
+    def create_contract(
+        self,
+        employee_id=None,
+        state="draft",
+        kanban_state="normal",
+        start=None,
+        end=None,
+        trial_end=None,
+        wage=1,
+        calendar_id=None,
+    ):
+
+        if employee_id is None:
+            employee_id = self.employee.id
+        if start is None:
+            start = date.today()
+        if calendar_id is None:
+            calendar_id = self.default_calendar.id
+
+        res = {
+            "name": "Contract",
+            "employee_id": employee_id,
+            "state": state,
+            "kanban_state": kanban_state,
+            "wage": wage,
+            "date_start": start,
+            "trial_date_end": trial_end,
+            "date_end": end,
+            "resource_calendar_id": calendar_id,
+        }
+
+        return self.env["hr.contract"].create(res)
+
+    def apply_cron(self):
+        self.env.ref(
+            "hr_contract.ir_cron_data_contract_update_state"
+        ).method_direct_trigger()
+
+    def test_no_work_detail(self):
+
+        c = self.create_contract(calendar_id=self.empty_calendar.id)
+        self.apply_cron()
+
+        self.assertEqual(
+            len(c.resource_calendar_id.attendance_ids),
+            0,
+            "The contract has no Work Details",
+        )
+        self.assertEqual(
+            len(c.employee_id.resource_id.scheduled_shift_ids),
+            0,
+            "No shifts created because the work item doesn't have work details",
+        )
+
+    def test_contract_in_past(self):
+
+        prev_start = date(2021, 1, 1)
+        prev_end = date(2021, 1, 31)
+        c = self.create_contract(
+            start=prev_start, end=prev_end, calendar_id=self.default_calendar.id
+        )
+        self.apply_cron()
+
+        self.assertEqual(
+            len(c.employee_id.resource_id.scheduled_shift_ids),
+            0,
+            "No shifts are created for contracts in the past",
+        )
+
+    def test_multiple_contracts(self):
+
+        prev_start = date.today()
+        prev_end = prev_start + relativedelta(days=31)
+        start = prev_start + relativedelta(days=32)
+        c = self.create_contract(
+            start=prev_start, end=prev_end, calendar_id=self.default_calendar.id
+        )
+        first_shift_ids = c.employee_id.resource_id.scheduled_shift_ids
+
+        self.assertEqual(
+            c.resource_calendar_id,
+            self.default_calendar,
+            "The calendar on the contract is the default calendar",
+        )
+        self.assertEqual(
+            c.employee_id.resource_id.calendar_id,
+            self.default_calendar,
+            "The calendar on the employee resource is the default calendar",
+        )
+        self.assertGreater(
+            len(first_shift_ids), 0, "Shifts have been created for first contract"
+        )
+
+        c = self.create_contract(start=start, calendar_id=self.default_calendar.id)
+        curr_shift_ids = c.employee_id.resource_id.scheduled_shift_ids
+        self.assertEqual(
+            len(first_shift_ids),
+            len(curr_shift_ids),
+            "Length of shifts after second contract is the same as before it",
+        )
+        self.assertEqual(
+            first_shift_ids,
+            curr_shift_ids,
+            "Shifts after second contract are the same as those after the first",
+        )
+
+    def test_schedule_on_create(self):
+
+        c = self.create_contract(calendar_id=self.empty_calendar.id)
+        self.assertEqual(
+            c.employee_id.resource_id.calendar_id,
+            self.empty_calendar,
+            "Setting calendar during contract creation sets calendar on resource",
+        )
+
+    def test_write_new_schedule(self):
+
+        c = self.create_contract(calendar_id=self.empty_calendar.id)
+        self.assertEqual(
+            c.employee_id.resource_id.calendar_id,
+            self.empty_calendar,
+            "The initial calender is set",
+        )
+
+        c.resource_calendar_id = self.default_calendar
+        self.assertEqual(
+            c.employee_id.resource_id.calendar_id,
+            self.default_calendar,
+            "Changing calendar on the contract changes calendar on the resource",
+        )
+
+    def test_schedule_on_first_contract(self):
+
+        c = self.create_contract(calendar_id=self.default_calendar.id)
+
+        i = 0
+        for attendance in c.resource_calendar_id.attendance_ids:
+            shift = c.employee_id.resource_id.scheduled_shift_ids[i]
+            self.assertEqual(
+                shift.hour_from,
+                attendance.hour_from,
+                "Start hour scheduled shift equals start hour on work detail",
+            )
+            self.assertEqual(
+                shift.hour_to,
+                attendance.hour_to,
+                "End hour on scheduled shift equals end hour on work detail",
+            )
+
+            i += 1
diff --git a/resource_schedule/tests/test_hr_employee.py b/resource_schedule/tests/test_hr_employee.py
new file mode 100644
index 00000000..9077aad7
--- /dev/null
+++ b/resource_schedule/tests/test_hr_employee.py
@@ -0,0 +1,41 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import date, timedelta
+
+from .common import TestResourceScheduleCommon
+
+
+class TestHrEmployee(TestResourceScheduleCommon):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.HrEmployee = cls.env["hr.employee"]
+        cls.ScheduleShift = cls.env["resource.schedule.shift"]
+
+        cls.employee = cls.HrEmployee.create({"name": "John"})
+        cls.eeSally = cls.HrEmployee.create({"name": "Sally"})
+        cls.default_calendar = cls.office_calendar
+
+    def test_create_schedule(self):
+
+        dStart = date.today()
+        while dStart.weekday() != 0:
+            dStart -= timedelta(days=1)
+        dEnd = dStart + timedelta(days=6)
+        self.employee.resource_id.calendar_id = self.default_calendar
+        self.eeSally.resource_id.calendar_id = self.default_calendar
+        employees = self.employee + self.eeSally
+        resources = self.employee.resource_id + self.eeSally.resource_id
+
+        shifts = self.ScheduleShift.search([("resource_id", "in", resources.ids)])
+        self.assertEqual(len(shifts), 0, "Initially there are no scheduled shifts")
+
+        shifts = employees.create_schedule(dStart, dEnd)
+        self.assertEqual(
+            shifts.mapped("resource_id"),
+            resources,
+            "Shifts were scheduled for both employees",
+        )
+        self.assertEqual(len(shifts), 12, "The correct number of shifts were created")
diff --git a/resource_schedule/tests/test_hr_leave.py b/resource_schedule/tests/test_hr_leave.py
new file mode 100644
index 00000000..01b3e81c
--- /dev/null
+++ b/resource_schedule/tests/test_hr_leave.py
@@ -0,0 +1,422 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import date, datetime, timedelta
+
+from dateutil.relativedelta import relativedelta
+
+from odoo.addons.mail.tests.common import mail_new_test_user
+
+from .common import TestResourceScheduleCommon
+
+
+class TestHrLeave(TestResourceScheduleCommon):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.HrAttendance = cls.env["hr.attendance"]
+        cls.HrEmployee = cls.env["hr.employee"]
+        cls.HrLeave = cls.env["hr.leave"]
+        cls.LeaveType = cls.env["hr.leave.type"].with_context(tracking_disable=True)
+        cls.ScheduleShift = cls.env["resource.schedule.shift"]
+
+        cls.userJohn = mail_new_test_user(
+            cls.env,
+            login="john",
+            groups="base.group_user,hr_holidays.group_hr_holidays_manager",
+        )
+        cls.userSally = mail_new_test_user(
+            cls.env, login="sally", groups="base.group_user"
+        )
+        cls.eeSally = cls.HrEmployee.create(
+            {"name": "Sally", "user_id": cls.userSally.id}
+        )
+        cls.default_calendar = cls.seven_day_calendar
+        cls.holidays_type_1 = cls.LeaveType.create(
+            {
+                "name": "NotLimitedHR",
+                "allocation_type": "no",
+                "leave_validation_type": "hr",
+                "validity_start": False,
+            }
+        )
+
+    def get_start_end_dates(self, weeks=1):
+
+        total_days = (weeks * 7) - 1
+        dStart = date.today()
+        while dStart.weekday() != 0:
+            dStart -= timedelta(days=1)
+        dEnd = dStart + timedelta(days=total_days)
+        return dStart, dEnd
+
+    def test_leave_subsumes_whole_shift(self):
+
+        dStart, dEnd = self.get_start_end_dates()
+        self.eeSally.resource_id.calendar_id = self.default_calendar
+        shifts = self.ScheduleShift.search(
+            [
+                ("resource_id", "=", self.eeSally.resource_id.id),
+            ]
+        )
+        self.assertEqual(len(shifts), 0, "Initialy, there are not shifts at all")
+
+        shifts = self.eeSally.create_schedule(dStart, dEnd)
+        count = len(shifts)
+        self.assertGreater(len(shifts), 0, "I was able to create shifts")
+
+        startShift = shifts.filtered(lambda s: s.dayofweek == "0")
+        self.assertEqual(len(startShift), 1, "There is one shift on Monday")
+
+        leave_start = datetime.combine(dStart, datetime.min.time())
+        leave_end = datetime.combine(dStart, datetime.strptime("23:59", "%H:%M").time())
+        lv = self.HrLeave.with_user(self.userSally).create(
+            {
+                "name": "PTO",
+                "employee_id": self.eeSally.id,
+                "holiday_status_id": self.holidays_type_1.id,
+                "date_from": leave_start,
+                "date_to": leave_end,
+                "number_of_days": 1,
+            }
+        )
+        lv.with_user(self.userJohn).action_validate()
+        self.assertEqual(lv.state, "validate", "I have validated the leave")
+
+        shifts = self.ScheduleShift.search(
+            [
+                ("resource_id", "=", self.eeSally.resource_id.id),
+            ]
+        )
+        self.assertLess(len(shifts), count, "The shift has been removed by the leave")
+
+    def test_leave_partial_start_shift(self):
+
+        # Set timezone
+        self.default_calendar.tz = "UTC"
+        dStart, dEnd = self.get_start_end_dates()
+        self.eeSally.resource_id.calendar_id = self.default_calendar
+        shifts = self.ScheduleShift.search(
+            [
+                ("resource_id", "=", self.eeSally.resource_id.id),
+            ]
+        )
+        self.assertEqual(len(shifts), 0, "Initialy, there are not shifts at all")
+
+        shifts = self.eeSally.create_schedule(dStart, dEnd)
+        count = len(shifts)
+        self.assertGreater(len(shifts), 0, "I was able to create shifts")
+
+        startShift = shifts.filtered(lambda s: s.dayofweek == "0")
+        self.assertEqual(len(startShift), 1, "There is one shift on Monday")
+
+        leave_start = datetime.combine(dStart - timedelta(days=2), datetime.min.time())
+        leave_end = datetime.combine(dStart, datetime.strptime("8:30", "%H:%M").time())
+        lv = self.HrLeave.with_user(self.userSally).create(
+            {
+                "name": "PTO",
+                "employee_id": self.eeSally.id,
+                "holiday_status_id": self.holidays_type_1.id,
+                "date_from": leave_start,
+                "date_to": leave_end,
+                "number_of_days": 1,
+            }
+        )
+        lv.with_user(self.userJohn).action_validate()
+        self.assertEqual(lv.state, "validate", "I have validated the leave")
+
+        shifts = self.ScheduleShift.search(
+            [
+                ("resource_id", "=", self.eeSally.resource_id.id),
+            ]
+        )
+        self.assertEqual(len(shifts), count, "No shifts have been removed by the leave")
+        self.assertEqual(
+            shifts[0].datetime_start,
+            leave_end + timedelta(seconds=1),
+            "Shift start time has been altered to 1 sec. after leave ends",
+        )
+
+    def test_leave_partial_end_shift(self):
+
+        dStart, dEnd = self.get_start_end_dates()
+        self.eeSally.resource_id.calendar_id = self.default_calendar
+        shifts = self.ScheduleShift.search(
+            [
+                ("resource_id", "=", self.eeSally.resource_id.id),
+            ]
+        )
+        self.assertEqual(len(shifts), 0, "Initialy, there are not shifts at all")
+
+        shifts = self.eeSally.create_schedule(dStart, dEnd)
+        self.assertGreater(len(shifts), 0, "I was able to create shifts")
+
+        startShift = shifts.filtered(lambda s: s.dayofweek == "0")
+        self.assertEqual(len(startShift), 1, "There is one shift on Monday")
+
+        leave_start = datetime.combine(
+            dStart, datetime.strptime("13:30", "%H:%M").time()
+        )
+        leave_end = datetime.combine(dEnd, datetime.max.time())
+        lv = self.HrLeave.with_user(self.userSally).create(
+            {
+                "name": "PTO",
+                "employee_id": self.eeSally.id,
+                "holiday_status_id": self.holidays_type_1.id,
+                "date_from": leave_start,
+                "date_to": leave_end,
+                "number_of_days": 1,
+            }
+        )
+        lv.with_user(self.userJohn).action_validate()
+        self.assertEqual(lv.state, "validate", "I have validated the leave")
+
+        shifts = self.ScheduleShift.search(
+            [
+                ("resource_id", "=", self.eeSally.resource_id.id),
+            ]
+        )
+        self.assertEqual(
+            len(shifts), 1, "All but one of the shifts has been removed by the leave"
+        )
+        self.assertEqual(
+            shifts[0].datetime_end,
+            leave_start - timedelta(seconds=1),
+            "Shift end time has been altered to 1 sec. before leave starts",
+        )
+
+    def test_remove_autopunch(self):
+
+        dStart, dEnd = self.get_start_end_dates()
+        self.default_calendar.attendance_ids.autopunch = True
+        self.eeSally.resource_id.calendar_id = self.default_calendar
+        shifts = self.ScheduleShift.search(
+            [
+                ("resource_id", "=", self.eeSally.resource_id.id),
+            ]
+        )
+        punches = self.HrAttendance.search([("employee_id", "=", self.eeSally.id)])
+        self.assertEqual(len(shifts), 0, "Initialy, there are no shifts at all")
+        self.assertEqual(len(punches), 0, "Initialy, there are no attendances at all")
+
+        # Run this test as if it was the end of the day
+        now = datetime.combine(dStart, datetime.max.time())
+        start = datetime.combine(dStart, datetime.min.time())
+        end = now
+
+        # Create schedule and auto-punch attendance
+        #
+        shifts = self.eeSally.create_schedule(dStart, dEnd)
+        count = len(shifts)
+        self.assertGreater(len(shifts), 0, "I was able to create shifts")
+
+        self.ScheduleShift.check_and_create_autopunch(
+            self.eeSally,
+            shifts.filtered(lambda s: s.day == dStart),
+            now,
+        )
+        punches = self.HrAttendance.search(
+            [
+                ("employee_id", "=", self.eeSally.id),
+                ("check_in", ">=", start),
+                ("check_out", "<=", end),
+            ]
+        )
+        monday_att_ids = punches.filtered(lambda p: p.check_in.weekday() == 0).ids
+        self.assertEqual(
+            len(monday_att_ids), 1, "I was able to create hr.attendance records."
+        )
+
+        # Create Leave
+        #
+        leave_start = datetime.combine(dStart, datetime.min.time())
+        leave_end = datetime.combine(dStart, datetime.strptime("23:59", "%H:%M").time())
+        lv = self.HrLeave.with_user(self.userSally).create(
+            {
+                "name": "PTO",
+                "employee_id": self.eeSally.id,
+                "holiday_status_id": self.holidays_type_1.id,
+                "date_from": leave_start,
+                "date_to": leave_end,
+                "number_of_days": 1,
+            }
+        )
+        lv.with_user(self.userJohn).action_validate()
+        self.assertEqual(lv.state, "validate", "I have validated the leave")
+
+        # Test
+        #
+        shifts = self.ScheduleShift.search(
+            [
+                ("resource_id", "=", self.eeSally.resource_id.id),
+            ]
+        )
+        self.assertLess(len(shifts), count, "The shift has been removed by the leave")
+        punches = self.HrAttendance.search(
+            [
+                ("employee_id", "=", self.eeSally.id),
+                ("id", "in", monday_att_ids),
+            ]
+        )
+        self.assertFalse(punches, "The attendance record for Monday has been removed")
+
+    def test_modify_autopunch(self):
+
+        dStart, dEnd = self.get_start_end_dates()
+        self.default_calendar.attendance_ids.autopunch = True
+        self.eeSally.resource_id.calendar_id = self.default_calendar
+        shifts = self.ScheduleShift.search(
+            [
+                ("resource_id", "=", self.eeSally.resource_id.id),
+            ]
+        )
+        punches = self.HrAttendance.search([("employee_id", "=", self.eeSally.id)])
+        self.assertEqual(len(shifts), 0, "Initialy, there are no shifts at all")
+        self.assertEqual(len(punches), 0, "Initialy, there are no attendances at all")
+
+        # Run this test as if it was the end of the day
+        now = datetime.combine(dStart, datetime.max.time())
+        start = datetime.combine(dStart, datetime.min.time())
+        end = now
+
+        # Create schedule and auto-punch attendance
+        #
+        initShifts = self.eeSally.create_schedule(dStart, dEnd)
+        self.assertGreater(len(initShifts), 0, "I was able to create shifts")
+
+        self.ScheduleShift.check_and_create_autopunch(
+            self.eeSally,
+            initShifts.filtered(lambda s: s.day == dStart),
+            now,
+        )
+        punches = self.HrAttendance.search(
+            [
+                ("employee_id", "=", self.eeSally.id),
+                ("check_in", ">=", start),
+                ("check_out", "<=", end),
+            ]
+        )
+        monday_att_ids = punches.filtered(lambda p: p.check_in.weekday() == 0).ids
+        self.assertEqual(
+            len(monday_att_ids), 1, "I was able to create hr.attendance records."
+        )
+
+        # Create Leave - last day of leave overlaps start time of shift
+        #
+        leave_start = datetime.combine(
+            dStart - relativedelta(days=4), datetime.min.time()
+        )
+        leave_end = datetime.combine(
+            dStart, datetime.strptime("8:29:59", "%H:%M:%S").time()
+        )
+        lv = self.HrLeave.with_user(self.userSally).create(
+            {
+                "name": "PTO",
+                "employee_id": self.eeSally.id,
+                "holiday_status_id": self.holidays_type_1.id,
+                "date_from": leave_start,
+                "date_to": leave_end,
+                "number_of_days": 1,
+            }
+        )
+        lv.with_user(self.userJohn).action_validate()
+        self.assertEqual(lv.state, "validate", "I have validated the leave")
+
+        # Test
+        #
+        shifts = self.ScheduleShift.search(
+            [
+                ("resource_id", "=", self.eeSally.resource_id.id),
+            ]
+        )
+        self.assertEqual(
+            shifts, initShifts, "The shifts are the same after leave creation"
+        )
+        monAtt = punches.filtered(lambda a: a.check_in.weekday() == 0)
+        self.assertTrue(monAtt, "I found an attendance for Monday")
+        self.assertEqual(
+            monAtt.check_in,
+            datetime.combine(dStart, datetime.strptime("8:30", "%H:%M").time()),
+            "The attendance has been modified according to the leave",
+        )
+
+    def test_modify_autopunch2(self):
+
+        dStart, dEnd = self.get_start_end_dates()
+        self.default_calendar.attendance_ids.autopunch = True
+        self.eeSally.resource_id.calendar_id = self.default_calendar
+        shifts = self.ScheduleShift.search(
+            [
+                ("resource_id", "=", self.eeSally.resource_id.id),
+            ]
+        )
+        punches = self.HrAttendance.search([("employee_id", "=", self.eeSally.id)])
+        self.assertEqual(len(shifts), 0, "Initialy, there are no shifts at all")
+        self.assertEqual(len(punches), 0, "Initialy, there are no attendances at all")
+
+        # Run this test as if it was the end of the day
+        now = datetime.combine(dStart, datetime.max.time())
+        start = datetime.combine(dStart, datetime.min.time())
+        end = now
+
+        # Create schedule and auto-punch attendance
+        #
+        initShifts = self.eeSally.create_schedule(dStart, dEnd)
+        self.assertGreater(len(initShifts), 0, "I was able to create shifts")
+
+        self.ScheduleShift.check_and_create_autopunch(
+            self.eeSally,
+            initShifts.filtered(lambda s: s.day == dStart),
+            now,
+        )
+        punches = self.HrAttendance.search(
+            [
+                ("employee_id", "=", self.eeSally.id),
+                ("check_in", ">=", start),
+                ("check_out", "<=", end),
+            ]
+        )
+        monday_att_ids = punches.filtered(lambda p: p.check_in.weekday() == 0).ids
+        self.assertEqual(
+            len(monday_att_ids), 1, "I was able to create hr.attendance records."
+        )
+
+        # Create Leave - first day of leave overlaps end time of shift
+        #
+        leave_start = datetime.combine(
+            dStart, datetime.strptime("12:30:00", "%H:%M:%S").time()
+        )
+        leave_end = datetime.combine(
+            dStart + relativedelta(days=1), datetime.max.time()
+        )
+        lv = self.HrLeave.with_user(self.userSally).create(
+            {
+                "name": "PTO",
+                "employee_id": self.eeSally.id,
+                "holiday_status_id": self.holidays_type_1.id,
+                "date_from": leave_start,
+                "date_to": leave_end,
+                "number_of_days": 1,
+            }
+        )
+        lv.with_user(self.userJohn).action_validate()
+        self.assertEqual(lv.state, "validate", "I have validated the leave")
+
+        # Test
+        #
+        shifts = self.ScheduleShift.search(
+            [
+                ("resource_id", "=", self.eeSally.resource_id.id),
+            ]
+        )
+        self.assertNotEqual(
+            shifts, initShifts, "The shifts are *NOT* the same after leave creation"
+        )
+        monAtt = punches.filtered(lambda a: a.check_in.weekday() == 0)
+        self.assertTrue(monAtt, "I found an attendance for Monday")
+        self.assertEqual(
+            monAtt.check_out,
+            datetime.combine(dStart, datetime.strptime("12:29:59", "%H:%M:%S").time()),
+            "The attendance has been modified according to the leave",
+        )
diff --git a/resource_schedule/tests/test_resource_calendar.py b/resource_schedule/tests/test_resource_calendar.py
new file mode 100644
index 00000000..5551d9c1
--- /dev/null
+++ b/resource_schedule/tests/test_resource_calendar.py
@@ -0,0 +1,247 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo.tests import Form
+
+from .common import TestResourceScheduleCommon
+
+
+class TestResourceCalenar(TestResourceScheduleCommon):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.ResourceCalendar = cls.env["resource.calendar"]
+        cls.wtpl_morning = cls.env.ref("resource_schedule.attendance_template_0")
+        cls.wtpl_afternoon = cls.env.ref("resource_schedule.attendance_template_1")
+        cls.wtpl_weekday = cls.att_template
+        cls.wtpl_flex_weekday = cls.flex_workday_template
+        cls.default_calendar = cls.office_calendar
+        cls.production_calendar = cls.seven_day_calendar
+
+    def test_default_get(self):
+
+        cal = self.ResourceCalendar.create({"name": "My Work Cal"})
+        self.assertGreater(
+            len(cal.attendance_ids), 0, "The new calendar has default work days"
+        )
+        for att in cal.attendance_ids.sorted("sequence"):
+            self.assertIn(
+                att.day_period,
+                ["morning", "afternoon"],
+                "The default workday has a day period of 'morning' or 'afternoon'",
+            )
+            if att.day_period == "morning":
+                self.assertEqual(
+                    att.template_id,
+                    self.wtpl_morning,
+                    "The 'morning' default workday has a template attached",
+                )
+            elif att.day_period == "afternoon":
+                self.assertEqual(
+                    att.template_id,
+                    self.wtpl_afternoon,
+                    "The 'afternoon' default workday has a template attached",
+                )
+
+    def test_default_get2(self):
+
+        company = self.env["res.company"].create({"name": "Company 2"})
+        cal = company.resource_calendar_id
+        self.assertGreater(
+            len(cal.attendance_ids), 0, "The new calendar has default work days"
+        )
+        for att in cal.attendance_ids:
+            self.assertIn(
+                att.day_period,
+                ["morning", "afternoon"],
+                "The default workday has a day period of 'morning' or 'afternoon'",
+            )
+            if att.day_period == "morning":
+                self.assertEqual(
+                    att.template_id,
+                    self.wtpl_morning,
+                    "The 'morning' default workday has a template attached",
+                )
+            elif att.day_period == "afternoon":
+                self.assertEqual(
+                    att.template_id,
+                    self.wtpl_afternoon,
+                    "The 'afternoon' default workday has a template attached",
+                )
+
+    def test_field_two_weeks_calendar(self):
+
+        self.assertEqual(
+            len(
+                self.default_calendar.attendance_ids.filtered(
+                    lambda att: att.display_type == "line_section"
+                )
+            ),
+            0,
+            "Initially there is only one week in the work item",
+        )
+        self.assertFalse(
+            self.default_calendar.two_weeks_calendar,
+            "When there is only one week the field 'two_weeks_calendar' is False",
+        )
+
+        self.default_calendar.switch_calendar_type()
+        with Form(self.default_calendar) as frmCalendar:
+            with frmCalendar.attendance_ids.new() as line:
+                line.name = "Week 3"
+                line.display_type = "line_section"
+
+        self.assertEqual(
+            len(
+                self.default_calendar.attendance_ids.filtered(
+                    lambda att: att.display_type == "line_section"
+                )
+            ),
+            3,
+            "There is more than one week in the work item",
+        )
+        self.assertTrue(
+            self.default_calendar.two_weeks_calendar,
+            "When there is more than one week the field 'two_weeks_calendar' is True",
+        )
+
+    def test_field_multi_calendar_change_sequence(self):
+
+        self.assertEqual(
+            len(
+                self.default_calendar.attendance_ids.filtered(
+                    lambda att: att.display_type == "line_section"
+                )
+            ),
+            0,
+            "Initially there is only one week in the work item",
+        )
+
+        self.default_calendar.switch_calendar_type()
+        with Form(self.default_calendar) as frmCalendar:
+            with frmCalendar.attendance_ids.new() as line:
+                line.template_id = self.wtpl_morning
+                line.dayofweek = "5"
+                line.sequence = 36
+        last_day = self.default_calendar.attendance_ids.sorted("sequence")[-1]
+        last_section = self.default_calendar.attendance_ids.filtered(
+            lambda a: a.display_type == "line_section"
+        )[-1]
+        self.assertEqual(
+            last_day.dayofweek, "5", "The last day of the calendar is saturday"
+        )
+        self.assertEqual(
+            last_day.week_type, "1", "The week type of the last day is 'Odd Week'"
+        )
+        self.assertEqual(
+            last_day.sequence,
+            36,
+            "The last day of the calendar is the value I just inserted",
+        )
+        self.assertEqual(last_section.sequence, 25, "I found the last section")
+
+        last_day.sequence = 25
+        self.assertEqual(
+            last_day.week_nbr,
+            0,
+            "The week nbr of the last day has moved into the previous week",
+        )
+        self.assertEqual(
+            last_day.week_type,
+            "0",
+            "The week type of the last day has changed to 'Even Week'",
+        )
+
+    def test_compute_hours_per_day(self):
+
+        self.default_calendar.switch_calendar_type()
+        self.assertEqual(
+            len(
+                self.default_calendar.attendance_ids.filtered(
+                    lambda att: att.display_type == "line_section"
+                )
+            ),
+            2,
+            "Initially there are two weeks in the calendar",
+        )
+        self.assertEqual(
+            self.default_calendar.hours_per_day,
+            8,
+            "Initially, calender working hours average 8 hrs/day",
+        )
+        hours_per_day = self.default_calendar.hours_per_day
+
+        with Form(self.default_calendar) as frmCalendar:
+            with frmCalendar.attendance_ids.new() as line:
+                line.name = "Week 3"
+                line.display_type = "line_section"
+                line.dayofweek = "0"
+                line.sequence = 40
+                line.hour_from = 0
+                line.hour_to = 0
+            sequence = 41
+            for idx in range(5):
+                with frmCalendar.attendance_ids.new() as line:
+                    line.template_id = self.wtpl_morning
+                    line.dayofweek = str(idx)
+                    line.sequence = sequence
+                with frmCalendar.attendance_ids.new() as line:
+                    line.template_id = self.wtpl_afternoon
+                    line.dayofweek = str(idx)
+                    line.sequence = sequence + 1
+                sequence += 2
+        self.assertEqual(
+            len(
+                self.default_calendar.attendance_ids.filtered(
+                    lambda att: att.display_type == "line_section"
+                )
+            ),
+            3,
+            "I have added a third week to the calendar",
+        )
+        self.assertEqual(
+            len(
+                self.default_calendar.attendance_ids.filtered(
+                    lambda att: att.display_type is False and att.week_nbr == 2
+                )
+            ),
+            10,
+            "I have added 5 working days to the calendar",
+        )
+
+        self.assertEqual(
+            self.default_calendar.hours_per_day,
+            hours_per_day,
+            "After additional week calender working hours still average 8 hrs/day",
+        )
+
+    def test_hours_per_day_autodeduct_break(self):
+
+        cal = self.default_calendar.copy()
+        # cal.switch_calendar_type()
+        cal.attendance_ids.unlink()
+        with Form(cal) as frmCalendar:
+            for idx in range(5):
+                with frmCalendar.attendance_ids.new() as line:
+                    line.template_id = self.wtpl_weekday
+                    line.dayofweek = str(idx)
+                    line.sequence = 41 + idx
+
+        self.assertEqual(
+            cal.hours_per_day, 8, "Average hours/day correctly deducts break time"
+        )
+
+    def test_flex_hours_per_day(self):
+
+        cal = self.default_calendar.copy()
+        cal.attendance_ids.unlink()
+        self.wtpl_flex_weekday.flex_scheduled_hrs = 8
+        with Form(cal) as frmCalendar:
+            for idx in range(5):
+                with frmCalendar.attendance_ids.new() as line:
+                    line.template_id = self.wtpl_flex_weekday
+                    line.dayofweek = str(idx)
+        self.assertEqual(
+            cal.hours_per_day, 8, "Average hours/day equals flex scheduled hours"
+        )
diff --git a/resource_schedule/tests/test_resource_calendar_attendance.py b/resource_schedule/tests/test_resource_calendar_attendance.py
new file mode 100644
index 00000000..936f1e0a
--- /dev/null
+++ b/resource_schedule/tests/test_resource_calendar_attendance.py
@@ -0,0 +1,419 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo.exceptions import ValidationError
+from odoo.tests import Form, common
+
+
+class TestResourceCalendarAttendance(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.CalendarAttendance = cls.env["resource.calendar.attendance"]
+        cls.AttendanceTemplate = cls.env["resource.calendar.attendance.template"]
+        cls.HrEmployee = cls.env["hr.employee"]
+        cls.ScheduleArea = cls.env["resource.schedule.area"]
+        cls.ScheduleGroup = cls.env["resource.schedule.group"]
+
+        cls.groupKitchen = cls.ScheduleGroup.create({"name": "Kitchen"})
+        cls.areaRestaurant = cls.ScheduleArea.create({"name": "Restaurant"})
+        cls.employee = cls.HrEmployee.create({"name": "John"})
+        cls.default_calendar = cls.env["resource.calendar"].create({"name": "Std"})
+        cls.workday_template = cls.AttendanceTemplate.create(
+            {
+                "name": "8 - 17 workday",
+                "hour_from": 8,
+                "hour_to": 17,
+                "day_period": "8day",
+                "autodeduct_break": True,
+                "break_minutes": 60,
+            }
+        )
+        cls.night_template = cls.AttendanceTemplate.create(
+            {
+                "name": "graveyard shift",
+                "hour_from": 22,
+                "hour_to": 6,
+                "day_period": "evening",
+                "span_midnight": True,
+            }
+        )
+        cls.flex_night_template = cls.AttendanceTemplate.create(
+            {
+                "name": "Night flex shift",
+                "shift_type": "flex",
+                "hour_from": 18,
+                "hour_to": 6,
+                "flex_core_from": 0,
+                "flex_core_to": 4,
+                "day_period": "12night",
+                "span_midnight": True,
+            }
+        )
+
+    def test_copy_attendance(self):
+
+        catt = self.CalendarAttendance.create(
+            {
+                "name": "Monday",
+                "hour_from": 8,
+                "hour_to": 17,
+                "calendar_id": self.default_calendar.id,
+                "day_period": "8day",
+                "template_id": self.night_template.id,
+                "span_midnight": True,
+                "autopunch": True,
+                "default_area_id": self.areaRestaurant.id,
+                "schedule_group_ids": [(6, 0, [self.groupKitchen.id])],
+                "shift_type": "std",
+            }
+        )
+        values = catt._copy_attendance_vals()
+
+        self.assertEqual(
+            values.get("span_midnight", False),
+            True,
+            "Field 'span_midnight' is in the list of values to be copied",
+        )
+        self.assertEqual(
+            values.get("autopunch", False),
+            True,
+            "Field 'autopunch' is in the list of values to be copied",
+        )
+        self.assertEqual(
+            values.get("default_area_id", False),
+            self.areaRestaurant.id,
+            "Field 'defaul_area_id' is in the list of values to be copied",
+        )
+        self.assertEqual(
+            values.get("schedule_group_ids", False),
+            [(6, 0, [self.groupKitchen.id])],
+            "Field 'schedule_group_id' is in the list of values to be copied",
+        )
+
+        catt.autopunch = False
+        catt.shift_type = "flex"
+        catt.flex_core_from = 10
+        catt.flex_core_to = 15
+        catt.flex_scheduled_hrs = 7
+        catt.flex_scheduled_avg = True
+        catt.flex_weekly_hrs = 35
+        values = catt._copy_attendance_vals()
+        self.assertEqual(
+            values.get("shift_type", False),
+            "flex",
+            "Field 'shift_type' is in the list of values to be copied",
+        )
+        self.assertEqual(
+            values.get("flex_scheduled_hrs", False),
+            7,
+            "Field 'flex_scheduled_hrs' is in the list of values to be copied",
+        )
+        self.assertTrue(
+            values.get("flex_scheduled_avg", False),
+            "Field 'flex_scheduled_avg' is in the list of values to be copied",
+        )
+        self.assertEqual(
+            values.get("flex_core_from", False),
+            10,
+            "Field 'flex_core_from' is in the list of values to be copied",
+        )
+        self.assertEqual(
+            values.get("flex_core_to", False),
+            15,
+            "Field 'flex_core_to' is in the list of values to be copied",
+        )
+        self.assertEqual(
+            values.get("flex_weekly_hrs", False),
+            35,
+            "Field 'flex_weekly_hrs' is in the list of values to be copied",
+        )
+
+    def test_duration(self):
+
+        catt = self.CalendarAttendance.create(
+            {
+                "name": "Monday",
+                "hour_from": 8,
+                "hour_to": 17,
+                "calendar_id": self.default_calendar.id,
+                "day_period": "8day",
+            }
+        )
+        self.assertEqual(
+            catt.duration,
+            32400,
+            "Duration of 8 hour workday without break is 32400 seconds",
+        )
+
+    def test_duration_with_break(self):
+
+        catt = self.CalendarAttendance.create(
+            {
+                "template_id": self.workday_template.id,
+                "calendar_id": self.default_calendar.id,
+            }
+        )
+        self.assertEqual(
+            catt.duration,
+            28800,
+            "Duration of 8 hour workday with break is 28800 seconds",
+        )
+
+    def test_duration_span_midnight(self):
+
+        catt = self.CalendarAttendance.create(
+            {
+                "template_id": self.night_template.id,
+                "calendar_id": self.default_calendar.id,
+            }
+        )
+        self.assertEqual(
+            catt.duration,
+            28800,
+            "Duration of 8 hour nightshift (no break) is 28800 seconds",
+        )
+
+    def test_onchange_template(self):
+
+        frmCA = Form(self.CalendarAttendance)
+        self.assertFalse(frmCA.name, "Initialy name field is the default value")
+        self.assertEqual(
+            frmCA.day_period,
+            "morning",
+            "Initialy day_period field is the default value",
+        )
+        self.assertEqual(
+            frmCA.hour_from, 0, "Initialy hour_from field is the default value"
+        )
+        self.assertEqual(
+            frmCA.hour_to, 0, "Initialy hour_to field is the default value"
+        )
+
+        frmCA.template_id = self.workday_template
+        self.assertEqual(
+            frmCA.name,
+            "8 - 17 workday",
+            "After template is set the name equals the template name",
+        )
+        self.assertEqual(
+            frmCA.day_period,
+            "8day",
+            "After template is set the day_period equals the template name",
+        )
+        self.assertEqual(
+            frmCA.hour_from,
+            8,
+            "After template is set the hour_from equals the template name",
+        )
+        self.assertEqual(
+            frmCA.hour_to,
+            17,
+            "After template is set the hour_to equals the template name",
+        )
+
+    def test_span_midnight(self):
+
+        catt = self.CalendarAttendance.create(
+            {
+                "template_id": self.night_template.id,
+                "calendar_id": self.default_calendar.id,
+            }
+        )
+        self.assertTrue(catt.span_midnight, "The work detail is marked 'span midnight'")
+        self.assertGreater(
+            catt.hour_from,
+            catt.hour_to,
+            "In shifts that span midnight start time is greater than the end time",
+        )
+
+        catt = self.CalendarAttendance.create(
+            {
+                "template_id": self.flex_night_template.id,
+                "calendar_id": self.default_calendar.id,
+            }
+        )
+        self.assertTrue(catt.span_midnight, "The work detail is marked 'span midnight'")
+        self.assertGreater(
+            catt.hour_from,
+            catt.hour_to,
+            "A flex attendance that spans midnight was successfully created",
+        )
+
+    def test_flex_autopunch(self):
+
+        with self.assertRaises(ValidationError):
+            self.AttendanceTemplate.create(
+                {
+                    "name": "Flex Shift w/ Autopunch",
+                    "hour_from": 10,
+                    "hour_to": 15,
+                    "day_period": "8day",
+                    "shift_type": "flex",
+                    "autopunch": True,
+                }
+            )
+
+        with self.assertRaises(ValidationError):
+            self.CalendarAttendance.create(
+                {
+                    "name": "Flex Shift w/ Autopunch",
+                    "calendar_id": self.default_calendar.id,
+                    "hour_from": 10,
+                    "hour_to": 15,
+                    "day_period": "8day",
+                    "shift_type": "flex",
+                    "autopunch": True,
+                }
+            )
+
+        tpl = self.AttendanceTemplate.create(
+            {
+                "name": "Flex Shift w/ Autopunch",
+                "hour_from": 10,
+                "hour_to": 15,
+                "day_period": "8day",
+                "shift_type": "flex",
+            }
+        )
+        with self.assertRaises(ValidationError):
+            tpl.autopunch = True
+
+        attendance = self.CalendarAttendance.create(
+            {
+                "name": "Flex Shift w/ Autopunch",
+                "calendar_id": self.default_calendar.id,
+                "hour_from": 10,
+                "hour_to": 15,
+                "day_period": "8day",
+                "shift_type": "flex",
+            }
+        )
+        with self.assertRaises(ValidationError):
+            attendance.autopunch = True
+
+    def test_flex_template_invalid_values(self):
+
+        frmAtt = Form(self.AttendanceTemplate)
+        frmAtt.name = "Flex shift"
+        frmAtt.day_period = "8day"
+        frmAtt.shift_type = "flex"
+        frmAtt.hour_from = 11
+        frmAtt.hour_to = 14
+        frmAtt.flex_core_from = 10
+        frmAtt.flex_core_to = 15
+        frmAtt.flex_scheduled_hrs = 25
+        tpl = frmAtt.save()
+
+        self.assertEqual(
+            tpl.flex_scheduled_hrs,
+            24,
+            "Invalid value for 'flex_scheduled_hrs' reset to 24",
+        )
+        self.assertEqual(
+            tpl.hour_from,
+            10,
+            "Invalid value for 'hour_from' resets to 'flex_core_from'",
+        )
+        self.assertEqual(
+            tpl.hour_to, 15, "Invalid value for 'hour_to' resets to 'flex_cre_to'"
+        )
+
+        frmTpl = Form(self.AttendanceTemplate)
+        frmTpl.name = "Flex shift"
+        frmTpl.day_period = "8day"
+        frmTpl.shift_type = "flex"
+        frmTpl.hour_from = 8
+        frmTpl.hour_to = 17
+        frmTpl.flex_core_from = 0
+        frmTpl.flex_core_to = 0
+        frmTpl.flex_scheduled_hrs = -1
+        tpl = frmTpl.save()
+        self.assertEqual(
+            tpl.flex_scheduled_hrs,
+            0,
+            "Invalid value for 'flex_scheduled_hrs' reset to 0",
+        )
+        self.assertEqual(
+            tpl.flex_core_from,
+            0,
+            "Value 0 for 'flex_core_from' means core hours are not mandatory",
+        )
+        self.assertEqual(
+            tpl.flex_core_to,
+            0,
+            "Value 0 for 'flex_core_to' means core hours are not mandatory",
+        )
+
+        frmTpl = Form(self.AttendanceTemplate)
+        frmTpl.name = "Flex shift"
+        frmTpl.day_period = "8day"
+        frmTpl.shift_type = "flex"
+        frmTpl.hour_from = 8
+        frmTpl.hour_to = 17
+        frmTpl.flex_core_from = 12
+        frmTpl.flex_core_to = 8
+        tpl = frmTpl.save()
+
+        self.assertEqual(
+            tpl.flex_core_to,
+            12,
+            "If too small, 'flex_core_to' is reset to the value of 'flex_core_from'",
+        )
+
+    def test_flex_invalid_values(self):
+
+        frmAtt = Form(self.CalendarAttendance)
+        frmAtt.calendar_id = self.default_calendar
+        frmAtt.name = "Flex shift"
+        frmAtt.day_period = "8day"
+        frmAtt.shift_type = "flex"
+        frmAtt.hour_from = 11
+        frmAtt.hour_to = 14
+        frmAtt.flex_core_from = 10
+        frmAtt.flex_core_to = 15
+        frmAtt.flex_scheduled_hrs = 25
+        att = frmAtt.save()
+
+        self.assertEqual(
+            att.flex_scheduled_hrs,
+            24,
+            "Invalid value for 'flex_scheduled_hrs' reset to 24",
+        )
+        self.assertEqual(
+            att.hour_from,
+            10,
+            "Invalid value for 'hour_from' resets to 'flex_core_from'",
+        )
+        self.assertEqual(
+            att.hour_to, 15, "Invalid value for 'hour_to' resets to 'flex_core_to'"
+        )
+
+        frmAtt = Form(self.CalendarAttendance)
+        frmAtt.calendar_id = self.default_calendar
+        frmAtt.name = "Flex shift"
+        frmAtt.day_period = "8day"
+        frmAtt.shift_type = "flex"
+        frmAtt.hour_from = 8
+        frmAtt.hour_to = 17
+        frmAtt.flex_core_from = 0
+        frmAtt.flex_core_to = 0
+        frmAtt.flex_scheduled_hrs = -1
+        att = frmAtt.save()
+
+        self.assertEqual(
+            att.flex_scheduled_hrs,
+            0,
+            "Invalid value for 'flex_scheduled_hrs' reset to 0",
+        )
+        self.assertEqual(
+            att.flex_core_from,
+            0,
+            "Value 0 for 'flex_core_from' means core hours are not mandatory",
+        )
+        self.assertEqual(
+            att.flex_core_to,
+            0,
+            "Value 0 for 'flex_core_to' means core hours are not mandatory",
+        )
diff --git a/resource_schedule/tests/test_resource_schedule_area.py b/resource_schedule/tests/test_resource_schedule_area.py
new file mode 100644
index 00000000..57ce7d47
--- /dev/null
+++ b/resource_schedule/tests/test_resource_schedule_area.py
@@ -0,0 +1,46 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo.tests import common
+
+
+class TestScheduleArea(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.Resource = cls.env["resource.resource"]
+        cls.ScheduleArea = cls.env["resource.schedule.area"]
+
+        cls.areaKitchen = cls.ScheduleArea.create({"name": "Kitchen A"})
+        cls.resJohn = cls.Resource.create(
+            {
+                "name": "John",
+            }
+        )
+        cls.resSally = cls.Resource.create(
+            {
+                "name": "Sally",
+            }
+        )
+
+    def test_default_company(self):
+
+        self.assertEqual(
+            self.areaKitchen.company_id,
+            self.env.company,
+            "A new record has a company by default",
+        )
+
+    def test_compute_resource_count(self):
+
+        self.assertEqual(
+            self.ScheduleArea.resource_count, 0, "Initial resource count is zero"
+        )
+
+        self.resJohn.default_area_id = self.areaKitchen
+        self.assertEqual(
+            self.areaKitchen.resource_count,
+            1,
+            "After adding one record resource count is 1",
+        )
diff --git a/resource_schedule/tests/test_resource_schedule_group.py b/resource_schedule/tests/test_resource_schedule_group.py
new file mode 100644
index 00000000..7c784967
--- /dev/null
+++ b/resource_schedule/tests/test_resource_schedule_group.py
@@ -0,0 +1,37 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo.tests import common
+
+
+class TestScheduleGroup(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.Resource = cls.env["resource.resource"]
+        cls.ScheduleGroup = cls.env["resource.schedule.group"]
+
+        cls.groupKitchen = cls.ScheduleGroup.create({"name": "Kitchen A"})
+
+    def test_default_company(self):
+
+        self.assertEqual(
+            self.groupKitchen.company_id,
+            self.env.company,
+            "A new record has a company by default",
+        )
+
+    def test_compute_template_count(self):
+
+        self.assertEqual(
+            self.ScheduleGroup.template_count, 0, "Initial resource count is zero"
+        )
+
+        tpl = self.env.ref("resource_schedule.attendance_template_0")
+        tpl.schedule_group_ids = [(6, 0, [self.groupKitchen.id])]
+        self.assertEqual(
+            self.groupKitchen.template_count,
+            1,
+            "After adding one record resource count is 1",
+        )
diff --git a/resource_schedule/tests/test_resource_schedule_shift.py b/resource_schedule/tests/test_resource_schedule_shift.py
new file mode 100644
index 00000000..49441cb2
--- /dev/null
+++ b/resource_schedule/tests/test_resource_schedule_shift.py
@@ -0,0 +1,1166 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import date, datetime, timedelta
+
+from pytz import timezone, utc
+
+from odoo.exceptions import ValidationError
+from odoo.tests import Form
+
+from odoo.addons.resource.models.resource import float_to_time
+
+from .common import TestResourceScheduleCommon
+
+
+class TestResourceScheduleShift(TestResourceScheduleCommon):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.HrAttendance = cls.env["hr.attendance"]
+        cls.HrEmployee = cls.env["hr.employee"]
+        cls.HrContract = cls.env["hr.contract"]
+        cls.ScheduleShift = cls.env["resource.schedule.shift"]
+        cls.AttendanceTemplate = cls.env["resource.calendar.attendance.template"]
+
+        cls.employee = cls.HrEmployee.create({"name": "John"})
+        cls.eeSally = cls.HrEmployee.create({"name": "Sally"})
+        cls.sunday = cls.env.ref("resource_schedule.wd_sun")
+        cls.tuesday = cls.env.ref("resource_schedule.wd_tue")
+        cls.default_calendar = cls.office_calendar
+        cls.std35_calendar = cls.env.ref("resource.resource_calendar_std_35h")
+        cls.production_calendar = cls.seven_day_calendar
+        cls.empty_calendar = cls.env["resource.calendar"].create(
+            {
+                "name": "Standard 0 hours/week",
+            }
+        )
+        cls.empty_calendar.attendance_ids.unlink()
+        cls.night_template = cls.AttendanceTemplate.create(
+            {
+                "name": "graveyard shift",
+                "hour_from": 22,
+                "hour_to": 6,
+                "day_period": "evening",
+                "span_midnight": True,
+                "autopunch": True,
+            }
+        )
+        cls.night_calendar = cls.env["resource.calendar"].create(
+            {
+                "name": "Night Calendar",
+                "attendance_ids": [
+                    (0, 0, {"template_id": cls.night_template.id, "dayofweek": "0"}),
+                    (0, 0, {"template_id": cls.night_template.id, "dayofweek": "1"}),
+                    (0, 0, {"template_id": cls.night_template.id, "dayofweek": "2"}),
+                    (0, 0, {"template_id": cls.night_template.id, "dayofweek": "3"}),
+                    (0, 0, {"template_id": cls.night_template.id, "dayofweek": "4"}),
+                    (0, 0, {"template_id": cls.night_template.id, "dayofweek": "5"}),
+                    (0, 0, {"template_id": cls.night_template.id, "dayofweek": "6"}),
+                ],
+            }
+        )
+
+    def create_contract(
+        self,
+        employee_id=None,
+        state="draft",
+        kanban_state="normal",
+        start=None,
+        end=None,
+        trial_end=None,
+        wage=1,
+        calendar_id=None,
+    ):
+
+        if employee_id is None:
+            employee_id = self.employee.id
+        if start is None:
+            start = date.today()
+
+        res = {
+            "name": "Contract",
+            "employee_id": employee_id,
+            "state": state,
+            "kanban_state": kanban_state,
+            "wage": wage,
+            "date_start": start,
+            "trial_date_end": trial_end,
+            "date_end": end,
+        }
+        if calendar_id is not None:
+            res.update({"resource_calendar_id": calendar_id})
+
+        return self.env["hr.contract"].create(res)
+
+    def apply_cron(self):
+        self.env.ref(
+            "hr_contract.ir_cron_data_contract_update_state"
+        ).method_direct_trigger()
+
+    def get_start_end_dates(self, weeks=1):
+
+        total_days = (weeks * 7) - 1
+        dStart = date.today()
+        while dStart.weekday() != 0:
+            dStart -= timedelta(days=1)
+        dEnd = dStart + timedelta(days=total_days)
+        return dStart, dEnd
+
+    def localize_dt(self, dt, tz, reverse=False):
+        """
+        Localize naive dt from database (UTC) to timzezone tz. If reverse is True
+        a naive dt that is in timezone tz is converted to naive dt for storage in db.
+        """
+
+        local_tz = timezone(tz)
+        if not reverse:
+            res = utc.localize(dt, is_dst=False).astimezone(local_tz)
+        else:
+            res = (
+                local_tz.localize(dt, is_dst=False).astimezone(utc).replace(tzinfo=None)
+            )
+        return res
+
+    def test_record_order(self):
+
+        c = self.create_contract(calendar_id=self.default_calendar.id)
+        self.apply_cron()
+
+        prevShift = None
+        for shift in c.employee_id.resource_id.scheduled_shift_ids:
+            if prevShift is None:
+                prevShift = shift.datetime_start
+                continue
+
+            self.assertGreater(
+                shift.datetime_start,
+                prevShift,
+                "Shifts are ordered in order of start datetime",
+            )
+
+    def test_compute_employee(self):
+
+        self.assertGreater(
+            len(self.default_calendar.attendance_ids),
+            0,
+            "The default calendar has work details",
+        )
+
+        shifts = self.ScheduleShift.create_schedule(
+            self.employee.resource_id,
+            date.today(),
+            date.today() + timedelta(days=6),
+            self.default_calendar,
+        )
+        for shift in shifts:
+            self.assertEqual(
+                shift.employee_id,
+                self.employee,
+                "The work details of the calendar point to the employee",
+            )
+
+    def test_duration(self):
+
+        shifts = self.ScheduleShift.create_schedule(
+            self.employee.resource_id,
+            date.today(),
+            date.today() + timedelta(days=6),
+            self.default_calendar,
+        )
+        self.assertGreater(len(shifts), 0, "I was able to create shifts")
+
+        for shift in shifts:
+            if shift.dayofweek != "5":
+                self.assertEqual(
+                    shift.duration,
+                    28800,
+                    "Duration of 9 hour workday with break is 28800 seconds",
+                )
+            else:
+                self.assertEqual(
+                    shift.duration,
+                    16200,
+                    "Duration of 1/2 workday without break is 16200 seconds",
+                )
+            attendance_ids = self.default_calendar.attendance_ids.filtered(
+                lambda s: s.dayofweek == shift.dayofweek
+                and s.hour_from == shift.hour_from
+            )
+            self.assertEqual(
+                shift.duration,
+                attendance_ids.duration,
+                "Duration of shift equals duration of the corresponding work detail",
+            )
+
+    def test_end_middle_of_week(self):
+
+        start = date.today()
+        # end the shift on a wednesday
+        end = start + timedelta(days=7)
+        while end.weekday() != 2:
+            end += timedelta(days=1)
+
+        shifts = self.ScheduleShift.create_schedule(
+            self.employee.resource_id, start, end, self.default_calendar
+        )
+        self.assertGreater(len(shifts), 0, "I was able to create shifts")
+
+        self.assertEqual(shifts[-1].dayofweek, "2", "The last shift is on a wednesday")
+
+    # Because sunday is a boundary of Work Schedules (resource.calendar)
+    def test_date_range_end_sunday(self):
+
+        start = date.today()
+        # The end date is on a sunday
+        end = start + timedelta(days=7)
+        while end.weekday() != 6:
+            end += timedelta(days=1)
+
+        shifts = self.ScheduleShift.create_schedule(
+            self.employee.resource_id, start, end, self.default_calendar
+        )
+        self.assertGreater(len(shifts), 0, "I was able to create shifts")
+
+        self.assertEqual(
+            shifts[-1].dayofweek,
+            "5",
+            "The last shift is on a saturday (becuase sunday is not scheduled)",
+        )
+
+    # Because of a bug I found when working with a 5-day work week
+    def test_date_range_end_sunday_2(self):
+
+        start = date.today()
+        # The end date is on a sunday
+        end = start + timedelta(days=7)
+        while end.weekday() != 6:
+            end += timedelta(days=1)
+
+        self.assertEqual(
+            self.std35_calendar.attendance_ids[-1].dayofweek,
+            "4",
+            "Last day of the work details is Friday",
+        )
+
+        shifts = self.ScheduleShift.create_schedule(
+            self.employee.resource_id, start, end, self.std35_calendar
+        )
+        self.assertGreater(len(shifts), 0, "I was able to create shifts")
+
+        self.assertEqual(
+            shifts[-1].dayofweek,
+            "4",
+            "The last shift is on a friday (becuase sat & sun aren't scheduled)",
+        )
+
+    def test_onchange_resource(self):
+
+        self.employee.resource_id.calendar_id = self.std35_calendar
+        self.eeSally.resource_id.calendar_id = self.default_calendar
+
+        frmShift = Form(self.ScheduleShift)
+        self.assertFalse(
+            frmShift.calendar_id, "Initially the Work Times field is blank"
+        )
+
+        frmShift.resource_id = self.employee.resource_id
+        self.assertEqual(
+            frmShift.calendar_id,
+            self.std35_calendar,
+            "The Work Times field contains resource's default Work Time",
+        )
+
+        frmShift.resource_id = self.eeSally.resource_id
+        self.assertEqual(
+            frmShift.calendar_id,
+            self.default_calendar,
+            "The Work Times field contains new resource's default Work Time",
+        )
+
+    def test_onchange_resource_2(self):
+
+        self.att_template.default_area_id = self.area_1
+        self.employee.resource_id.calendar_id = self.production_calendar
+
+        frmShift = Form(self.ScheduleShift)
+        frmShift.resource_id = self.employee.resource_id
+        self.assertEqual(
+            frmShift.default_area_id,
+            self.area_1,
+            "The default area contains the area defined on the template",
+        )
+
+        self.employee.resource_id.default_area_id = self.area_2
+        frmShift = Form(self.ScheduleShift)
+        frmShift.resource_id = self.employee.resource_id
+        self.assertEqual(
+            frmShift.default_area_id,
+            self.area_2,
+            "The default area contains the area defined on the resource",
+        )
+
+    def test_onchange_calendar(self):
+
+        self.employee.resource_id.calendar_id = self.production_calendar
+        frmShift = Form(self.ScheduleShift)
+        self.assertEqual(
+            frmShift.dayofweek, "0", "The default dayofweek fields is Monday"
+        )
+
+        frmShift.resource_id = self.employee.resource_id
+        self.assertEqual(
+            frmShift.calendar_id,
+            self.production_calendar,
+            "The Work Times field contains resource's default Work Time",
+        )
+        self.assertEqual(
+            frmShift.day_period,
+            "8day",
+            "The day period is consistent with the initial Work Time",
+        )
+        self.assertEqual(
+            frmShift.hour_to,
+            17,
+            "The end time is consistent with the initial Work Time",
+        )
+
+        if not frmShift.datetime_start:
+            frmShift.datetime_start = date.today()
+
+        # Change to empty calendar
+        frmShift.calendar_id = self.empty_calendar
+        self.assertFalse(
+            frmShift.day_period,
+            "The day period is the default value",
+        )
+
+        # Change to 5 day calendar, 7 hrs/day
+        frmShift.calendar_id = self.std35_calendar
+
+        # Today is monday - friday
+        if date.today().weekday() not in [5, 6]:
+            self.assertEqual(
+                frmShift.day_period,
+                "morning",
+                "The day period is consistent with the new Work Time",
+            )
+            self.assertEqual(
+                frmShift.hour_to,
+                12,
+                "The end time is consistent with the new Work Time",
+            )
+        # Today is sat - sun
+        else:
+            self.assertFalse(
+                frmShift.day_period,
+                "The day period is the default value",
+            )
+            self.assertFalse(frmShift.hour_to, "The end time is the default value")
+        self.assertEqual(
+            frmShift.dayofweek,
+            str(date.today().weekday()),
+            "The dayofweek fields is consistent with the start date",
+        )
+
+    def test_create_schedule_default_offday(self):
+
+        dStart, dEnd = self.get_start_end_dates()
+        self.employee.resource_id.calendar_id = self.production_calendar
+        shifts = self.ScheduleShift.search(
+            [
+                ("resource_id", "=", self.employee.resource_id.id),
+            ]
+        )
+        self.assertEqual(len(shifts), 0, "Initialy, there are not shifts at all")
+
+        shifts = self.employee.create_schedule(dStart, dEnd)
+        self.assertGreater(len(shifts), 0, "I was able to create shifts")
+
+        day_list = shifts.mapped("dayofweek")
+        self.assertEqual(
+            day_list,
+            ["0", "1", "2", "3", "4", "5"],
+            "The default day off was not scheduled",
+        )
+
+    def test_create_schedule_employee_offday(self):
+
+        dStart, dEnd = self.get_start_end_dates()
+        self.production_calendar.dayoff_type = "fix_one"
+        self.employee.resource_id.calendar_id = self.production_calendar
+        self.employee.resource_id.write({"dayoff_ids": [(6, 0, [self.tuesday.id])]})
+
+        shifts = self.ScheduleShift.search(
+            [
+                ("resource_id", "=", self.employee.resource_id.id),
+            ]
+        )
+        self.assertEqual(len(shifts), 0, "Initialy, there are no shifts at all")
+
+        shifts = self.employee.create_schedule(dStart, dEnd)
+        self.assertGreater(len(shifts), 0, "I was able to create shifts")
+
+        day_list = shifts.mapped("dayofweek")
+        self.assertEqual(
+            day_list,
+            ["0", "2", "3", "4", "5", "6"],
+            "The default day off was not scheduled",
+        )
+
+    def test_create_schedule_rolling_offday(self):
+
+        dStart, dEnd = self.get_start_end_dates(weeks=3)
+        self.production_calendar.dayoff_type = "rolling"
+        self.employee.resource_id.calendar_id = self.production_calendar
+        self.employee.resource_id.write({"dayoff_ids": [(6, 0, [self.tuesday.id])]})
+
+        shifts = self.ScheduleShift.search(
+            [
+                ("resource_id", "=", self.employee.resource_id.id),
+            ]
+        )
+        self.assertEqual(len(shifts), 0, "Initialy, there are no shifts at all")
+
+        shifts = self.employee.create_schedule(dStart, dEnd)
+        self.assertGreater(len(shifts), 0, "I was able to create shifts")
+
+        day_list = [shift.dayofweek for shift in shifts]
+        self.assertEqual(
+            day_list,
+            [
+                "0",
+                "2",
+                "3",
+                "4",
+                "5",
+                "6",
+                "1",
+                "2",
+                "3",
+                "4",
+                "5",
+                "0",
+                "1",
+                "2",
+                "3",
+                "4",
+                "6",
+            ],
+            "The rolling days off in the 3 week period are: tue, mon, sun, sat",
+        )
+
+    def test_night_shift(self):
+
+        dStart, dEnd = self.get_start_end_dates()
+        self.employee.resource_id.calendar_id = (self.night_calendar,)
+        shifts = self.ScheduleShift.search(
+            [
+                ("resource_id", "=", self.employee.resource_id.id),
+            ]
+        )
+        self.assertEqual(len(shifts), 0, "Initialy, there are not shifts at all")
+
+        shifts = self.employee.create_schedule(dStart, dEnd)
+        self.assertGreater(len(shifts), 0, "I was able to create shifts")
+
+        today = dStart
+        for shift in shifts:
+            dtShiftStart = datetime.combine(
+                today, float_to_time(self.night_template.hour_from)
+            )
+            tzLocal = timezone(self.night_calendar.tz)
+            dtShiftStart = (
+                tzLocal.localize(dtShiftStart, is_dst=False)
+                .astimezone(utc)
+                .replace(tzinfo=None)
+            )
+            dtShiftEnd = datetime.combine(
+                today + timedelta(days=1), float_to_time(self.night_template.hour_to)
+            )
+            dtShiftEnd = (
+                tzLocal.localize(dtShiftEnd, is_dst=False)
+                .astimezone(utc)
+                .replace(tzinfo=None)
+            )
+            self.assertTrue(
+                shift.span_midnight, "The shift has the field 'span_midnight' set"
+            )
+            self.assertEqual(
+                shift.datetime_start, dtShiftStart, "Shift start time is today"
+            )
+            self.assertEqual(
+                shift.datetime_end, dtShiftEnd, "Shift end time is tomorrow"
+            )
+
+            today += timedelta(days=1)
+
+    def test_flex_night_shift(self):
+
+        self.flex_workday_template.span_midnight = True
+        self.flex_workday_template.hour_from = 18
+        self.flex_workday_template.hour_to = 6
+        self.flex_workday_template.flex_core_from = 22
+        self.flex_workday_template.flex_core_to = 4
+        dStart, dEnd = self.get_start_end_dates()
+        self.empty_calendar.attendance_ids.unlink()
+        self.empty_calendar.attendance_ids = [
+            (0, 0, {"dayofweek": "0", "template_id": self.flex_workday_template.id}),
+            (0, 0, {"dayofweek": "1", "template_id": self.flex_workday_template.id}),
+            (0, 0, {"dayofweek": "2", "template_id": self.flex_workday_template.id}),
+            (0, 0, {"dayofweek": "3", "template_id": self.flex_workday_template.id}),
+            (0, 0, {"dayofweek": "4", "template_id": self.flex_workday_template.id}),
+            (0, 0, {"dayofweek": "5", "template_id": self.flex_workday_template.id}),
+            (0, 0, {"dayofweek": "6", "template_id": self.flex_workday_template.id}),
+        ]
+        self.employee.resource_id.calendar_id = self.empty_calendar
+        shifts = self.ScheduleShift.search(
+            [
+                ("resource_id", "=", self.employee.resource_id.id),
+            ]
+        )
+        self.assertEqual(len(shifts), 0, "Initialy, there are not shifts at all")
+
+        shifts = self.employee.create_schedule(dStart, dEnd)
+        self.assertGreater(len(shifts), 0, "I was able to create shifts")
+
+        today = dStart
+        for shift in shifts:
+            dtShiftStart = datetime.combine(today, float_to_time(18))
+            dtShiftEnd = datetime.combine(today + timedelta(days=1), float_to_time(6))
+            tzLocal = timezone(self.empty_calendar.tz)
+            dtShiftStart = (
+                tzLocal.localize(dtShiftStart, is_dst=False)
+                .astimezone(utc)
+                .replace(tzinfo=None)
+            )
+            dtShiftEnd = (
+                tzLocal.localize(dtShiftEnd, is_dst=False)
+                .astimezone(utc)
+                .replace(tzinfo=None)
+            )
+            self.assertEqual(shift.shift_type, "flex", "The shift is a flex shift")
+            self.assertEqual(
+                shift.flex_scheduled_hrs, 8, "The flex scheduled hours are 8"
+            )
+            self.assertEqual(
+                shift.flex_core_from, 22, "The shift has the correct core from time"
+            )
+            self.assertEqual(
+                shift.flex_core_to, 4, "The shift has the correct core to time"
+            )
+            self.assertTrue(
+                shift.span_midnight, "The shift has the field 'span_midnight' set"
+            )
+            self.assertEqual(
+                shift.datetime_start, dtShiftStart, "Shift start time is today"
+            )
+            self.assertEqual(
+                shift.datetime_end, dtShiftEnd, "Shift end time is tomorrow"
+            )
+
+            today += timedelta(days=1)
+
+    def test_no_autopunch(self):
+
+        dStart, dEnd = self.get_start_end_dates()
+        self.employee.resource_id.calendar_id = self.production_calendar
+        shifts = self.ScheduleShift.search(
+            [
+                ("resource_id", "=", self.employee.resource_id.id),
+            ]
+        )
+        punches = self.HrAttendance.search([("employee_id", "=", self.employee.id)])
+        self.assertEqual(len(shifts), 0, "Initialy, there are no shifts at all")
+        self.assertEqual(len(punches), 0, "Initialy, there are no attendances at all")
+
+        # Run this test as if it was the end of the day
+        now = datetime.combine(dStart, datetime.max.time())
+
+        shifts = self.employee.create_schedule(dStart, dEnd)
+        self.assertGreater(len(shifts), 0, "I was able to create shifts")
+        self.assertFalse(shifts[0].autopunch, "The shifts *do not* have autopunch set")
+
+        self.ScheduleShift.check_and_create_autopunch(
+            self.employee,
+            shifts.filtered(lambda s: s.day == dStart),
+            now,
+        )
+        punches = self.HrAttendance.search(
+            [
+                ("employee_id", "=", self.employee.id),
+            ]
+        )
+        self.assertEqual(
+            len(punches),
+            0,
+            "If autopunch is *not* set attendance records are not created.",
+        )
+
+    def test_autopunch(self):
+
+        dStart, dEnd = self.get_start_end_dates()
+        self.employee.resource_id.calendar_id = self.production_calendar
+        self.production_calendar.attendance_ids.autopunch = True
+        shifts = self.ScheduleShift.search(
+            [
+                ("resource_id", "=", self.employee.resource_id.id),
+            ]
+        )
+        punches = self.HrAttendance.search([("employee_id", "=", self.employee.id)])
+        self.assertEqual(len(shifts), 0, "Initialy, there are no shifts at all")
+        self.assertEqual(len(punches), 0, "Initialy, there are no attendances at all")
+
+        # Run this test as if it was the end of the day
+        tzLocal = timezone(self.production_calendar.tz)
+        now = (
+            tzLocal.localize(
+                datetime.combine(dStart, datetime.max.time()), is_dst=False
+            )
+            .astimezone(utc)
+            .replace(tzinfo=None)
+        )
+        start = (
+            tzLocal.localize(
+                datetime.combine(dStart, datetime.min.time()), is_dst=False
+            )
+            .astimezone(utc)
+            .replace(tzinfo=None)
+        )
+        end = now
+
+        shifts = self.employee.create_schedule(dStart, dEnd)
+        self.assertGreater(len(shifts), 0, "I was able to create shifts")
+        self.assertTrue(shifts[0].autopunch, "The shifts have autopunch set")
+
+        self.ScheduleShift.check_and_create_autopunch(
+            self.employee,
+            shifts.filtered(lambda s: s.day == dStart),
+            now,
+        )
+        punches = self.HrAttendance.search(
+            [
+                ("employee_id", "=", self.employee.id),
+                ("check_in", ">=", start),
+                ("check_out", "<=", end),
+            ]
+        )
+        self.assertEqual(len(punches), 1, "I was able to create hr.attendance records.")
+
+        dtShiftStart = (
+            tzLocal.localize(datetime.combine(dStart, float_to_time(8)), is_dst=False)
+            .astimezone(utc)
+            .replace(tzinfo=None)
+        )
+        dtShiftEnd = (
+            tzLocal.localize(datetime.combine(dStart, float_to_time(17)), is_dst=False)
+            .astimezone(utc)
+            .replace(tzinfo=None)
+        )
+        self.assertEqual(
+            punches[0].check_in,
+            dtShiftStart,
+            "Start date and time of hr.attendance record is correct",
+        )
+        self.assertEqual(
+            punches[0].check_out,
+            dtShiftEnd,
+            "End date and time of hr.attendance record is correct",
+        )
+
+    def test_autopunch_span_midnight(self):
+
+        dStart, dEnd = self.get_start_end_dates()
+        self.employee.resource_id.calendar_id = self.night_calendar
+        shifts = self.ScheduleShift.search(
+            [
+                ("resource_id", "=", self.employee.resource_id.id),
+            ]
+        )
+        punches = self.HrAttendance.search([("employee_id", "=", self.employee.id)])
+        self.assertEqual(len(shifts), 0, "Initialy, there are no shifts at all")
+        self.assertEqual(len(punches), 0, "Initialy, there are no attendances at all")
+
+        # Run this test as if it was the end of the day
+        now = datetime.combine(dStart, datetime.max.time())
+
+        shifts = self.employee.create_schedule(dStart, dEnd)
+        self.assertGreater(len(shifts), 0, "I was able to create shifts")
+        self.assertTrue(shifts[0].autopunch, "The shifts have autopunch set")
+
+        self.ScheduleShift.check_and_create_autopunch(
+            self.employee,
+            shifts.filtered(lambda s: s.day == dStart),
+            now,
+        )
+        punches = self.HrAttendance.search(
+            [
+                ("employee_id", "=", self.employee.id),
+            ]
+        )
+        self.assertEqual(len(punches), 1, "I was able to create hr.attendance records.")
+
+        tzLocal = timezone(self.night_calendar.tz)
+        dtShiftStart = (
+            tzLocal.localize(datetime.combine(dStart, float_to_time(22)), is_dst=False)
+            .astimezone(utc)
+            .replace(tzinfo=None)
+        )
+        dtShiftEnd = (
+            tzLocal.localize(
+                datetime.combine(dStart + timedelta(days=1), float_to_time(6)),
+                is_dst=False,
+            )
+            .astimezone(utc)
+            .replace(tzinfo=None)
+        )
+        self.assertEqual(
+            punches[0].check_in,
+            dtShiftStart,
+            "Start date and time of hr.attendance record is correct",
+        )
+        self.assertFalse(
+            punches[0].check_out,
+            "The employee hasn't been punched out because the shift hasn't ended yet",
+        )
+
+        # Move time forward 7 hours (next day 7 am)
+        now += timedelta(hours=7)
+        self.ScheduleShift.check_and_create_autopunch(
+            self.employee,
+            shifts.filtered(lambda s: s.day == dStart),
+            now,
+        )
+
+        self.assertEqual(
+            punches[0].check_out,
+            dtShiftEnd,
+            "End date and time of hr.attendance record is correct",
+        )
+
+    def test_autopunch_multiple_shifts(self):
+
+        tpl_morn = self.AttendanceTemplate.create(
+            {
+                "name": "Morning",
+                "hour_from": 8,
+                "hour_to": 12,
+                "day_period": "morning",
+                # "autopunch": True,
+            }
+        )
+        tpl_noon = self.AttendanceTemplate.create(
+            {
+                "name": "Afternoon",
+                "hour_from": 13,
+                "hour_to": 16,
+                "day_period": "afternoon",
+                # "autopunch": True,
+            }
+        )
+        self.std35_calendar.attendance_ids = [
+            (0, 0, {"template_id": tpl_morn.id, "dayofweek": "5"}),
+            (0, 0, {"template_id": tpl_noon.id, "dayofweek": "5"}),
+            (0, 0, {"template_id": tpl_morn.id, "dayofweek": "6"}),
+            (0, 0, {"template_id": tpl_noon.id, "dayofweek": "6"}),
+        ]
+        self.std35_calendar.attendance_ids.autopunch = True
+        dStart, dEnd = self.get_start_end_dates()
+        self.employee.resource_id.calendar_id = self.std35_calendar
+        shifts = self.ScheduleShift.search(
+            [
+                ("resource_id", "=", self.employee.resource_id.id),
+            ]
+        )
+        punches = self.HrAttendance.search([("employee_id", "=", self.employee.id)])
+        self.assertEqual(len(shifts), 0, "Initialy, there are no shifts at all")
+        self.assertEqual(len(punches), 0, "Initialy, there are no attendances at all")
+
+        shifts = self.employee.create_schedule(dStart, dEnd)
+        self.assertGreater(len(shifts), 0, "I was able to create shifts")
+        self.assertTrue(shifts[0].autopunch, "The shifts have autopunch set")
+
+        tzLocal = timezone(self.std35_calendar.tz)
+        now = (
+            tzLocal.localize(
+                datetime.combine(dStart, datetime.strptime("7:59", "%H:%M").time()),
+                is_dst=False,
+            )
+            .astimezone(utc)
+            .replace(tzinfo=None)
+        )
+
+        self.ScheduleShift.check_and_create_autopunch(
+            self.employee,
+            shifts.filtered(lambda s: s.day == dStart),
+            now,
+        )
+        punches = self.HrAttendance.search(
+            [
+                ("employee_id", "=", self.employee.id),
+            ]
+        )
+        self.assertEqual(
+            len(punches), 0, "No punches created before scheduled shift start"
+        )
+
+        now = (
+            tzLocal.localize(
+                datetime.combine(dStart, datetime.strptime("11:59", "%H:%M").time()),
+                is_dst=False,
+            )
+            .astimezone(utc)
+            .replace(tzinfo=None)
+        )
+
+        self.ScheduleShift.check_and_create_autopunch(
+            self.employee,
+            shifts.filtered(lambda s: s.day == dStart),
+            now,
+        )
+        punches = self.HrAttendance.search(
+            [
+                ("employee_id", "=", self.employee.id),
+            ]
+        )
+        self.assertEqual(len(punches), 1, "One attendance created before lunch starts")
+
+        tzLocal = timezone(self.night_calendar.tz)
+        dtShiftStart = (
+            tzLocal.localize(datetime.combine(dStart, float_to_time(8)), is_dst=False)
+            .astimezone(utc)
+            .replace(tzinfo=None)
+        )
+        dtShiftEnd = (
+            tzLocal.localize(datetime.combine(dStart, float_to_time(12)), is_dst=False)
+            .astimezone(utc)
+            .replace(tzinfo=None)
+        )
+        self.assertEqual(
+            punches[0].check_in,
+            dtShiftStart,
+            "Start date/time of hr.attendance record is correct",
+        )
+        self.assertFalse(
+            punches[0].check_out,
+            "The out-punch is empty because check-out time hasn't arrived yet",
+        )
+
+        now = (
+            tzLocal.localize(
+                datetime.combine(dStart, datetime.strptime("12:00", "%H:%M").time()),
+                is_dst=False,
+            )
+            .astimezone(utc)
+            .replace(tzinfo=None)
+        )
+
+        self.ScheduleShift.check_and_create_autopunch(
+            self.employee,
+            shifts.filtered(lambda s: s.day == dStart),
+            now,
+        )
+        punches = self.HrAttendance.search(
+            [
+                ("employee_id", "=", self.employee.id),
+            ]
+        )
+        self.assertEqual(len(punches), 1, "Still only one attendance created")
+        self.assertEqual(
+            punches[0].check_in,
+            dtShiftStart,
+            "Start date/time of hr.attendance record is correct",
+        )
+        self.assertEqual(
+            punches[0].check_out,
+            dtShiftEnd,
+            "End date/time of hr.attendance record is correct",
+        )
+        saved_punches = punches
+        saved_checkin = punches[0].check_in
+        saved_checkout = punches[0].check_out
+
+        now = (
+            tzLocal.localize(
+                datetime.combine(dStart, datetime.strptime("12:30", "%H:%M").time()),
+                is_dst=False,
+            )
+            .astimezone(utc)
+            .replace(tzinfo=None)
+        )
+
+        self.ScheduleShift.check_and_create_autopunch(
+            self.employee,
+            shifts.filtered(lambda s: s.day == dStart),
+            now,
+        )
+        punches = self.HrAttendance.search(
+            [
+                ("employee_id", "=", self.employee.id),
+            ]
+        )
+        self.assertEqual(
+            punches, saved_punches, "No changes between first shift and second"
+        )
+        self.assertEqual(
+            punches[0].check_in, saved_checkin, "Check-in time hasn't changed"
+        )
+        self.assertEqual(
+            punches[0].check_out, saved_checkout, "Check-out time hasn't changed"
+        )
+
+        now = (
+            tzLocal.localize(
+                datetime.combine(dStart, datetime.strptime("13:00", "%H:%M").time()),
+                is_dst=False,
+            )
+            .astimezone(utc)
+            .replace(tzinfo=None)
+        )
+
+        self.ScheduleShift.check_and_create_autopunch(
+            self.employee,
+            shifts.filtered(lambda s: s.day == dStart),
+            now,
+        )
+        punches = self.HrAttendance.search(
+            [
+                ("employee_id", "=", self.employee.id),
+            ]
+        )
+        self.assertEqual(len(punches), 2, "Two attendance records created")
+
+        tzLocal = timezone(self.std35_calendar.tz)
+        dtShiftStart = (
+            tzLocal.localize(datetime.combine(dStart, float_to_time(13)), is_dst=False)
+            .astimezone(utc)
+            .replace(tzinfo=None)
+        )
+        dtShiftEnd = (
+            tzLocal.localize(datetime.combine(dStart, float_to_time(16)), is_dst=False)
+            .astimezone(utc)
+            .replace(tzinfo=None)
+        )
+        self.assertEqual(
+            punches[0].check_in,
+            dtShiftStart,
+            "Start date/time of hr.attendance record is correct",
+        )
+        self.assertFalse(
+            punches[0].check_out, "End date/time of hr.attendance record is False"
+        )
+
+        now = (
+            tzLocal.localize(
+                datetime.combine(dStart, datetime.strptime("16:30", "%H:%M").time()),
+                is_dst=False,
+            )
+            .astimezone(utc)
+            .replace(tzinfo=None)
+        )
+
+        self.ScheduleShift.check_and_create_autopunch(
+            self.employee,
+            shifts.filtered(lambda s: s.day == dStart),
+            now,
+        )
+        punches = self.HrAttendance.search(
+            [
+                ("employee_id", "=", self.employee.id),
+            ]
+        )
+        self.assertEqual(len(punches), 2, "Two attendance records created")
+        self.assertEqual(
+            punches[0].check_in,
+            dtShiftStart,
+            "Start date/time of hr.attendance record is correct",
+        )
+        self.assertEqual(
+            punches[0].check_out,
+            dtShiftEnd,
+            "End date/time of hr.attendance record is correct",
+        )
+        self.assertEqual(
+            punches[1].check_in,
+            saved_checkin,
+            "Check-in time of first shift hasn't changed",
+        )
+        self.assertEqual(
+            punches[1].check_out,
+            saved_checkout,
+            "Check-out time of first shift hasn't changed",
+        )
+
+    def test_conflicting_autopunch(self):
+
+        dStart, dEnd = self.get_start_end_dates()
+        self.employee.resource_id.calendar_id = self.production_calendar
+        self.production_calendar.attendance_ids.autopunch = True
+        shifts = self.ScheduleShift.search(
+            [
+                ("resource_id", "=", self.employee.resource_id.id),
+            ]
+        )
+        punches = self.HrAttendance.search([("employee_id", "=", self.employee.id)])
+        self.assertEqual(len(shifts), 0, "Initialy, there are no shifts at all")
+        self.assertEqual(len(punches), 0, "Initialy, there are no attendances at all")
+
+        shifts = self.employee.create_schedule(dStart, dEnd)
+        self.assertGreater(len(shifts), 0, "I was able to create shifts")
+        self.assertTrue(shifts[0].autopunch, "The shifts have autopunch set")
+
+        # Create a punch that conflicts with the schedule
+        self.HrAttendance.create(
+            {
+                "employee_id": self.employee.id,
+                "check_in": datetime.combine(
+                    dStart, datetime.strptime("3:00", "%H:%M").time()
+                ),
+                "check_out": datetime.combine(
+                    dStart, datetime.strptime("12:00", "%H:%M").time()
+                ),
+            }
+        )
+        now = datetime.combine(dStart, datetime.strptime("12:00", "%H:%M").time())
+
+        with self.assertRaises(ValidationError):
+            self.ScheduleShift.check_and_create_autopunch(
+                self.employee,
+                shifts.filtered(lambda s: s.day == dStart),
+                now,
+            )
+
+    def test_autopunch_missed_run(self):
+
+        LastRun = self.env["resource.schedule.autopunch.lastrun"]
+        dStart, dEnd = self.get_start_end_dates()
+        self.employee.resource_id.calendar_id = self.production_calendar
+        self.production_calendar.attendance_ids.autopunch = True
+        shifts = self.ScheduleShift.search(
+            [
+                ("resource_id", "=", self.employee.resource_id.id),
+            ]
+        )
+        punches = self.HrAttendance.search([("employee_id", "=", self.employee.id)])
+        lastrun = LastRun.search([])
+        self.assertEqual(len(shifts), 0, "Initialy, there are no shifts at all")
+        self.assertEqual(len(punches), 0, "Initialy, there are no attendances at all")
+        self.assertEqual(len(lastrun), 0, "Initialyy, there are no last-run records")
+
+        shifts = self.employee.create_schedule(dStart, dEnd)
+        self.assertGreater(len(shifts), 0, "I was able to create shifts")
+        self.assertTrue(shifts[0].autopunch, "The shifts have autopunch set")
+
+        tzLocal = timezone(self.production_calendar.tz)
+        now = (
+            tzLocal.localize(
+                datetime.combine(dStart, datetime.strptime("15:45", "%H:%M").time()),
+                is_dst=False,
+            )
+            .astimezone(utc)
+            .replace(tzinfo=None)
+        )
+        punches = self.ScheduleShift._autopunch_shifts(now)
+        lastrun = LastRun.search([])
+        self.assertEqual(len(punches), 1, "There is one attendance record")
+        self.assertFalse(punches[0].check_out, "Check-out time hasn't arrived yet")
+        self.assertEqual(
+            lastrun[0].name,
+            now,
+            "Last run record matches the last time autopunch was run",
+        )
+        self.assertEqual(
+            lastrun[0].record_count, 1, "Only the one punch from the detail was created"
+        )
+
+        # wednesday
+        now += timedelta(days=2)
+        dWed = now.date()
+        dTue = dWed - timedelta(days=1)
+        punches = self.ScheduleShift._autopunch_shifts(now)
+        lastrun = LastRun.search([])
+        self.assertEqual(
+            len(punches), 3, "There are 3 attendance records (mon, tue, wed)"
+        )
+        lastrun = LastRun.search([])
+
+        dtShiftEnd = (
+            tzLocal.localize(datetime.combine(dStart, float_to_time(17)), is_dst=False)
+            .astimezone(utc)
+            .replace(tzinfo=None)
+        )
+        self.assertEqual(
+            punches[2].check_out,
+            dtShiftEnd,
+            "End date/time of monday is now filled in",
+        )
+
+        dtShiftStart = (
+            tzLocal.localize(datetime.combine(dTue, float_to_time(8)), is_dst=False)
+            .astimezone(utc)
+            .replace(tzinfo=None)
+        )
+        self.assertEqual(
+            punches[1].check_in,
+            dtShiftStart,
+            "Start date/time of tuesday is now filled in",
+        )
+
+        dtShiftEnd = (
+            tzLocal.localize(datetime.combine(dTue, float_to_time(17)), is_dst=False)
+            .astimezone(utc)
+            .replace(tzinfo=None)
+        )
+        self.assertEqual(
+            punches[1].check_out,
+            dtShiftEnd,
+            "End date/time of tuesday is now filled in",
+        )
+
+        dtShiftStart = (
+            tzLocal.localize(datetime.combine(dWed, float_to_time(8)), is_dst=False)
+            .astimezone(utc)
+            .replace(tzinfo=None)
+        )
+        self.assertEqual(
+            punches[0].check_in,
+            dtShiftStart,
+            "Start date/time of wednesday is now filled in",
+        )
+        self.assertFalse(
+            punches[0].check_out, "Wednesday's check-out time hasn't arrived yet"
+        )
+
+    def test_datetimes(self):
+
+        # when writing directly to DB it is assumed the datetime is already in UTC
+        dtStart = datetime.combine(
+            date.today(), datetime.strptime("0530", "%H%M").time()
+        )
+        dtEnd = datetime.combine(date.today(), datetime.strptime("1330", "%H%M").time())
+        self.employee.resource_id.tz = "Africa/Addis_Ababa"
+        shift = self.ScheduleShift.create(
+            {
+                "resource_id": self.employee.resource_id.id,
+                "calendar_id": self.default_calendar.id,
+                "datetime_start": dtStart,
+                "datetime_end": dtEnd,
+            }
+        )
+
+        self.assertEqual(
+            shift.tz,
+            "Africa/Addis_Ababa",
+            "The shift has the correct timezone",
+        )
+        self.assertEqual(
+            shift.datetimes_naive_utc(),
+            [(dtStart, dtEnd, shift)],
+            "The start and end shift times are identical to those supplied",
+        )
+        self.assertEqual(
+            shift.datetimes_naive_tz(),
+            [(dtStart + timedelta(hours=3), dtEnd + timedelta(hours=3), shift)],
+            "The start and end shift times have been converted to the timezone",
+        )
diff --git a/resource_schedule/tests/test_resource_schedule_team.py b/resource_schedule/tests/test_resource_schedule_team.py
new file mode 100644
index 00000000..a016c011
--- /dev/null
+++ b/resource_schedule/tests/test_resource_schedule_team.py
@@ -0,0 +1,153 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import date, timedelta
+
+from .common import TestResourceScheduleCommon
+
+
+class TestResourceScheduleShift(TestResourceScheduleCommon):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.employee = cls.HrEmployee.create({"name": "John"})
+        cls.eeSally = cls.HrEmployee.create({"name": "Sally"})
+
+    def get_start_end_dates(self, weeks=1):
+
+        total_days = (weeks * 7) - 1
+        dStart = date.today()
+        while dStart.weekday() != 0:
+            dStart -= timedelta(days=1)
+        dEnd = dStart + timedelta(days=total_days)
+        return dStart, dEnd
+
+    def test_schedule_team(self):
+
+        dStart, dEnd = self.get_start_end_dates(weeks=1)
+        employees = self.employee | self.eeSally
+        teamA = self.team_alpha
+        teamB = self.team_bravo
+        teamA.resource_calendar_id = self.dupont_calendar
+        teamA.start_week = 0
+        teamB.resource_calendar_id = self.dupont_calendar
+        teamB.start_week = 1
+        self.employee.resource_id.schedule_team_id = teamA
+        self.eeSally.resource_id.schedule_team_id = teamB
+        shifts = self.ScheduleShift.search(
+            [
+                (
+                    "resource_id",
+                    "in",
+                    [self.employee.resource_id.id, self.eeSally.resource_id.id],
+                ),
+            ]
+        )
+        self.assertEqual(len(shifts), 0, "Initialy, there are not shifts at all")
+        self.assertIn(
+            self.employee.resource_id,
+            teamA.resource_ids,
+            "The employee is in the proper team",
+        )
+        self.assertIn(
+            self.eeSally.resource_id,
+            teamB.resource_ids,
+            "The employee (Sally) is in the proper team",
+        )
+
+        shifts = employees.create_schedule(dStart, dEnd)
+        self.assertGreater(len(shifts), 0, "I was able to create shifts")
+
+        employeeShifts = shifts.filtered(
+            lambda s: s.resource_id == self.employee.resource_id
+        )
+        day_list = employeeShifts.mapped("dayofweek")
+        sequence_list = employeeShifts.mapped("sequence")
+        self.assertEqual(
+            employeeShifts[0].calendar_id,
+            self.dupont_calendar,
+            "The employee's shift schedule is based on the Dupont calendar",
+        )
+        self.assertEqual(
+            sequence_list,
+            [11, 12, 13, 14],
+            "The sequence of the shifts matches the sequence in the 1st week",
+        )
+        self.assertEqual(
+            day_list,
+            ["0", "1", "2", "3"],
+            "The employee in Team A started in week 0",
+        )
+
+        sallyShifts = shifts.filtered(
+            lambda s: s.resource_id == self.eeSally.resource_id
+        )
+        day_list = sallyShifts.mapped("dayofweek")
+        sequence_list = sallyShifts.mapped("sequence")
+        self.assertEqual(
+            sallyShifts[0].calendar_id,
+            self.dupont_calendar,
+            "Sally's shift schedule is based on the Dupont calendar",
+        )
+        self.assertEqual(
+            sequence_list,
+            [21, 22, 23, 24, 25, 26],
+            "The sequence of the shifts matches the sequence in the 2nd week",
+        )
+        self.assertEqual(
+            day_list,
+            ["0", "1", "2", "4", "5", "6"],
+            "The employee in Team B started in week 1",
+        )
+
+    def test_schedule_dupont(self):
+
+        dStart, dEnd = self.get_start_end_dates(weeks=4)
+        teamA = self.team_alpha
+        teamA.resource_calendar_id = self.dupont_calendar
+        teamA.start_week = 1
+        self.employee.resource_id.schedule_team_id = teamA
+        shifts = self.ScheduleShift.search(
+            [
+                ("resource_id", "in", [self.employee.resource_id.id]),
+            ]
+        )
+        self.assertEqual(len(shifts), 0, "Initialy, there are not shifts at all")
+        self.assertIn(
+            self.employee.resource_id,
+            teamA.resource_ids,
+            "The employee is in the proper team",
+        )
+
+        shifts = self.employee.create_schedule(dStart, dEnd)
+        self.assertGreater(len(shifts), 0, "I was able to create shifts")
+
+        employeeShifts = shifts.filtered(
+            lambda s: s.resource_id == self.employee.resource_id
+        )
+        day_list = []
+        for shift in employeeShifts:
+            day_list += shift.dayofweek
+        sequence_list = employeeShifts.mapped("sequence")
+
+        self.assertEqual(
+            employeeShifts[0].calendar_id,
+            self.dupont_calendar,
+            "The employee's shift schedule is based on the team's calendar",
+        )
+        self.assertEqual(
+            sequence_list,
+            [21, 22, 23, 24, 25, 26, 31, 32, 33, 34, 11, 12, 13, 14],
+            "The sequence of the shifts matches the sequence in the dupont calendar",
+        )
+        self.assertEqual(
+            day_list,
+            ["0", "1", "2", "4", "5", "6", "3", "4", "5", "6", "0", "1", "2", "3"],
+            "The schedule wrapped arround from the start week to the previous one",
+        )
+        self.assertEqual(
+            (shifts[10].datetime_start - shifts[9].datetime_end).days - 1,
+            7,
+            "There is a gap of 7 days in schedule for the last week of dupont cycle",
+        )
diff --git a/resource_schedule/tests/test_wizard_generate_schedule.py b/resource_schedule/tests/test_wizard_generate_schedule.py
new file mode 100644
index 00000000..5e57716b
--- /dev/null
+++ b/resource_schedule/tests/test_wizard_generate_schedule.py
@@ -0,0 +1,155 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import date, timedelta
+
+from odoo.tests import Form, common
+
+
+class TestWizardGenerateSchedule(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.ScheduleShift = cls.env["resource.schedule.shift"]
+        cls.Wizard = cls.env["resource.schedule.generate"]
+
+        cls.eeJohn = cls.env["hr.employee"].create({"name": "John"})
+        cls.eeSally = cls.env["hr.employee"].create({"name": "Sally"})
+        cls.std35_calendar = cls.env.ref("resource.resource_calendar_std_35h")
+        cls.eeJohn.resource_id.calendar_id = cls.std35_calendar
+        cls.eeSally.resource_id.calendar_id = cls.std35_calendar
+
+    def get_start_end_dates(self, weeks=1):
+
+        total_days = (weeks * 7) - 1
+        dStart = date.today()
+        while dStart.weekday() != 0:
+            dStart -= timedelta(days=1)
+        dEnd = dStart + timedelta(days=total_days)
+        return dStart, dEnd
+
+    def test_generate_one_employee(self):
+
+        monday = date.today()
+        while monday.weekday() > 0:
+            monday -= timedelta(days=1)
+        sunday = monday + timedelta(days=6)
+
+        # Find a date that is not a monday
+        start = date.today()
+        while start.weekday() == 0:
+            start += timedelta(days=1)
+        self.assertNotEqual(start.weekday(), 0, "The start date is not on a monday")
+
+        frmWizard = Form(self.Wizard)
+        frmWizard.date_start = start
+        self.assertEqual(
+            frmWizard.date_start,
+            monday,
+            "The wizard has modified the start date to be a monday",
+        )
+
+        shift_ids = self.ScheduleShift.search(
+            [
+                ("resource_id", "=", self.eeJohn.resource_id.id),
+                ("day", ">=", monday),
+                ("day", "<=", sunday),
+            ]
+        )
+        self.assertEqual(
+            len(shift_ids), 0, "The employee does not have any shifts scheduled"
+        )
+
+        frmWizard.no_weeks = 1
+        frmWizard.employee_ids.add(self.eeJohn)
+        wizard = frmWizard.save()
+        wizard.generate_schedules()
+
+        shift_ids = self.ScheduleShift.search(
+            [
+                ("resource_id", "=", self.eeJohn.resource_id.id),
+                ("day", ">=", monday),
+                ("day", "<=", sunday),
+            ]
+        )
+        self.assertEqual(
+            len(shift_ids), 10, "The employee has shifts scheduled in the week"
+        )
+
+        nextSunday = sunday + timedelta(days=7)
+        frmWiz = Form(self.Wizard)
+        frmWiz.date_start = monday
+        frmWiz.no_weeks = 2
+        frmWiz.employee_ids.add(self.eeJohn)
+        wizard = frmWiz.save()
+        wizard.generate_schedules()
+
+        shift_ids = self.ScheduleShift.search(
+            [
+                ("resource_id", "=", self.eeJohn.resource_id.id),
+                ("day", ">=", monday),
+                ("day", "<=", nextSunday),
+            ]
+        )
+        self.assertEqual(
+            len(shift_ids),
+            20,
+            "The employee does not have duplicate shifts for the first week",
+        )
+
+    def test_generate_by_calendar(self):
+
+        start, end = self.get_start_end_dates(weeks=2)
+
+        shift_ids = self.ScheduleShift.search(
+            [
+                (
+                    "resource_id",
+                    "in",
+                    [self.eeJohn.resource_id.id, self.eeSally.resource_id.id],
+                ),
+                ("day", ">=", start),
+                ("day", "<=", end),
+            ]
+        )
+        self.assertEqual(
+            len(shift_ids), 0, "The employee does not have any shifts scheduled"
+        )
+
+        frmWizard = Form(self.Wizard)
+        frmWizard.date_start = start
+        frmWizard.no_weeks = 1
+        frmWizard.type = "calendar"
+        frmWizard.resource_calendar_id = self.std35_calendar
+        wizard = frmWizard.save()
+
+        self.assertEqual(
+            wizard.employee_ids,
+            self.eeJohn | self.eeSally,
+            "The wizard automatically loaded the employees attached to the calendar",
+        )
+
+        wizard.generate_schedules()
+
+        shift_ids = self.ScheduleShift.search(
+            [
+                (
+                    "resource_id",
+                    "in",
+                    [self.eeJohn.resource_id.id, self.eeSally.resource_id.id],
+                ),
+                ("day", ">=", start),
+                ("day", "<=", end),
+            ]
+        )
+        self.assertEqual(
+            len(shift_ids),
+            20,
+            "I created one week shift schedule for two employees",
+        )
+        self.assertEqual(
+            shift_ids.mapped("employee_id"),
+            self.eeJohn | self.eeSally,
+            "I created shift schedule for two employees",
+        )
diff --git a/resource_schedule/tests/test_wizard_validate_schedule.py b/resource_schedule/tests/test_wizard_validate_schedule.py
new file mode 100644
index 00000000..a88d43d9
--- /dev/null
+++ b/resource_schedule/tests/test_wizard_validate_schedule.py
@@ -0,0 +1,45 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import date, timedelta
+
+from odoo.tests import Form, common
+
+
+class TestWizardValidateSchedule(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.ScheduleShift = cls.env["resource.schedule.shift"]
+        cls.Wizard = cls.env["resource.schedule.validate.departments"]
+
+        cls.dep_administration = cls.env.ref("hr.dep_administration")
+        cls.eeJohn = cls.env["hr.employee"].create(
+            {"name": "John", "department_id": cls.dep_administration.id}
+        )
+        cls.std35_calendar = cls.env.ref("resource.resource_calendar_std_35h")
+        cls.eeJohn.resource_id.calendar_id = cls.std35_calendar
+
+    def get_start_end_dates(self, weeks=1):
+
+        total_days = (weeks * 7) - 1
+        dStart = date.today()
+        while dStart.weekday() != 0:
+            dStart -= timedelta(days=1)
+        dEnd = dStart + timedelta(days=total_days)
+        return dStart, dEnd
+
+    def test_validate_department(self):
+
+        start, end = self.get_start_end_dates()
+        shifts = self.eeJohn.create_schedule(start, end)
+        for shift in shifts:
+            self.assertFalse(shift.published, "Initially all shifts are unpublished")
+
+        frmWizard = Form(self.Wizard)
+        frmWizard.department_ids.add(self.dep_administration)
+        wizard = frmWizard.save()
+        wizard.do_validate()
+        for shift in shifts:
+            self.assertTrue(shift.published, "All shifts of the employee are published")
diff --git a/resource_schedule/views/hr_contract_view.xml b/resource_schedule/views/hr_contract_view.xml
new file mode 100644
index 00000000..fb608509
--- /dev/null
+++ b/resource_schedule/views/hr_contract_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="hr_contract_view_form" model="ir.ui.view">
+        <field name="name">hr.contract.form.inherit.resource.schedule</field>
+        <field name="model">hr.contract</field>
+        <field name="inherit_id" ref="hr_contract.hr_contract_view_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='hr_responsible_id']" position="before">
+                <field name="default_area_id" />
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/resource_schedule/views/hr_employee_view.xml b/resource_schedule/views/hr_employee_view.xml
new file mode 100644
index 00000000..78ec1512
--- /dev/null
+++ b/resource_schedule/views/hr_employee_view.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+        <!-- Employee Shifts -->
+
+        <record id="hr_employee_view_form" model="ir.ui.view">
+            <field name="name">hr.employee.view.inherit.schedule</field>
+            <field name="model">hr.employee</field>
+            <field name="inherit_id" ref="hr.view_employee_form" />
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="//div[@name='button_box']" position="inside">
+                        <button
+                        string="Schedules"
+                        class="oe_stat_button"
+                        icon="fa-tasks"
+                        name="action_view_schedule"
+                        type="object"
+                    />
+                    </xpath>
+                    <xpath expr="//field[@name='tz']" position="after">
+                        <field name="schedule_group_id" />
+                        <field name="default_area_id" />
+                    </xpath>
+                </data>
+            </field>
+        </record>
+
+</odoo>
diff --git a/resource_schedule/views/hr_job_view.xml b/resource_schedule/views/hr_job_view.xml
new file mode 100644
index 00000000..ec4420c7
--- /dev/null
+++ b/resource_schedule/views/hr_job_view.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+
+    <!-- Job Form -->
+    <record id="job_form_view" model="ir.ui.view">
+        <field name="name">hr.job.form.schedule</field>
+        <field name="model">hr.job</field>
+        <field name="inherit_id" ref="hr.view_hr_job_form" />
+        <field name="arch" type="xml">
+            <data>
+                <xpath expr="//field[@name='company_id']" position="before">
+                    <field name="default_area_id" />
+                </xpath>
+            </data>
+        </field>
+    </record>
+
+</odoo>
diff --git a/resource_schedule/views/menus.xml b/resource_schedule/views/menus.xml
new file mode 100644
index 00000000..5c70fb5b
--- /dev/null
+++ b/resource_schedule/views/menus.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+        <!-- Scheduling submenu -->
+        <menuitem
+        id="menu_root_schedule"
+        name="Schedule"
+        groups="group_scheduling_manager,group_scheduling_user,base.group_user"
+        web_icon="resource_schedule,static/description/icon.png"
+        sequence="80"
+    />
+
+        <!-- Operations -->
+        <menuitem
+        id="menu_schedule_ops"
+        parent="menu_root_schedule"
+        name="Operations"
+        groups="group_scheduling_user"
+        sequence="20"
+    />
+
+        <!-- Scheduling configuration -->
+        <menuitem
+        id="menu_schedule_config"
+        parent="menu_root_schedule"
+        name="Configuration"
+        groups="group_scheduling_manager"
+        sequence="100"
+    />
+
+        <menuitem
+        id="menu_resource_resource"
+        action="resource.action_resource_resource_tree"
+        parent="menu_schedule_config"
+        name="Resources"
+        groups="group_scheduling_manager"
+        sequence="90"
+    />
+
+        <!-- Wizards
+
+        <menuitem id="menu_schedules_by_department"
+            action="action_schedules_by_department"
+            parent="menu_hr_root_schedule"
+            sequence="30"/>
+
+        <menuitem id="menu_restday_change"
+            action="action_restday_change"
+            parent="menu_hr_root_schedule"
+            groups="hr.group_hr_user"
+            sequence="50"/>
+
+        <menuitem id="menu_alerts_by_employee"
+            action="action_alerts_by_employee"
+            parent="menu_hr_root_schedule"
+            sequence="60"/> -->
+
+</odoo>
diff --git a/resource_schedule/views/res_config_settings_view.xml b/resource_schedule/views/res_config_settings_view.xml
new file mode 100644
index 00000000..ce3338a5
--- /dev/null
+++ b/resource_schedule/views/res_config_settings_view.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="res_config_settings_form" model="ir.ui.view">
+        <field
+            name="name"
+        >res.config.settings.view.form.inherit.resource_schedule</field>
+        <field name="model">res.config.settings</field>
+        <field name="priority" eval="80" />
+        <field name="inherit_id" ref="base.res_config_settings_view_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//div[hasclass('settings')]" position="inside">
+                <div
+                    class="app_settings_block"
+                    data-string="Shift Scheduling"
+                    string="Shift Scheduling"
+                    data-key="resource_schedule"
+                    groups="resource_schedule.group_scheduling_manager"
+                >
+                    <h2>Defaults</h2>
+                    <div
+                        class="row mt16 o_settings_container"
+                        name="resource_schedule_setting_container"
+                    >
+                        <div
+                            class="col-12 col-lg-6 o_setting_box"
+                            id="defaults_setting"
+                            title="Defaults"
+                        >
+                            <div class="o_setting_right_pane">
+                                <label for="max_shift_length" />
+                                <span
+                                    class="fa fa-lg fa-building-o"
+                                    title="Values set here are company-specific."
+                                    role="img"
+                                    aria-label="Values set here are company-specific."
+                                    groups="base.group_multi_company"
+                                />
+                                <div class="row">
+                                    <div class="text-muted col-lg-8">
+                                        If an employee hasn't clocked out in this amount of time the system will automatically clock the employee out.
+                                    </div>
+                                </div>
+                                <div class="content-group">
+                                    <div class="mt16">
+                                        <field
+                                            name="max_shift_length"
+                                            required="1"
+                                            class="o_light_label"
+                                        /> Hrs
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="action_config_settings" model="ir.actions.act_window">
+        <field name="name">Settings</field>
+        <field name="res_model">res.config.settings</field>
+        <field name="view_id" ref="res_config_settings_form" />
+        <field name="view_mode">form</field>
+        <field name="target">inline</field>
+        <field name="context">{'module': 'resource_schedule'}</field>
+    </record>
+    <menuitem
+        id="menu_config_settings"
+        action="action_config_settings"
+        parent="menu_schedule_config"
+        name="Settings"
+        sequence="1"
+    />
+
+</odoo>
diff --git a/resource_schedule/views/resource_calendar_attendance_template_view.xml b/resource_schedule/views/resource_calendar_attendance_template_view.xml
new file mode 100644
index 00000000..8d5a9abc
--- /dev/null
+++ b/resource_schedule/views/resource_calendar_attendance_template_view.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="view_attendance_template_tree" model="ir.ui.view">
+        <field name="name">resource.calendar.attendance.template.tree</field>
+        <field name="model">resource.calendar.attendance.template</field>
+        <field name="arch" type="xml">
+            <tree string="Work Detail Templates">
+                <field name="name" />
+                <field name="shift_type" />
+                <field name="day_period" />
+                <field name="hour_from" widget="float_time" />
+                <field name="hour_to" widget="float_time" />
+                <field name="default_area_id" />
+                <field name="autopunch" />
+                <field name="autodeduct_break" />
+                <field name="break_minutes" />
+                <field name="flex_core_from" widget="float_time" optional="hide" />
+                <field name="flex_core_to" widget="float_time" optional="hide" />
+                <field name="flex_scheduled_hrs" optional="hide" />
+                <field
+                    name="flex_scheduled_avg"
+                    widget="boolean_toggle"
+                    optional="hide"
+                />
+                <field name="flex_weekly_hrs" optional="hide" />
+                <field name="company_id" groups="base.group_multi_company" />
+                <field name="active" />
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_attendance_template_form" model="ir.ui.view">
+        <field name="name">resource.calendar.attendance.template.form</field>
+        <field name="model">resource.calendar.attendance.template</field>
+        <field name="arch" type="xml">
+            <form string="Work Detail Template">
+                <sheet>
+                    <field name="active" invisible="1" />
+                    <widget
+                        name="web_ribbon"
+                        title="Archived"
+                        bg_color="bg-danger"
+                        attrs="{'invisible': [('active', '=', True)]}"
+                    />
+                    <group>
+                        <group>
+                            <field name="name" />
+                            <field name="shift_type" />
+                            <field name="day_period" />
+                            <label for="hour_from" string="Hours" />
+                            <div class="o_row">
+                                <field name="hour_from" widget="float_time" /> -
+                                <field name="hour_to" widget="float_time" />
+                            </div>
+                        </group>
+                        <group>
+                            <field name="default_area_id" />
+                            <field name="autopunch" />
+                            <field name="autodeduct_break" />
+                            <field name="break_minutes" />
+                            <field
+                                name="company_id"
+                                groups="base.group_multi_company"
+                            />
+                        </group>
+                    </group>
+                    <group
+                        name="flex"
+                        string="Flex Shift"
+                        attrs="{'invisible': [('shift_type', '!=', 'flex')]}"
+                    >
+                        <group>
+                            <label for="flex_core_from" string="Core Hours" />
+                            <div class="o_row">
+                                <field name="flex_core_from" widget="float_time" /> -
+                                <field name="flex_core_to" widget="float_time" />
+                            </div>
+                            <field name="flex_scheduled_hrs" />
+                            <field name="flex_scheduled_avg" widget="boolean_toggle" />
+                         </group>
+                        <group>
+                           <field name="flex_weekly_hrs" />
+                        </group>
+                    </group>
+                    <group name="group_ids" string="Scheduling Groups">
+                        <field name="schedule_group_ids" nolabel="1" />
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="open_attendance_template_view" model="ir.actions.act_window">
+        <field name="name">Work Detail Template</field>
+        <field name="res_model">resource.calendar.attendance.template</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem
+        action="open_attendance_template_view"
+        id="menu_attendance_template_view"
+        parent="menu_schedule_config"
+        sequence="70"
+    />
+
+</odoo>
diff --git a/resource_schedule/views/resource_calendar_attendance_view.xml b/resource_schedule/views/resource_calendar_attendance_view.xml
new file mode 100644
index 00000000..d33c2148
--- /dev/null
+++ b/resource_schedule/views/resource_calendar_attendance_view.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+
+    <record id="view_resource_calendar_attendance_tree" model="ir.ui.view">
+        <field name="name">resource.calendar.attendance.schedule.tree</field>
+        <field name="model">resource.calendar.attendance</field>
+        <field name="priority">99</field>
+        <field
+            name="inherit_id"
+            ref="resource.view_resource_calendar_attendance_tree"
+        />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='name']" position="before">
+                <field name="template_id" />
+            </xpath>
+            <xpath expr="//field[@name='name']" position="after">
+                <field name="shift_type" />
+            </xpath>
+            <xpath expr="//field[@name='week_type']" position="after">
+                <field name="flex_core_from" widget="float_time" />
+                <field name="flex_core_to" widget="float_time" />
+            </xpath>
+        </field>
+    </record>
+
+    <record id="view_resource_calendar_attendance_form" model="ir.ui.view">
+        <field name="name">resource.calendar.attendance.schedule.form</field>
+        <field name="model">resource.calendar.attendance</field>
+        <field name="priority">99</field>
+        <field
+            name="inherit_id"
+            ref="resource.view_resource_calendar_attendance_form"
+        />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='name']" position="before">
+                <!-- calendar_id is needed for unit tests using Form() to work -->
+                <field name="calendar_id" invisible="1" />
+                <field name="template_id" />
+            </xpath>
+            <xpath expr="//field[@name='day_period']" position="after">
+                <field name="shift_type" />
+            </xpath>
+            <xpath expr="//sheet/group" position="after">
+                <group
+                    name="flex"
+                    string="Flex Shift"
+                    attrs="{'invisible': [('shift_type', '!=', 'flex')]}"
+                >
+                    <group>
+                        <label for="flex_core_from" string="Hours" />
+                        <div class="o_row">
+                            <field name="flex_core_from" /> -
+                            <field name="flex_core_to" />
+                        </div>
+                        <field name="flex_scheduled_hrs" />
+                        <field name="flex_scheduled_avg" widget="boolean_toggle" />
+                    </group>
+                    <group>
+                        <field name="flex_weekly_hrs" />
+                    </group>
+                </group>
+            </xpath>
+        </field>
+    </record>
+
+    <!-- Scheduling Templates (Working Hours) -->
+    <menuitem
+        id="menu_resource_calendar"
+        parent="menu_schedule_config"
+        action="resource.action_resource_calendar_form"
+        sequence="40"
+    />
+
+</odoo>
diff --git a/resource_schedule/views/resource_calendar_view.xml b/resource_schedule/views/resource_calendar_view.xml
new file mode 100644
index 00000000..367c9223
--- /dev/null
+++ b/resource_schedule/views/resource_calendar_view.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+
+    <record id="resource_calendar_form" model="ir.ui.view">
+        <field name="name">resource.calendar.form.schedule</field>
+        <field name="model">resource.calendar</field>
+        <field name="priority">99</field>
+        <field name="inherit_id" ref="resource.resource_calendar_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//group[@name='resource_details']" position="inside">
+                <group>
+                    <field name="dayoff_type" />
+                    <field
+                        name="default_dayoff_ids"
+                        attrs="{'invisible': [('dayoff_type', '=', 'fix_all')]}"
+                    />
+                </group>
+            </xpath>
+            <xpath expr="//button[@name='switch_calendar_type']" position="attributes">
+                <attribute name="string">Switch to multi-week calendar</attribute>
+                <!--
+                <button name="switch_calendar_type" attrs="{'invisible':[('two_weeks_calendar', '=', True)]}" string="Switch to multi-week calendar" type="object" confirm="Are you sure you want to switch this calendar to 2 weeks calendar ? All entries will be lost"/>
+                -->
+            </xpath>
+            <xpath expr="//field[@name='attendance_ids']" position="replace">
+                <field name="attendance_ids" widget="section_one2many">
+                    <tree string="Work Details" editable="bottom">
+                        <control>
+                            <create name="add_day_control" string="Add a workday" />
+                            <create
+                                name="add_section_control"
+                                string="Add a new week"
+                                context="{'default_display_type': 'line_section'}"
+                            />
+                        </control>
+                        <field name="sequence" widget="handle" />
+                        <!-- We do not display the type because we don't want the user to be bothered with that information if he has no section or note. -->
+                        <field name="display_type" invisible="1" />
+                        <field name="week_nbr" readonly="1" optional="show" />
+                        <field name="template_id" />
+                        <field
+                            name="name"
+                            widget="section_and_note_text"
+                            optional="show"
+                        />
+                        <field
+                            name="dayofweek"
+                            attrs="{
+                                'required': [('display_type', '=', False)],
+                            }"
+                        />
+                        <field
+                            name="day_period"
+                            attrs="{
+                                'required': [('display_type', '=', False)],
+                            }"
+                            optional="hide"
+                        />
+                        <field
+                            name="hour_from"
+                            widget="float_time"
+                            attrs="{
+                                'required': [('display_type', '=', False)],
+                            }"
+                        />
+                        <field
+                            name="hour_to"
+                            widget="float_time"
+                            attrs="{
+                                'required': [('display_type', '=', False)],
+                            }"
+                        />
+                        <field name="shift_type" optional="hide" />
+                        <field
+                            name="flex_core_from"
+                            widget="float_time"
+                            optional="hide"
+                        />
+                        <field
+                            name="flex_core_to"
+                            widget="float_time"
+                            optional="hide"
+                        />
+                        <field name="flex_scheduled_hrs" optional="hide" />
+                        <field
+                            name="flex_scheduled_avg"
+                            widget="boolean_toggle"
+                            optional="hide"
+                        />
+                        <field name="flex_weekly_hrs" optional="hide" />
+                        <field name="date_from" optional="hide" />
+                        <field name="date_to" optional="hide" />
+                        <field
+                            name="week_type"
+                            readonly="1"
+                            force_save="1"
+                            groups="base.group_no_one"
+                            optional="show"
+                        />
+                    </tree>
+                </field>
+            </xpath>
+        </field>
+    </record>
+
+    <!-- Scheduling Templates (Working Hours) -->
+    <menuitem
+        id="menu_resource_calendar"
+        parent="menu_schedule_config"
+        action="resource.action_resource_calendar_form"
+        sequence="80"
+    />
+
+</odoo>
diff --git a/resource_schedule/views/resource_calendar_weekday_view.xml b/resource_schedule/views/resource_calendar_weekday_view.xml
new file mode 100644
index 00000000..54ebbb09
--- /dev/null
+++ b/resource_schedule/views/resource_calendar_weekday_view.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="view_resource_calendar_weekday_tree" model="ir.ui.view">
+        <field name="name">resource.calendar.weekday.tree</field>
+        <field name="model">resource.calendar.weekday</field>
+        <field name="arch" type="xml">
+            <tree string="Week Days">
+                <field name="name" />
+                <field name="dayofweek" />
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_resource_calendar_weekday_form" model="ir.ui.view">
+        <field name="name">resource.calendar.weekday.form</field>
+        <field name="model">resource.calendar.weekday</field>
+        <field name="arch" type="xml">
+            <form string="Weekday">
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="name" />
+                            <field name="dayofweek" />
+                        </group>
+                        <group />
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="open_calendar_weekday_view" model="ir.actions.act_window">
+        <field name="name">Weekdays</field>
+        <field name="res_model">resource.calendar.weekday</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem
+        action="open_calendar_weekday_view"
+        id="menu_calendar_weekday_view"
+        parent="menu_schedule_config"
+        sequence="100"
+    />
+
+</odoo>
diff --git a/resource_schedule/views/resource_resource_view.xml b/resource_schedule/views/resource_resource_view.xml
new file mode 100644
index 00000000..0a1c4e88
--- /dev/null
+++ b/resource_schedule/views/resource_resource_view.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="view_resource_resource_search" model="ir.ui.view">
+        <field name="name">resource.resource.search.schedule</field>
+        <field name="model">resource.resource</field>
+        <field name="inherit_id" ref="resource.view_resource_resource_search" />
+        <field name="arch" type="xml">
+            <xpath expr="//filter[@name='working_period']" position="after">
+                <filter
+                    string="Area"
+                    name="area"
+                    domain="[]"
+                    context="{'group_by':'default_area_id'}"
+                />
+            </xpath>
+        </field>
+    </record>
+
+    <record id="resource_resource_form" model="ir.ui.view">
+        <field name="name">resource.resource.form.schedule</field>
+        <field name="model">resource.resource</field>
+        <field name="inherit_id" ref="resource.resource_resource_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='calendar_id']" position="after">
+                <field name="schedule_team_id" />
+                <field name="default_area_id" />
+            </xpath>
+        </field>
+    </record>
+
+    <record id="resource_resource_tree" model="ir.ui.view">
+        <field name="name">resource.resource.tree.schedule</field>
+        <field name="model">resource.resource</field>
+        <field name="inherit_id" ref="resource.resource_resource_tree" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='calendar_id']" position="after">
+                <field name="default_area_id" />
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/resource_schedule/views/resource_schedule_area_view.xml b/resource_schedule/views/resource_schedule_area_view.xml
new file mode 100644
index 00000000..0fde8ff2
--- /dev/null
+++ b/resource_schedule/views/resource_schedule_area_view.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="view_resource_schedule_area_search" model="ir.ui.view">
+        <field name="name">resource.schedule.area.search</field>
+        <field name="model">resource.schedule.area</field>
+        <field name="arch" type="xml">
+            <search string="Resource Scheduling Area Search">
+                <field name="name" />
+                <separator />
+                <filter
+                    string="Archived"
+                    name="inactive"
+                    domain="[('active', '=', False)]"
+                />
+        </search>
+        </field>
+    </record>
+
+    <record id="view_resource_schedule_area_tree" model="ir.ui.view">
+        <field name="name">resource.schedule.area.tree</field>
+        <field name="model">resource.schedule.area</field>
+        <field name="arch" type="xml">
+            <tree string="Scheduling Areas">
+                <field name="name" />
+                <field name="color" widget="color_picker" />
+                <field name="company_id" groups="base.group_multi_company" />
+                <field name="active" widget="boolean_toggle" />
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_resource_schedule_area_form" model="ir.ui.view">
+        <field name="name">resource.schedule.area.form</field>
+        <field name="model">resource.schedule.area</field>
+        <field name="arch" type="xml">
+            <form string="Scheduling Area">
+                <sheet>
+                    <field name="active" invisible="1" />
+                    <widget
+                        name="web_ribbon"
+                        title="Archived"
+                        bg_color="bg-danger"
+                        attrs="{'invisible': [('active', '=', True)]}"
+                    />
+                    <group>
+                        <group>
+                            <field name="name" />
+                            <field name="color" widget="color_picker" />
+                            <field
+                                name="company_id"
+                                groups="base.group_multi_company"
+                            />
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="open_schedule_area_view" model="ir.actions.act_window">
+        <field name="name">Scheduling Area</field>
+        <field name="res_model">resource.schedule.area</field>
+        <field name="view_mode">tree,form</field>
+        <field name="search_view_id" ref="view_resource_schedule_area_search" />
+    </record>
+
+    <menuitem
+        action="open_schedule_area_view"
+        id="menu_schedule_area_view"
+        parent="menu_schedule_config"
+        groups="group_scheduling_manager"
+        sequence="10"
+    />
+
+</odoo>
diff --git a/resource_schedule/views/resource_schedule_group_view.xml b/resource_schedule/views/resource_schedule_group_view.xml
new file mode 100644
index 00000000..84684186
--- /dev/null
+++ b/resource_schedule/views/resource_schedule_group_view.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="view_resource_schedule_group_search" model="ir.ui.view">
+        <field name="name">resource.schedule.group.search</field>
+        <field name="model">resource.schedule.group</field>
+        <field name="arch" type="xml">
+            <search string="Resource Scheduling Group Search">
+                <field name="name" />
+                <separator />
+                <filter
+                    string="Archived"
+                    name="inactive"
+                    domain="[('active', '=', False)]"
+                />
+        </search>
+        </field>
+    </record>
+
+    <record id="view_resource_schedule_group_tree" model="ir.ui.view">
+        <field name="name">resource.schedule.group.tree</field>
+        <field name="model">resource.schedule.group</field>
+        <field name="arch" type="xml">
+            <tree string="Scheduling Groups">
+                <field name="name" />
+                <field name="manager_ids" widget="many2many_tags" />
+                <field name="template_count" />
+                <field name="attendance_template_ids" widget="many2many_tags" />
+                <field name="company_id" groups="base.group_multi_company" />
+                <field name="active" widget="boolean_toggle" />
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_resource_schedule_group_form" model="ir.ui.view">
+        <field name="name">resource.schedule.group.form</field>
+        <field name="model">resource.schedule.group</field>
+        <field name="arch" type="xml">
+            <form string="Scheduling Group">
+                <sheet>
+                    <field name="active" invisible="1" />
+                    <widget
+                        name="web_ribbon"
+                        title="Archived"
+                        bg_color="bg-danger"
+                        attrs="{'invisible': [('active', '=', True)]}"
+                    />
+                    <group>
+                        <group>
+                            <field name="name" />
+                            <field name="template_count" />
+                        </group>
+                        <group>
+                            <field
+                                name="company_id"
+                                groups="base.group_multi_company"
+                            />
+                        </group>
+                    </group>
+                    <group>
+                        <group
+                            name="attendance_template"
+                            string="Work Detail Templates"
+                        >
+                            <field name="attendance_template_ids" nolabel="1">
+                                <tree string="Scheduling Group Work Detail Templates">
+                                    <field name="name" />
+                                    <field name="day_period" />
+                                    <field name="hour_from" />
+                                    <field name="hour_to" />
+                                    <field name="default_area_id" />
+                                </tree>
+                            </field>
+                        </group>
+                        <group name="managers" string="Managers">
+                            <field name="manager_ids" nolabel="1">
+                                <tree string="Scheduling Group Managers">
+                                    <field name="name" />
+                                    <field name="login" />
+                                </tree>
+                            </field>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="open_schedule_group_view" model="ir.actions.act_window">
+        <field name="name">Scheduling Group</field>
+        <field name="res_model">resource.schedule.group</field>
+        <field name="view_mode">tree,form</field>
+        <field name="search_view_id" ref="view_resource_schedule_group_search" />
+    </record>
+
+    <menuitem
+        action="open_schedule_group_view"
+        id="menu_schedule_group_view"
+        parent="menu_schedule_config"
+        groups="group_scheduling_manager"
+        sequence="20"
+    />
+
+</odoo>
diff --git a/resource_schedule/views/resource_schedule_shift_view.xml b/resource_schedule/views/resource_schedule_shift_view.xml
new file mode 100644
index 00000000..c63676d7
--- /dev/null
+++ b/resource_schedule/views/resource_schedule_shift_view.xml
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="view_resource_schedule_search" model="ir.ui.view">
+        <field name="name">resource.schedule.shift.search</field>
+        <field name="model">resource.schedule.shift</field>
+        <field name="arch" type="xml">
+            <search string="Resource Shift Search">
+                <field name="name" />
+                <field name="schedule_team_id" />
+                <field name="resource_id" />
+                <filter
+                    icon="terp-go-today"
+                    string="Today"
+                    name="today"
+                    domain="[('datetime_start','&gt;=',current_date),('datetime_start','&lt;=',current_date)]"
+                />
+                <separator />
+                <filter
+                    name="my_schedule"
+                    string="My Schedule"
+                    domain="[('resource_id.user_id.id', '=', uid)]"
+                />
+                <filter
+                    name="my_team"
+                    string="My Team"
+                    domain="[('schedule_team_id.resource_ids.user_id', '=', uid)]"
+                />
+                <filter
+                    name="my_department"
+                    string="My Department"
+                    domain="[('department_id.manager_id.user_id.id', '=', uid)]"
+                />
+                <filter
+                    name="my_area"
+                    string="My Area"
+                    domain="[('default_area_id.resource_ids.id', 'in', [uid])]"
+                />
+                <separator />
+                <filter
+                    string="Human"
+                    name="human"
+                    domain="[('resource_type','=', 'user')]"
+                />
+                <filter
+                    string="Material"
+                    name="material"
+                    domain="[('resource_type','=', 'material')]"
+                />
+                <separator />
+                <group expand="0" string="Group By...">
+                    <filter
+                        name="date"
+                        string="Date"
+                        icon="terp-personal"
+                        domain="[]"
+                        context="{'group_by':'day'}"
+                    />
+                    <filter
+                        name="area"
+                        string="Area"
+                        icon="terp-personal"
+                        domain="[]"
+                        context="{'group_by':'default_area_id'}"
+                    />
+                    <filter
+                        name="team"
+                        string="Team"
+                        icon="terp-personal"
+                        domain="[]"
+                        context="{'group_by':'schedule_team_id'}"
+                    />
+                    <filter
+                        name="department"
+                        string="Department"
+                        icon="terp-personal"
+                        domain="[]"
+                        context="{'group_by':'department_id'}"
+                    />
+                    <filter
+                        name="resource"
+                        string="Resource"
+                        icon="terp-personal"
+                        domain="[]"
+                        context="{'group_by':'resource_id'}"
+                    />
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="view_resource_schedule_timeline" model="ir.ui.view">
+        <field name="model">resource.schedule.shift</field>
+        <field name="type">timeline</field>
+        <field name="arch" type="xml">
+            <timeline
+                date_start="datetime_start"
+                date_stop="datetime_end"
+                string="Shift hours"
+                default_group_by="resource_id"
+                mode="week"
+                stack="0"
+                color="resource_id"
+                event_open_popup="true"
+                zoomKey="ctrlKey"
+                colors="#ec7063:resource_id == false;"
+            >
+                <field name="resource_id" />
+                <field name="schedule_team_id" />
+                <templates>
+                    <div t-name="timeline-item">
+                        <div t-esc="record.display_name" />
+                    </div>
+                </templates>
+            </timeline>
+        </field>
+    </record>
+
+    <record id="view_resource_schedule_shift_tree" model="ir.ui.view">
+        <field name="name">resource.schedule.shift.tree</field>
+        <field name="model">resource.schedule.shift</field>
+        <field name="arch" type="xml">
+            <tree string="Scheduling">
+                <field name="template_id" invisible="1" />
+                <field name="display_name" />
+                <field name="resource_id" />
+                <field name="schedule_team_id" />
+                <field name="day" />
+                <field name="day_period" />
+                <field name="tz" />
+                <field name="default_area_id" />
+                <field name="resource_type" />
+                <field name="calendar_id" />
+                <field name="published" widget="boolean_toggle" />
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_resource_schedule_shift_form" model="ir.ui.view">
+        <field name="name">resource.schedule.shift.form</field>
+        <field name="model">resource.schedule.shift</field>
+        <field name="arch" type="xml">
+            <form string="Scheduling">
+                <sheet>
+                    <group>
+                        <group name="shift" string="Shift Information">
+                            <field name="template_id" invisible="1" />
+                            <field name="resource_id" />
+                            <field name="datetime_start" />
+                            <field name="datetime_end" />
+                            <field name="duration" invisible="1" />
+                            <field name="day_period" />
+                            <field name="tz" />
+                        </group>
+                        <group name="area" string="Work Area">
+                            <field name="default_area_id" />
+                            <field name="schedule_team_id" />
+                            <field name="department_id" />
+                            <field name="resource_type" />
+                            <field name="published" widget="boolean_toggle" />
+                        </group>
+                    </group>
+                    <group>
+                        <group name="details" string="Work Detail">
+                            <field name="name" invisible="1" />
+                            <field name="dayofweek" />
+                            <field name="hour_from" invisible="1" />
+                            <field name="hour_to" invisible="1" />
+                        </group>
+                        <group name="calendar" string="Work Calendar">
+                            <field name="calendar_id" />
+                            <field
+                                name="company_id"
+                                groups="base.group_multi_company"
+                            />
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="view_resource_schedule_shift_calendar" model="ir.ui.view">
+        <field name="name">resource.schedule.shift.calendar</field>
+        <field name="model">resource.schedule.shift</field>
+        <field name="arch" type="xml">
+            <calendar
+                string="Scheduling"
+                date_start="datetime_start"
+                date_stop="datetime_end"
+                color="resource_id"
+                event_open_popup="true"
+                quick_add="False"
+                mode="week"
+            >
+                <field name="company_id" invisible="1" />
+                <field
+                    name="resource_id"
+                    avatar_field="avatar_128"
+                    widget="many2one_avatar"
+                />
+                <field name="schedule_team_id" filters="1" color="color" />
+                <field name="department_id" filters="1" color="color" />
+                <field name="duration" invisible="1" />
+            </calendar>
+        </field>
+    </record>
+
+    <record id="open_employee_schedule_view" model="ir.actions.act_window">
+        <field name="name">Schedule</field>
+        <field name="res_model">resource.schedule.shift</field>
+        <field name="view_mode">timeline,calendar,tree,form</field>
+        <field name="search_view_id" ref="view_resource_schedule_search" />
+    </record>
+
+    <record id="open_my_schedule_view" model="ir.actions.act_window">
+        <field name="name">My Schedule</field>
+        <field name="res_model">resource.schedule.shift</field>
+        <field name="view_mode">timeline,calendar,tree,form</field>
+        <field name="search_view_id" ref="view_resource_schedule_search" />
+        <field name="context">{'search_default_my_schedule': 1}</field>
+    </record>
+
+    <record id="open_team_schedule_view" model="ir.actions.act_window">
+        <field name="name">My Team Schedule</field>
+        <field name="res_model">resource.schedule.shift</field>
+        <field name="view_mode">timeline,calendar,tree,form</field>
+        <field name="search_view_id" ref="view_resource_schedule_search" />
+        <field name="context">{'search_default_my_team': 1}</field>
+    </record>
+
+    <record id="open_dept_schedule_view" model="ir.actions.act_window">
+        <field name="name">My Department Schedule</field>
+        <field name="res_model">resource.schedule.shift</field>
+        <field name="view_mode">timeline,calendar,tree,form</field>
+        <field name="search_view_id" ref="view_resource_schedule_search" />
+        <field name="context">{'search_default_my_department': 1}</field>
+    </record>
+
+    <menuitem
+        id="menu_schedule_schedule"
+        parent="menu_root_schedule"
+        name="Schedule"
+        sequence="10"
+    />
+
+    <menuitem
+        action="open_my_schedule_view"
+        id="menu_my_schedule_view"
+        parent="menu_schedule_schedule"
+        sequence="10"
+    />
+    <menuitem
+        action="open_team_schedule_view"
+        id="menu_team_schedule_view"
+        parent="menu_schedule_schedule"
+        sequence="20"
+    />
+    <menuitem
+        action="open_dept_schedule_view"
+        id="menu_dept_schedule_view"
+        parent="menu_schedule_schedule"
+        sequence="30"
+    />
+
+</odoo>
diff --git a/resource_schedule/views/resource_schedule_team_view.xml b/resource_schedule/views/resource_schedule_team_view.xml
new file mode 100644
index 00000000..ef562f0a
--- /dev/null
+++ b/resource_schedule/views/resource_schedule_team_view.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="view_resource_schedule_team_search" model="ir.ui.view">
+        <field name="name">resource.schedule.team.search</field>
+        <field name="model">resource.schedule.team</field>
+        <field name="arch" type="xml">
+            <search string="Resource Scheduling Team Search">
+                <field name="name" />
+                <separator />
+                <filter
+                    string="Archived"
+                    name="inactive"
+                    domain="[('active', '=', False)]"
+                />
+        </search>
+        </field>
+    </record>
+
+    <record id="view_resource_schedule_team_tree" model="ir.ui.view">
+        <field name="name">resource.schedule.team.tree</field>
+        <field name="model">resource.schedule.team</field>
+        <field name="arch" type="xml">
+            <tree string="Scheduling Teams">
+                <field name="name" />
+                <field name="resource_count" />
+                <field name="resource_calendar_id" />
+                <field name="start_week" />
+                <field name="color" widget="color_picker" />
+                <field name="company_id" groups="base.group_multi_company" />
+                <field name="active" widget="boolean_toggle" />
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_resource_schedule_team_form" model="ir.ui.view">
+        <field name="name">resource.schedule.team.form</field>
+        <field name="model">resource.schedule.team</field>
+        <field name="arch" type="xml">
+            <form string="Scheduling Team">
+                <sheet>
+                    <field name="active" invisible="1" />
+                    <widget
+                        name="web_ribbon"
+                        title="Archived"
+                        bg_color="bg-danger"
+                        attrs="{'invisible': [('active', '=', True)]}"
+                    />
+                    <group>
+                        <group>
+                            <field name="name" />
+                            <field name="resource_calendar_id" />
+                            <field name="start_week" />
+                        </group>
+                        <group>
+                            <field name="resource_count" />
+                            <field name="color" widget="color_picker" />
+                            <field
+                                name="company_id"
+                                groups="base.group_multi_company"
+                            />
+                        </group>
+                    </group>
+                    <group name="group_resource" string="Resources">
+                        <field name="resource_ids" nolabel="1" />
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="open_schedule_team_view" model="ir.actions.act_window">
+        <field name="name">Scheduling Teams</field>
+        <field name="res_model">resource.schedule.team</field>
+        <field name="view_mode">tree,form</field>
+        <field name="search_view_id" ref="view_resource_schedule_team_search" />
+    </record>
+
+    <menuitem
+        action="open_schedule_team_view"
+        id="menu_schedule_team_view"
+        parent="menu_schedule_config"
+        groups="group_scheduling_manager"
+        sequence="30"
+    />
+
+</odoo>
diff --git a/resource_schedule/wizard/__init__.py b/resource_schedule/wizard/__init__.py
new file mode 100644
index 00000000..4ddff60c
--- /dev/null
+++ b/resource_schedule/wizard/__init__.py
@@ -0,0 +1,6 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import generate_schedules
+from . import validate_schedule
diff --git a/resource_schedule/wizard/generate_schedules.py b/resource_schedule/wizard/generate_schedules.py
new file mode 100644
index 00000000..710ade9f
--- /dev/null
+++ b/resource_schedule/wizard/generate_schedules.py
@@ -0,0 +1,104 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import timedelta
+
+from dateutil.relativedelta import relativedelta
+
+from odoo import api, fields, models
+
+
+class ResourceScheduleGenerate(models.TransientModel):
+
+    _name = "resource.schedule.generate"
+    _description = "Generate Schedules Wizard"
+
+    date_start = fields.Date(string="Start", required=True)
+    no_weeks = fields.Integer(string="Number of weeks", default=2, required=True)
+    type = fields.Selection(
+        selection=[
+            ("employee", "Employee"),
+            ("team", "Team"),
+            (
+                "calendar",
+                "Working Schedule",
+            ),
+        ],
+        required=True,
+        default="employee",
+        help="Choose how to schedule shifts."
+        "Employee - Directly choose the employees for which to schedule shifts."
+        "Team - Shifts will be scheduled for all the employees in the team(s)."
+        "Working Schedule - All employees (and teams) that have been assigned that"
+        "schedule will have shifts scheduled.",
+    )
+    employee_ids = fields.Many2many(
+        string="Employees",
+        comodel_name="hr.employee",
+        relation="hr_employee_schedule_rel",
+        column1="generate_id",
+        column2="employee_id",
+    )
+    resource_calendar_id = fields.Many2one("resource.calendar", "Working Schedule")
+    schedule_team_ids = fields.Many2many("resource.schedule.team", string="Teams")
+
+    @api.onchange("date_start")
+    def onchange_date_start(self):
+
+        for rec in self:
+            # The schedule must start on a Monday
+            if rec.date_start and rec.date_start.weekday() != 0:
+                dStart = rec.date_start
+                while dStart.weekday() != 0:
+                    dStart -= timedelta(days=1)
+                rec.date_start = dStart
+
+    @api.onchange("resource_calendar_id")
+    def _onchange_resource_calendar_id(self):
+
+        for rec in self:
+            if rec.type == "calendar" and rec.resource_calendar_id:
+                resources = self.env["resource.resource"].search(
+                    [("calendar_id", "=", rec.resource_calendar_id.id)]
+                )
+                employees = self.env["hr.employee"].search(
+                    [("resource_id", "in", resources.ids)]
+                )
+                rec.employee_ids = [(6, 0, employees.ids)]
+            elif not rec.resource_calendar_id:
+                rec.employee_ids = [(4, 0, 0)]
+
+    def generate_schedules(self):
+
+        Schedule = self.env["resource.schedule.shift"]
+        dStart = self.date_start
+        dEnd = dStart + relativedelta(weeks=abs(self.no_weeks), days=-1)
+
+        shifts = self.env["resource.schedule.shift"]
+        for ee in self.employee_ids:
+
+            # If there are overlapping schedules, don't create
+            #
+            dTmp = dStart
+            overlap_sched_ids = Schedule.search(
+                [
+                    ("resource_id", "=", ee.resource_id.id),
+                    ("day", "<=", dEnd),
+                    ("day", ">=", dTmp),
+                ]
+            )
+            if len(overlap_sched_ids) > 0:
+                if overlap_sched_ids[-1].day < dEnd:
+                    dTmp = overlap_sched_ids[-1].day + timedelta(days=1)
+
+            shifts |= ee.create_schedule(dTmp, dEnd)
+
+        return {
+            "view_mode": "timeline,calendar,tree,form",
+            "res_model": "resource.schedule.shift",
+            "domain": [("id", "in", shifts.ids)],
+            "type": "ir.actions.act_window",
+            "target": "current",
+            "context": self.env.context,
+        }
diff --git a/resource_schedule/wizard/generate_schedules_view.xml b/resource_schedule/wizard/generate_schedules_view.xml
new file mode 100644
index 00000000..ca6d1fc9
--- /dev/null
+++ b/resource_schedule/wizard/generate_schedules_view.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+
+        <record id="view_schedule_employee_selection" model="ir.ui.view">
+            <field name="name">resource.schedule.generate.view</field>
+            <field name="model">resource.schedule.generate</field>
+            <field name="arch" type="xml">
+                <form string="Schedule Shifts">
+                    <group>
+                        <group>
+                            <field name="date_start" />
+                            <field name="no_weeks" />
+                            <field name="type" />
+                        </group>
+                        <group>
+                            <field
+                                name="resource_calendar_id"
+                                attrs="{
+                                    'required': [('type', '=', 'calendar')],
+                                    'invisible': [('type', '!=', 'calendar')],
+                                }"
+                            />
+                        </group>
+                    </group>
+                    <group string="Employees">
+                        <field name="employee_ids" nolabel="1" />
+                    </group>
+                    <group
+                        string="Teams"
+                        attrs="{'invisible': [('type', '!=', 'team')]}"
+                    >
+                        <field name="schedule_team_ids" />
+                    </group>
+                    <newline />
+                    <footer>
+                        <button
+                            name="generate_schedules"
+                            type="object"
+                            string="Generate"
+                            class="oe_highlight"
+                        />
+                        <button special="cancel" string="Cancel" />
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_schedules_by_employee" model="ir.actions.act_window">
+            <field name="name">Generate Schedules</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">resource.schedule.generate</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+        <menuitem
+            id="menu_schedules_by_employee"
+            action="action_schedules_by_employee"
+            parent="menu_schedule_ops"
+            sequence="10"
+        />
+
+    </data>
+</odoo>
diff --git a/resource_schedule/wizard/validate_schedule.py b/resource_schedule/wizard/validate_schedule.py
new file mode 100644
index 00000000..20d11908
--- /dev/null
+++ b/resource_schedule/wizard/validate_schedule.py
@@ -0,0 +1,41 @@
+# Copyright (C) 2022 Trevi Software (https://trevi.et)
+# Copyright (C) 2013,2014 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import fields, models
+
+
+class DepartmentSelection(models.TransientModel):
+
+    _name = "resource.schedule.validate.departments"
+    _description = "Department Selection for Validation"
+
+    department_ids = fields.Many2many(
+        string="Departments",
+        comodel_name="hr.department",
+    )
+
+    def view_schedules(self):
+
+        data = self.read()[0]
+        return {
+            "view_mode": "tree,form",
+            "res_model": "resource.schedule.shift",
+            "domain": [
+                ("department_id", "in", data["department_ids"]),
+                ("published", "=", False),
+            ],
+            "type": "ir.actions.act_window",
+            "target": "new",
+            "nodestroy": True,
+            "context": self.env.context,
+        }
+
+    def do_validate(self):
+
+        sched_ids = self.env["resource.schedule.shift"].search(
+            [("department_id", "in", self.department_ids.ids)]
+        )
+        sched_ids.publish()
+
+        return {"type": "ir.actions.act_window_close"}
diff --git a/resource_schedule/wizard/validate_schedule_view.xml b/resource_schedule/wizard/validate_schedule_view.xml
new file mode 100644
index 00000000..8ca4d594
--- /dev/null
+++ b/resource_schedule/wizard/validate_schedule_view.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+
+        <record id="view_department_selection" model="ir.ui.view">
+            <field name="name">resource.schedule.validate.departments.view</field>
+            <field name="model">resource.schedule.validate.departments</field>
+            <field name="arch" type="xml">
+                <form string="Departmet Selection">
+                    <group string="Departments">
+                        <field name="department_ids" nolabel="1" />
+                    </group>
+                    <newline />
+                    <footer>
+                        <button
+                            name="view_schedules"
+                            type="object"
+                            string="View Schedules"
+                            class="oe_highlight"
+                        />
+                        <button
+                            name="do_validate"
+                            type="object"
+                            string="Validate All"
+                            class="oe_highlight"
+                        />
+                        <button
+                            special="cancel"
+                            string="Cancel"
+                            class="btn-secondary"
+                        />
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_schedules_by_department" model="ir.actions.act_window">
+            <field name="name">Publish Schedules</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">resource.schedule.validate.departments</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+        <menuitem
+            id="menu_schedules_generate"
+            action="action_schedules_by_department"
+            parent="menu_schedule_ops"
+            sequence="20"
+        />
+
+    </data>
+</odoo>
diff --git a/setup/base_lock/odoo/addons/base_lock b/setup/base_lock/odoo/addons/base_lock
new file mode 120000
index 00000000..a52f5e41
--- /dev/null
+++ b/setup/base_lock/odoo/addons/base_lock
@@ -0,0 +1 @@
+../../../../base_lock
\ No newline at end of file
diff --git a/setup/base_lock/setup.py b/setup/base_lock/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/base_lock/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/hr_accrual_bank/odoo/addons/hr_accrual_bank b/setup/hr_accrual_bank/odoo/addons/hr_accrual_bank
new file mode 120000
index 00000000..b6a5f72d
--- /dev/null
+++ b/setup/hr_accrual_bank/odoo/addons/hr_accrual_bank
@@ -0,0 +1 @@
+../../../../hr_accrual_bank
\ No newline at end of file
diff --git a/setup/hr_accrual_bank/setup.py b/setup/hr_accrual_bank/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/hr_accrual_bank/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/hr_attendance_day/odoo/addons/hr_attendance_day b/setup/hr_attendance_day/odoo/addons/hr_attendance_day
new file mode 120000
index 00000000..23d55cae
--- /dev/null
+++ b/setup/hr_attendance_day/odoo/addons/hr_attendance_day
@@ -0,0 +1 @@
+../../../../hr_attendance_day
\ No newline at end of file
diff --git a/setup/hr_attendance_day/setup.py b/setup/hr_attendance_day/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/hr_attendance_day/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/hr_benefit/odoo/addons/hr_benefit b/setup/hr_benefit/odoo/addons/hr_benefit
new file mode 120000
index 00000000..9f6f0bec
--- /dev/null
+++ b/setup/hr_benefit/odoo/addons/hr_benefit
@@ -0,0 +1 @@
+../../../../hr_benefit
\ No newline at end of file
diff --git a/setup/hr_benefit/setup.py b/setup/hr_benefit/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/hr_benefit/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/hr_benefit_payroll/odoo/addons/hr_benefit_payroll b/setup/hr_benefit_payroll/odoo/addons/hr_benefit_payroll
new file mode 120000
index 00000000..0c47f0fd
--- /dev/null
+++ b/setup/hr_benefit_payroll/odoo/addons/hr_benefit_payroll
@@ -0,0 +1 @@
+../../../../hr_benefit_payroll
\ No newline at end of file
diff --git a/setup/hr_benefit_payroll/setup.py b/setup/hr_benefit_payroll/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/hr_benefit_payroll/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/hr_contract_status/odoo/addons/hr_contract_status b/setup/hr_contract_status/odoo/addons/hr_contract_status
new file mode 120000
index 00000000..2d14363b
--- /dev/null
+++ b/setup/hr_contract_status/odoo/addons/hr_contract_status
@@ -0,0 +1 @@
+../../../../hr_contract_status
\ No newline at end of file
diff --git a/setup/hr_contract_status/setup.py b/setup/hr_contract_status/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/hr_contract_status/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/hr_contract_status_benefit/odoo/addons/hr_contract_status_benefit b/setup/hr_contract_status_benefit/odoo/addons/hr_contract_status_benefit
new file mode 120000
index 00000000..0b33c843
--- /dev/null
+++ b/setup/hr_contract_status_benefit/odoo/addons/hr_contract_status_benefit
@@ -0,0 +1 @@
+../../../../hr_contract_status_benefit
\ No newline at end of file
diff --git a/setup/hr_contract_status_benefit/setup.py b/setup/hr_contract_status_benefit/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/hr_contract_status_benefit/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/hr_contract_values/odoo/addons/hr_contract_values b/setup/hr_contract_values/odoo/addons/hr_contract_values
new file mode 120000
index 00000000..72f7d9da
--- /dev/null
+++ b/setup/hr_contract_values/odoo/addons/hr_contract_values
@@ -0,0 +1 @@
+../../../../hr_contract_values
\ No newline at end of file
diff --git a/setup/hr_contract_values/setup.py b/setup/hr_contract_values/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/hr_contract_values/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/hr_contract_values_payroll/odoo/addons/hr_contract_values_payroll b/setup/hr_contract_values_payroll/odoo/addons/hr_contract_values_payroll
new file mode 120000
index 00000000..bec0fa4e
--- /dev/null
+++ b/setup/hr_contract_values_payroll/odoo/addons/hr_contract_values_payroll
@@ -0,0 +1 @@
+../../../../hr_contract_values_payroll
\ No newline at end of file
diff --git a/setup/hr_contract_values_payroll/setup.py b/setup/hr_contract_values_payroll/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/hr_contract_values_payroll/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/hr_contract_values_resource_schedule/odoo/addons/hr_contract_values_resource_schedule b/setup/hr_contract_values_resource_schedule/odoo/addons/hr_contract_values_resource_schedule
new file mode 120000
index 00000000..316d2f83
--- /dev/null
+++ b/setup/hr_contract_values_resource_schedule/odoo/addons/hr_contract_values_resource_schedule
@@ -0,0 +1 @@
+../../../../hr_contract_values_resource_schedule
\ No newline at end of file
diff --git a/setup/hr_contract_values_resource_schedule/setup.py b/setup/hr_contract_values_resource_schedule/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/hr_contract_values_resource_schedule/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/hr_data_import/odoo/addons/hr_data_import b/setup/hr_data_import/odoo/addons/hr_data_import
new file mode 120000
index 00000000..a9779364
--- /dev/null
+++ b/setup/hr_data_import/odoo/addons/hr_data_import
@@ -0,0 +1 @@
+../../../../hr_data_import
\ No newline at end of file
diff --git a/setup/hr_data_import/setup.py b/setup/hr_data_import/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/hr_data_import/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/hr_employee_seniority_months/odoo/addons/hr_employee_seniority_months b/setup/hr_employee_seniority_months/odoo/addons/hr_employee_seniority_months
new file mode 120000
index 00000000..8e82672d
--- /dev/null
+++ b/setup/hr_employee_seniority_months/odoo/addons/hr_employee_seniority_months
@@ -0,0 +1 @@
+../../../../hr_employee_seniority_months
\ No newline at end of file
diff --git a/setup/hr_employee_seniority_months/setup.py b/setup/hr_employee_seniority_months/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/hr_employee_seniority_months/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/hr_employee_status/odoo/addons/hr_employee_status b/setup/hr_employee_status/odoo/addons/hr_employee_status
new file mode 120000
index 00000000..edae8806
--- /dev/null
+++ b/setup/hr_employee_status/odoo/addons/hr_employee_status
@@ -0,0 +1 @@
+../../../../hr_employee_status
\ No newline at end of file
diff --git a/setup/hr_employee_status/setup.py b/setup/hr_employee_status/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/hr_employee_status/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/hr_employee_status_benefit/odoo/addons/hr_employee_status_benefit b/setup/hr_employee_status_benefit/odoo/addons/hr_employee_status_benefit
new file mode 120000
index 00000000..c467353d
--- /dev/null
+++ b/setup/hr_employee_status_benefit/odoo/addons/hr_employee_status_benefit
@@ -0,0 +1 @@
+../../../../hr_employee_status_benefit
\ No newline at end of file
diff --git a/setup/hr_employee_status_benefit/setup.py b/setup/hr_employee_status_benefit/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/hr_employee_status_benefit/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/hr_employee_status_payroll/odoo/addons/hr_employee_status_payroll b/setup/hr_employee_status_payroll/odoo/addons/hr_employee_status_payroll
new file mode 120000
index 00000000..cc92e02e
--- /dev/null
+++ b/setup/hr_employee_status_payroll/odoo/addons/hr_employee_status_payroll
@@ -0,0 +1 @@
+../../../../hr_employee_status_payroll
\ No newline at end of file
diff --git a/setup/hr_employee_status_payroll/setup.py b/setup/hr_employee_status_payroll/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/hr_employee_status_payroll/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/hr_employee_wizard/odoo/addons/hr_employee_wizard b/setup/hr_employee_wizard/odoo/addons/hr_employee_wizard
new file mode 120000
index 00000000..f246afcd
--- /dev/null
+++ b/setup/hr_employee_wizard/odoo/addons/hr_employee_wizard
@@ -0,0 +1 @@
+../../../../hr_employee_wizard
\ No newline at end of file
diff --git a/setup/hr_employee_wizard/setup.py b/setup/hr_employee_wizard/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/hr_employee_wizard/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/hr_job_change_state/odoo/addons/hr_job_change_state b/setup/hr_job_change_state/odoo/addons/hr_job_change_state
new file mode 120000
index 00000000..790e3067
--- /dev/null
+++ b/setup/hr_job_change_state/odoo/addons/hr_job_change_state
@@ -0,0 +1 @@
+../../../../hr_job_change_state
\ No newline at end of file
diff --git a/setup/hr_job_change_state/setup.py b/setup/hr_job_change_state/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/hr_job_change_state/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/hr_job_transfer/odoo/addons/hr_job_transfer b/setup/hr_job_transfer/odoo/addons/hr_job_transfer
new file mode 120000
index 00000000..ab790de9
--- /dev/null
+++ b/setup/hr_job_transfer/odoo/addons/hr_job_transfer
@@ -0,0 +1 @@
+../../../../hr_job_transfer
\ No newline at end of file
diff --git a/setup/hr_job_transfer/setup.py b/setup/hr_job_transfer/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/hr_job_transfer/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/hr_jobs_hierarchy/odoo/addons/hr_jobs_hierarchy b/setup/hr_jobs_hierarchy/odoo/addons/hr_jobs_hierarchy
new file mode 120000
index 00000000..e7c7dbee
--- /dev/null
+++ b/setup/hr_jobs_hierarchy/odoo/addons/hr_jobs_hierarchy
@@ -0,0 +1 @@
+../../../../hr_jobs_hierarchy
\ No newline at end of file
diff --git a/setup/hr_jobs_hierarchy/setup.py b/setup/hr_jobs_hierarchy/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/hr_jobs_hierarchy/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/hr_leave_type_unique/odoo/addons/hr_leave_type_unique b/setup/hr_leave_type_unique/odoo/addons/hr_leave_type_unique
new file mode 120000
index 00000000..e065f50c
--- /dev/null
+++ b/setup/hr_leave_type_unique/odoo/addons/hr_leave_type_unique
@@ -0,0 +1 @@
+../../../../hr_leave_type_unique
\ No newline at end of file
diff --git a/setup/hr_leave_type_unique/setup.py b/setup/hr_leave_type_unique/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/hr_leave_type_unique/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/hr_leave_type_unique_preinstall/odoo/addons/hr_leave_type_unique_preinstall b/setup/hr_leave_type_unique_preinstall/odoo/addons/hr_leave_type_unique_preinstall
new file mode 120000
index 00000000..a9a96e2d
--- /dev/null
+++ b/setup/hr_leave_type_unique_preinstall/odoo/addons/hr_leave_type_unique_preinstall
@@ -0,0 +1 @@
+../../../../hr_leave_type_unique_preinstall
\ No newline at end of file
diff --git a/setup/hr_leave_type_unique_preinstall/setup.py b/setup/hr_leave_type_unique_preinstall/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/hr_leave_type_unique_preinstall/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/hr_photobooth/odoo/addons/hr_photobooth b/setup/hr_photobooth/odoo/addons/hr_photobooth
new file mode 120000
index 00000000..044174f9
--- /dev/null
+++ b/setup/hr_photobooth/odoo/addons/hr_photobooth
@@ -0,0 +1 @@
+../../../../hr_photobooth
\ No newline at end of file
diff --git a/setup/hr_photobooth/setup.py b/setup/hr_photobooth/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/hr_photobooth/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/payroll_default_salary_rules/odoo/addons/payroll_default_salary_rules b/setup/payroll_default_salary_rules/odoo/addons/payroll_default_salary_rules
new file mode 120000
index 00000000..f7d66884
--- /dev/null
+++ b/setup/payroll_default_salary_rules/odoo/addons/payroll_default_salary_rules
@@ -0,0 +1 @@
+../../../../payroll_default_salary_rules
\ No newline at end of file
diff --git a/setup/payroll_default_salary_rules/setup.py b/setup/payroll_default_salary_rules/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/payroll_default_salary_rules/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/payroll_operating_unit/odoo/addons/payroll_operating_unit b/setup/payroll_operating_unit/odoo/addons/payroll_operating_unit
new file mode 120000
index 00000000..331175dc
--- /dev/null
+++ b/setup/payroll_operating_unit/odoo/addons/payroll_operating_unit
@@ -0,0 +1 @@
+../../../../payroll_operating_unit
\ No newline at end of file
diff --git a/setup/payroll_operating_unit/setup.py b/setup/payroll_operating_unit/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/payroll_operating_unit/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/payroll_operating_unit_access_all/odoo/addons/payroll_operating_unit_access_all b/setup/payroll_operating_unit_access_all/odoo/addons/payroll_operating_unit_access_all
new file mode 120000
index 00000000..cbd899ae
--- /dev/null
+++ b/setup/payroll_operating_unit_access_all/odoo/addons/payroll_operating_unit_access_all
@@ -0,0 +1 @@
+../../../../payroll_operating_unit_access_all
\ No newline at end of file
diff --git a/setup/payroll_operating_unit_access_all/setup.py b/setup/payroll_operating_unit_access_all/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/payroll_operating_unit_access_all/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/payroll_payslip_amendment/odoo/addons/payroll_payslip_amendment b/setup/payroll_payslip_amendment/odoo/addons/payroll_payslip_amendment
new file mode 120000
index 00000000..6c195dff
--- /dev/null
+++ b/setup/payroll_payslip_amendment/odoo/addons/payroll_payslip_amendment
@@ -0,0 +1 @@
+../../../../payroll_payslip_amendment
\ No newline at end of file
diff --git a/setup/payroll_payslip_amendment/setup.py b/setup/payroll_payslip_amendment/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/payroll_payslip_amendment/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/payroll_payslip_amendment_contract_status/odoo/addons/payroll_payslip_amendment_contract_status b/setup/payroll_payslip_amendment_contract_status/odoo/addons/payroll_payslip_amendment_contract_status
new file mode 120000
index 00000000..e8e41e62
--- /dev/null
+++ b/setup/payroll_payslip_amendment_contract_status/odoo/addons/payroll_payslip_amendment_contract_status
@@ -0,0 +1 @@
+../../../../payroll_payslip_amendment_contract_status
\ No newline at end of file
diff --git a/setup/payroll_payslip_amendment_contract_status/setup.py b/setup/payroll_payslip_amendment_contract_status/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/payroll_payslip_amendment_contract_status/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/payroll_payslip_dictionary/odoo/addons/payroll_payslip_dictionary b/setup/payroll_payslip_dictionary/odoo/addons/payroll_payslip_dictionary
new file mode 120000
index 00000000..c1af98d8
--- /dev/null
+++ b/setup/payroll_payslip_dictionary/odoo/addons/payroll_payslip_dictionary
@@ -0,0 +1 @@
+../../../../payroll_payslip_dictionary
\ No newline at end of file
diff --git a/setup/payroll_payslip_dictionary/setup.py b/setup/payroll_payslip_dictionary/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/payroll_payslip_dictionary/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/payroll_payslip_hr_leave_type/odoo/addons/payroll_payslip_hr_leave_type b/setup/payroll_payslip_hr_leave_type/odoo/addons/payroll_payslip_hr_leave_type
new file mode 120000
index 00000000..5971c6dd
--- /dev/null
+++ b/setup/payroll_payslip_hr_leave_type/odoo/addons/payroll_payslip_hr_leave_type
@@ -0,0 +1 @@
+../../../../payroll_payslip_hr_leave_type
\ No newline at end of file
diff --git a/setup/payroll_payslip_hr_leave_type/setup.py b/setup/payroll_payslip_hr_leave_type/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/payroll_payslip_hr_leave_type/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/payroll_payslip_patch/odoo/addons/payroll_payslip_patch b/setup/payroll_payslip_patch/odoo/addons/payroll_payslip_patch
new file mode 120000
index 00000000..cf901004
--- /dev/null
+++ b/setup/payroll_payslip_patch/odoo/addons/payroll_payslip_patch
@@ -0,0 +1 @@
+../../../../payroll_payslip_patch
\ No newline at end of file
diff --git a/setup/payroll_payslip_patch/setup.py b/setup/payroll_payslip_patch/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/payroll_payslip_patch/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/payroll_payslip_report/odoo/addons/payroll_payslip_report b/setup/payroll_payslip_report/odoo/addons/payroll_payslip_report
new file mode 120000
index 00000000..c6b73ab2
--- /dev/null
+++ b/setup/payroll_payslip_report/odoo/addons/payroll_payslip_report
@@ -0,0 +1 @@
+../../../../payroll_payslip_report
\ No newline at end of file
diff --git a/setup/payroll_payslip_report/setup.py b/setup/payroll_payslip_report/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/payroll_payslip_report/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/payroll_period_account/odoo/addons/payroll_period_account b/setup/payroll_period_account/odoo/addons/payroll_period_account
new file mode 120000
index 00000000..f2543b9d
--- /dev/null
+++ b/setup/payroll_period_account/odoo/addons/payroll_period_account
@@ -0,0 +1 @@
+../../../../payroll_period_account
\ No newline at end of file
diff --git a/setup/payroll_period_account/setup.py b/setup/payroll_period_account/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/payroll_period_account/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/payroll_period_base_lock/odoo/addons/payroll_period_base_lock b/setup/payroll_period_base_lock/odoo/addons/payroll_period_base_lock
new file mode 120000
index 00000000..21487f2d
--- /dev/null
+++ b/setup/payroll_period_base_lock/odoo/addons/payroll_period_base_lock
@@ -0,0 +1 @@
+../../../../payroll_period_base_lock
\ No newline at end of file
diff --git a/setup/payroll_period_base_lock/setup.py b/setup/payroll_period_base_lock/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/payroll_period_base_lock/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/payroll_period_by_contract_type/odoo/addons/payroll_period_by_contract_type b/setup/payroll_period_by_contract_type/odoo/addons/payroll_period_by_contract_type
new file mode 120000
index 00000000..c9f18e7e
--- /dev/null
+++ b/setup/payroll_period_by_contract_type/odoo/addons/payroll_period_by_contract_type
@@ -0,0 +1 @@
+../../../../payroll_period_by_contract_type
\ No newline at end of file
diff --git a/setup/payroll_period_by_contract_type/setup.py b/setup/payroll_period_by_contract_type/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/payroll_period_by_contract_type/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/payroll_period_contract_values/odoo/addons/payroll_period_contract_values b/setup/payroll_period_contract_values/odoo/addons/payroll_period_contract_values
new file mode 120000
index 00000000..fdcd08c9
--- /dev/null
+++ b/setup/payroll_period_contract_values/odoo/addons/payroll_period_contract_values
@@ -0,0 +1 @@
+../../../../payroll_period_contract_values
\ No newline at end of file
diff --git a/setup/payroll_period_contract_values/setup.py b/setup/payroll_period_contract_values/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/payroll_period_contract_values/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/payroll_period_payslip_amendment/odoo/addons/payroll_period_payslip_amendment b/setup/payroll_period_payslip_amendment/odoo/addons/payroll_period_payslip_amendment
new file mode 120000
index 00000000..401112fb
--- /dev/null
+++ b/setup/payroll_period_payslip_amendment/odoo/addons/payroll_period_payslip_amendment
@@ -0,0 +1 @@
+../../../../payroll_period_payslip_amendment
\ No newline at end of file
diff --git a/setup/payroll_period_payslip_amendment/setup.py b/setup/payroll_period_payslip_amendment/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/payroll_period_payslip_amendment/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/payroll_period_per_ou/odoo/addons/payroll_period_per_ou b/setup/payroll_period_per_ou/odoo/addons/payroll_period_per_ou
new file mode 120000
index 00000000..586d665f
--- /dev/null
+++ b/setup/payroll_period_per_ou/odoo/addons/payroll_period_per_ou
@@ -0,0 +1 @@
+../../../../payroll_period_per_ou
\ No newline at end of file
diff --git a/setup/payroll_period_per_ou/setup.py b/setup/payroll_period_per_ou/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/payroll_period_per_ou/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/payroll_period_processing/odoo/addons/payroll_period_processing b/setup/payroll_period_processing/odoo/addons/payroll_period_processing
new file mode 120000
index 00000000..98cbe6c2
--- /dev/null
+++ b/setup/payroll_period_processing/odoo/addons/payroll_period_processing
@@ -0,0 +1 @@
+../../../../payroll_period_processing
\ No newline at end of file
diff --git a/setup/payroll_period_processing/setup.py b/setup/payroll_period_processing/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/payroll_period_processing/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/payroll_period_processing_per_ou/odoo/addons/payroll_period_processing_per_ou b/setup/payroll_period_processing_per_ou/odoo/addons/payroll_period_processing_per_ou
new file mode 120000
index 00000000..a50b2563
--- /dev/null
+++ b/setup/payroll_period_processing_per_ou/odoo/addons/payroll_period_processing_per_ou
@@ -0,0 +1 @@
+../../../../payroll_period_processing_per_ou
\ No newline at end of file
diff --git a/setup/payroll_period_processing_per_ou/setup.py b/setup/payroll_period_processing_per_ou/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/payroll_period_processing_per_ou/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/payroll_periods/odoo/addons/payroll_periods b/setup/payroll_periods/odoo/addons/payroll_periods
new file mode 120000
index 00000000..2683aab3
--- /dev/null
+++ b/setup/payroll_periods/odoo/addons/payroll_periods
@@ -0,0 +1 @@
+../../../../payroll_periods
\ No newline at end of file
diff --git a/setup/payroll_periods/setup.py b/setup/payroll_periods/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/payroll_periods/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/payroll_policy_absence/odoo/addons/payroll_policy_absence b/setup/payroll_policy_absence/odoo/addons/payroll_policy_absence
new file mode 120000
index 00000000..4b10ff38
--- /dev/null
+++ b/setup/payroll_policy_absence/odoo/addons/payroll_policy_absence
@@ -0,0 +1 @@
+../../../../payroll_policy_absence
\ No newline at end of file
diff --git a/setup/payroll_policy_absence/setup.py b/setup/payroll_policy_absence/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/payroll_policy_absence/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/payroll_policy_accrual/odoo/addons/payroll_policy_accrual b/setup/payroll_policy_accrual/odoo/addons/payroll_policy_accrual
new file mode 120000
index 00000000..8598757d
--- /dev/null
+++ b/setup/payroll_policy_accrual/odoo/addons/payroll_policy_accrual
@@ -0,0 +1 @@
+../../../../payroll_policy_accrual
\ No newline at end of file
diff --git a/setup/payroll_policy_accrual/setup.py b/setup/payroll_policy_accrual/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/payroll_policy_accrual/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/payroll_policy_group/odoo/addons/payroll_policy_group b/setup/payroll_policy_group/odoo/addons/payroll_policy_group
new file mode 120000
index 00000000..cc8c78d1
--- /dev/null
+++ b/setup/payroll_policy_group/odoo/addons/payroll_policy_group
@@ -0,0 +1 @@
+../../../../payroll_policy_group
\ No newline at end of file
diff --git a/setup/payroll_policy_group/setup.py b/setup/payroll_policy_group/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/payroll_policy_group/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/payroll_policy_ot/odoo/addons/payroll_policy_ot b/setup/payroll_policy_ot/odoo/addons/payroll_policy_ot
new file mode 120000
index 00000000..f3bf68ce
--- /dev/null
+++ b/setup/payroll_policy_ot/odoo/addons/payroll_policy_ot
@@ -0,0 +1 @@
+../../../../payroll_policy_ot
\ No newline at end of file
diff --git a/setup/payroll_policy_ot/setup.py b/setup/payroll_policy_ot/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/payroll_policy_ot/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/payroll_policy_payslip/odoo/addons/payroll_policy_payslip b/setup/payroll_policy_payslip/odoo/addons/payroll_policy_payslip
new file mode 120000
index 00000000..d34b585d
--- /dev/null
+++ b/setup/payroll_policy_payslip/odoo/addons/payroll_policy_payslip
@@ -0,0 +1 @@
+../../../../payroll_policy_payslip
\ No newline at end of file
diff --git a/setup/payroll_policy_payslip/setup.py b/setup/payroll_policy_payslip/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/payroll_policy_payslip/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/payroll_policy_presence/odoo/addons/payroll_policy_presence b/setup/payroll_policy_presence/odoo/addons/payroll_policy_presence
new file mode 120000
index 00000000..609030fb
--- /dev/null
+++ b/setup/payroll_policy_presence/odoo/addons/payroll_policy_presence
@@ -0,0 +1 @@
+../../../../payroll_policy_presence
\ No newline at end of file
diff --git a/setup/payroll_policy_presence/setup.py b/setup/payroll_policy_presence/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/payroll_policy_presence/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/payroll_policy_rounding/odoo/addons/payroll_policy_rounding b/setup/payroll_policy_rounding/odoo/addons/payroll_policy_rounding
new file mode 120000
index 00000000..c4f72df1
--- /dev/null
+++ b/setup/payroll_policy_rounding/odoo/addons/payroll_policy_rounding
@@ -0,0 +1 @@
+../../../../payroll_policy_rounding
\ No newline at end of file
diff --git a/setup/payroll_policy_rounding/setup.py b/setup/payroll_policy_rounding/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/payroll_policy_rounding/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/payroll_register/odoo/addons/payroll_register b/setup/payroll_register/odoo/addons/payroll_register
new file mode 120000
index 00000000..cc5ad3a6
--- /dev/null
+++ b/setup/payroll_register/odoo/addons/payroll_register
@@ -0,0 +1 @@
+../../../../payroll_register
\ No newline at end of file
diff --git a/setup/payroll_register/setup.py b/setup/payroll_register/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/payroll_register/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/payroll_register_report/odoo/addons/payroll_register_report b/setup/payroll_register_report/odoo/addons/payroll_register_report
new file mode 120000
index 00000000..48717b66
--- /dev/null
+++ b/setup/payroll_register_report/odoo/addons/payroll_register_report
@@ -0,0 +1 @@
+../../../../payroll_register_report
\ No newline at end of file
diff --git a/setup/payroll_register_report/setup.py b/setup/payroll_register_report/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/payroll_register_report/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/res_currency_denomination/odoo/addons/res_currency_denomination b/setup/res_currency_denomination/odoo/addons/res_currency_denomination
new file mode 120000
index 00000000..7323a341
--- /dev/null
+++ b/setup/res_currency_denomination/odoo/addons/res_currency_denomination
@@ -0,0 +1 @@
+../../../../res_currency_denomination
\ No newline at end of file
diff --git a/setup/res_currency_denomination/setup.py b/setup/res_currency_denomination/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/res_currency_denomination/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/resource_schedule/odoo/addons/resource_schedule b/setup/resource_schedule/odoo/addons/resource_schedule
new file mode 120000
index 00000000..59b958e1
--- /dev/null
+++ b/setup/resource_schedule/odoo/addons/resource_schedule
@@ -0,0 +1 @@
+../../../../resource_schedule
\ No newline at end of file
diff --git a/setup/resource_schedule/setup.py b/setup/resource_schedule/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/resource_schedule/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/trevi_hr_job_categories/odoo/addons/trevi_hr_job_categories b/setup/trevi_hr_job_categories/odoo/addons/trevi_hr_job_categories
new file mode 120000
index 00000000..284ede41
--- /dev/null
+++ b/setup/trevi_hr_job_categories/odoo/addons/trevi_hr_job_categories
@@ -0,0 +1 @@
+../../../../trevi_hr_job_categories
\ No newline at end of file
diff --git a/setup/trevi_hr_job_categories/setup.py b/setup/trevi_hr_job_categories/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/trevi_hr_job_categories/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/trevi_hr_usability/odoo/addons/trevi_hr_usability b/setup/trevi_hr_usability/odoo/addons/trevi_hr_usability
new file mode 120000
index 00000000..b4b0e803
--- /dev/null
+++ b/setup/trevi_hr_usability/odoo/addons/trevi_hr_usability
@@ -0,0 +1 @@
+../../../../trevi_hr_usability
\ No newline at end of file
diff --git a/setup/trevi_hr_usability/setup.py b/setup/trevi_hr_usability/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/trevi_hr_usability/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/trevi_hr_job_categories/README.rst b/trevi_hr_job_categories/README.rst
new file mode 100644
index 00000000..b8007d4e
--- /dev/null
+++ b/trevi_hr_job_categories/README.rst
@@ -0,0 +1,7 @@
+Attach Categories (Tags) to Employees Based on Job Position
+===========================================================
+
+This module is useful for tagging employees based on their job positions. For example,
+all Supervisors could be attached to the Supervisors category. Define which categries
+a job belongs to in the configuration for the job. When an employee is assigned a particular
+job the categories attached to that job will be attached to the employee record as well.
diff --git a/trevi_hr_job_categories/__init__.py b/trevi_hr_job_categories/__init__.py
new file mode 100644
index 00000000..2b0f2dca
--- /dev/null
+++ b/trevi_hr_job_categories/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
diff --git a/trevi_hr_job_categories/__manifest__.py b/trevi_hr_job_categories/__manifest__.py
new file mode 100644
index 00000000..c00381e9
--- /dev/null
+++ b/trevi_hr_job_categories/__manifest__.py
@@ -0,0 +1,17 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Job Categories",
+    "version": "15.0.1.0.0",
+    "license": "AGPL-3",
+    "category": "Human Resources",
+    "author": "TREVI Software",
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": ["hr", "hr_contract"],
+    "data": [
+        "views/hr_view.xml",
+    ],
+    "installable": True,
+}
diff --git a/trevi_hr_job_categories/i18n/trevi_hr_job_categories.pot b/trevi_hr_job_categories/i18n/trevi_hr_job_categories.pot
new file mode 100644
index 00000000..15832f0e
--- /dev/null
+++ b/trevi_hr_job_categories/i18n/trevi_hr_job_categories.pot
@@ -0,0 +1,52 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* trevi_hr_job_categories
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: trevi_hr_job_categories
+#: model:ir.model.fields,field_description:trevi_hr_job_categories.field_hr_job__category_ids
+msgid "Associated Tags"
+msgstr ""
+
+#. module: trevi_hr_job_categories
+#: model:ir.model.fields,field_description:trevi_hr_job_categories.field_hr_contract__display_name
+#: model:ir.model.fields,field_description:trevi_hr_job_categories.field_hr_job__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: trevi_hr_job_categories
+#: model:ir.model,name:trevi_hr_job_categories.model_hr_contract
+msgid "Employee Contract"
+msgstr ""
+
+#. module: trevi_hr_job_categories
+#: model:ir.model.fields,field_description:trevi_hr_job_categories.field_hr_contract__id
+#: model:ir.model.fields,field_description:trevi_hr_job_categories.field_hr_job__id
+msgid "ID"
+msgstr ""
+
+#. module: trevi_hr_job_categories
+#: model:ir.model,name:trevi_hr_job_categories.model_hr_job
+msgid "Job Position"
+msgstr ""
+
+#. module: trevi_hr_job_categories
+#: model:ir.model.fields,field_description:trevi_hr_job_categories.field_hr_contract____last_update
+#: model:ir.model.fields,field_description:trevi_hr_job_categories.field_hr_job____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: trevi_hr_job_categories
+#: model_terms:ir.ui.view,arch_db:trevi_hr_job_categories.view_job_form
+msgid "e.g. Part Time"
+msgstr ""
diff --git a/trevi_hr_job_categories/models/__init__.py b/trevi_hr_job_categories/models/__init__.py
new file mode 100644
index 00000000..4c6d96de
--- /dev/null
+++ b/trevi_hr_job_categories/models/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import hr
diff --git a/trevi_hr_job_categories/models/hr.py b/trevi_hr_job_categories/models/hr.py
new file mode 100644
index 00000000..65243020
--- /dev/null
+++ b/trevi_hr_job_categories/models/hr.py
@@ -0,0 +1,88 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import api, fields, models
+
+
+class HrJob(models.Model):
+
+    _inherit = "hr.job"
+
+    category_ids = fields.Many2many(
+        string="Associated Tags",
+        comodel_name="hr.employee.category",
+        relation="job_category_rel",
+        column1="job_id",
+        column2="category_id",
+    )
+
+
+class HrContract(models.Model):
+
+    _name = "hr.contract"
+    _inherit = "hr.contract"
+
+    @api.model
+    def _remove_tags(self, employee_id, job_id):
+
+        if not employee_id or not job_id:
+            return
+
+        employee = self.env["hr.employee"].browse(employee_id)
+        job = self.env["hr.job"].browse(job_id)
+
+        for tag in job.category_ids:
+            if tag in employee.category_ids:
+                employee.write({"category_ids": [(3, tag.id)]})
+
+        return
+
+    @api.model
+    def _tag_employees(self, employee_id, job_id):
+
+        if not employee_id or not job_id:
+            return
+
+        employee = self.env["hr.employee"].browse(employee_id)
+        job = self.env["hr.job"].browse(job_id)
+
+        for tag in job.category_ids:
+            if tag not in employee.category_ids:
+                employee.write({"category_ids": [(4, tag.id)]})
+
+        return
+
+    @api.model
+    def create(self, vals):
+
+        res = super(HrContract, self).create(vals)
+
+        self._tag_employees(vals.get("employee_id", False), vals.get("job_id", False))
+        return res
+
+    def write(self, vals):
+
+        prev_data = self.read(["job_id"])
+        res = super(HrContract, self).write(vals)
+
+        # Go through each record and delete tags associated with the previous job, then
+        # add the tags of the new job.
+        #
+        for contract in self:
+            for data in prev_data:
+                if data["id"] == contract.id:
+                    if not vals.get("job_id", False) or (
+                        data.get("job_id", False)
+                        and data["job_id"][0] != vals["job_id"]
+                    ):
+                        prev_job_id = (
+                            data.get("job_id", False) and data["job_id"][0] or False
+                        )
+                        self._remove_tags(contract.employee_id.id, prev_job_id)
+                        if vals.get("job_id", False):
+                            self._tag_employees(
+                                contract.employee_id.id, contract.job_id.id
+                            )
+
+        return res
diff --git a/trevi_hr_job_categories/static/description/icon.png b/trevi_hr_job_categories/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/trevi_hr_job_categories/static/description/icon.png differ
diff --git a/trevi_hr_job_categories/tests/__init__.py b/trevi_hr_job_categories/tests/__init__.py
new file mode 100644
index 00000000..ac9907f3
--- /dev/null
+++ b/trevi_hr_job_categories/tests/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import test_contract
diff --git a/trevi_hr_job_categories/tests/test_contract.py b/trevi_hr_job_categories/tests/test_contract.py
new file mode 100644
index 00000000..a9d3413a
--- /dev/null
+++ b/trevi_hr_job_categories/tests/test_contract.py
@@ -0,0 +1,141 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import timedelta
+
+from odoo.fields import Date
+
+from odoo.addons.hr_contract.tests.test_contract import TestHrContracts
+
+
+class TestContract(TestHrContracts):
+    @classmethod
+    def setUpClass(cls):
+        super(TestContract, cls).setUpClass()
+
+        # -- models
+        cls.Category = cls.env["hr.employee.category"]
+        cls.Contract = cls.env["hr.contract"]
+        cls.Employee = cls.env["hr.employee"]
+        cls.Job = cls.env["hr.job"]
+
+        # -- contract dates
+        cls.dstart = Date.today()
+        cls.dend = Date.today() + timedelta(days=90)
+        cls.contract_data = {
+            "name": "Contract #1",
+            "employee_id": cls.employee.id,
+            "job_id": False,
+            "wage": 1,
+            "state": "open",
+            "kanban_state": "normal",
+            "date_start": Date.today(),
+            "date_end": Date.today() + timedelta(days=90),
+        }
+
+        # -- Categories
+        cls.category_sales = cls.Category.create(
+            {"name": "#Sales", "employee_ids": False}
+        )
+        cls.category_it = cls.Category.create({"name": "#IT", "employee_ids": False})
+        cls.category_marketing = cls.Category.create(
+            {"name": "#Marketing", "employee_ids": False}
+        )
+        cls.category_management = cls.Category.create(
+            {"name": "#Management", "employee_ids": False}
+        )
+        cls.category_consultant = cls.Category.create(
+            {"name": "#Consultant", "employee_ids": False}
+        )
+
+        # -- Jobs
+        cls.job_mkt_director = cls.Job.create(
+            {
+                "name": "#Marketing Director",
+                "category_ids": [(4, cls.category_marketing.id)],
+            }
+        )
+        cls.job_ux_designer = cls.Job.create(
+            {
+                "name": "#UX Designer",
+                "category_ids": [(4, cls.category_it.id)],
+            }
+        )
+        cls.job_sale_associate = cls.Job.create(
+            {
+                "name": "#Sales Associate",
+                "category_ids": [(4, cls.category_sales.id)],
+            }
+        )
+        cls.job_store_manager = cls.Job.create(
+            {
+                "name": "#Store Manager",
+                "category_ids": [(4, cls.category_sales.id)],
+            }
+        )
+        cls.job_product_manager = cls.Job.create(
+            {
+                "name": "#Product Manager",
+                "category_ids": [(4, cls.category_marketing.id)],
+            }
+        )
+        cls.job_developer = cls.Job.create(
+            {"name": "#Developer", "category_ids": False}
+        )
+
+    def assign_category_to_job(self, category_id, job_id):
+        return self.Job.browse(job_id).write({"category_ids": [(4, category_id)]})
+
+    def assign_category_to_employee(self, category_id, employee_id):
+        return self.Employee.browse(employee_id).write(
+            {"category_ids", [(4, category_id)]}
+        )
+
+    def assign_job_to_employee(self, job_id, employee_id):
+        return self.Employee.browse(employee_id).write({"job_id": job_id})
+
+    def test_add_tag_to_employee(self):
+        self.assign_job_to_employee(self.job_store_manager, self.employee.id)
+        contract = self.create_contract("open", "normal", self.dstart, self.dend)
+        contract._tag_employees(self.employee.id, self.job_store_manager.id)
+        self.assertIn(self.category_sales, self.employee.category_ids)
+
+    def test_remove_tag_from_employee(self):
+        self.assign_job_to_employee(self.job_product_manager.id, self.employee.id)
+        self.assign_category_to_job(
+            self.category_management.id, self.job_product_manager.id
+        )
+        contract = self.create_contract("open", "normal", self.dstart, self.dend)
+        contract._remove_tags(self.employee.id, self.job_product_manager.id)
+
+        self.assertNotIn(self.category_marketing, self.employee.category_ids)
+        self.assertNotIn(self.category_management, self.employee.category_ids)
+
+    def test_add_job_tags_to_employee_on_contract_create(self):
+        self.assign_category_to_job(self.category_it.id, self.job_developer.id)
+        self.contract_data["employee_id"] = self.employee.id
+        self.contract_data["job_id"] = self.job_developer.id
+        contract = self.Contract.create(self.contract_data)
+
+        self.assertEqual(self.job_developer, contract.job_id)
+        self.assertIn(self.category_it, self.employee.category_ids)
+
+    def test_employee_categories_change_with_job_change(self):
+        self.assign_category_to_job(self.category_it.id, self.job_developer.id)
+        self.assign_category_to_job(
+            self.category_management.id, self.job_product_manager.id
+        )
+
+        self.contract_data["employee_id"] = self.employee.id
+        self.contract_data["job_id"] = self.job_developer.id
+
+        contract = self.Contract.create(self.contract_data)
+
+        self.assertIn(self.category_it, self.employee.category_ids)
+
+        contract.job_id = self.job_product_manager
+
+        self.assertNotIn(self.category_it, self.employee.category_ids)
+        self.assertIn(self.category_marketing, self.employee.category_ids)
+        self.assertIn(self.category_management, self.employee.category_ids)
diff --git a/trevi_hr_job_categories/views/hr_view.xml b/trevi_hr_job_categories/views/hr_view.xml
new file mode 100644
index 00000000..1df351c9
--- /dev/null
+++ b/trevi_hr_job_categories/views/hr_view.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+
+    <record id="view_job_form" model="ir.ui.view">
+        <field name="name">hr.job.categories</field>
+        <field name="model">hr.job</field>
+        <field name="inherit_id" ref="hr.view_hr_job_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//div[hasclass('oe_title')]" position="inside">
+                <label
+                    for="category_ids"
+                    class="oe_edit_only"
+                    groups="hr.group_hr_manager"
+                />
+                <field
+                    name="category_ids"
+                    widget="many2many_tags"
+                    placeholder="e.g. Part Time"
+                    groups="hr.group_hr_manager"
+                />
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/trevi_hr_usability/README.rst b/trevi_hr_usability/README.rst
new file mode 100644
index 00000000..c800605d
--- /dev/null
+++ b/trevi_hr_usability/README.rst
@@ -0,0 +1,68 @@
+==========================
+Simplify Employee Records.
+==========================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:f7efb0383961c66cfb025df43d014b7dbe3ddb0a70d3670cc91045e466c0b26f
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github
+    :target: https://github.com/trevi-software/trevi-hr/tree/14.0/trevi_hr_usability
+    :alt: trevi-software/trevi-hr
+
+|badge1| |badge2| |badge3|
+
+Make Employee Records and Contracts Easier to Work With
+=======================================================
+#. Make the job id in employee object reference job id in latest contract.
+#. When moving from employee to contract pre-populate the employee field.
+#. In the contract form show only those positions belonging to the
+   department the employee belongs to.
+#. Make country (nationality) default to Ethiopia
+#. Make official identification document number unique
+#. Employees can only access their own contracts unless they're an HR Officer
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/trevi-software/trevi-hr/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20trevi_hr_usability%0Aversion:%2014.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* TREVI Software
+
+Other credits
+~~~~~~~~~~~~~
+
+* Michael Telahun Makonnen <mtm@trevi.et>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `trevi-software/trevi-hr <https://github.com/trevi-software/trevi-hr/tree/14.0/trevi_hr_usability>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/trevi_hr_usability/__init__.py b/trevi_hr_usability/__init__.py
new file mode 100644
index 00000000..2b0f2dca
--- /dev/null
+++ b/trevi_hr_usability/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
diff --git a/trevi_hr_usability/__manifest__.py b/trevi_hr_usability/__manifest__.py
new file mode 100644
index 00000000..50c4c128
--- /dev/null
+++ b/trevi_hr_usability/__manifest__.py
@@ -0,0 +1,22 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Simplify Employee Records.",
+    "version": "15.0.1.0.0",
+    "license": "AGPL-3",
+    "category": "Human Resources",
+    "author": "TREVI Software",
+    "website": "https://github.com/trevi-software/trevi-hr",
+    "depends": [
+        "hr",
+        "hr_contract",
+    ],
+    "data": [
+        "security/ir.model.access.csv",
+        "security/ir_rule.xml",
+        "views/hr_simplify_view.xml",
+    ],
+    "installable": True,
+}
diff --git a/trevi_hr_usability/i18n/trevi_hr_usability.pot b/trevi_hr_usability/i18n/trevi_hr_usability.pot
new file mode 100644
index 00000000..a5339739
--- /dev/null
+++ b/trevi_hr_usability/i18n/trevi_hr_usability.pot
@@ -0,0 +1,94 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* trevi_hr_usability
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: trevi_hr_usability
+#: model:ir.model.fields,field_description:trevi_hr_usability.field_hr_job__no_of_employee
+msgid "Current Number of Employees"
+msgstr ""
+
+#. module: trevi_hr_usability
+#: model:ir.model.fields,field_description:trevi_hr_usability.field_hr_contract__employee_dept_id
+msgid "Default Dept Id"
+msgstr ""
+
+#. module: trevi_hr_usability
+#: model:ir.model.fields,field_description:trevi_hr_usability.field_hr_contract__display_name
+#: model:ir.model.fields,field_description:trevi_hr_usability.field_hr_employee__display_name
+#: model:ir.model.fields,field_description:trevi_hr_usability.field_hr_job__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: trevi_hr_usability
+#: model:ir.model,name:trevi_hr_usability.model_hr_employee
+#: model:ir.model.fields,field_description:trevi_hr_usability.field_hr_contract__employee_id
+msgid "Employee"
+msgstr ""
+
+#. module: trevi_hr_usability
+#: model:ir.model,name:trevi_hr_usability.model_hr_contract
+msgid "Employee Contract"
+msgstr ""
+
+#. module: trevi_hr_usability
+#: model:ir.model.fields,help:trevi_hr_usability.field_hr_job__expected_employees
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr ""
+
+#. module: trevi_hr_usability
+#: model:ir.model.fields,field_description:trevi_hr_usability.field_hr_contract__id
+#: model:ir.model.fields,field_description:trevi_hr_usability.field_hr_employee__id
+#: model:ir.model.fields,field_description:trevi_hr_usability.field_hr_job__id
+msgid "ID"
+msgstr ""
+
+#. module: trevi_hr_usability
+#: model:ir.model.fields,field_description:trevi_hr_usability.field_hr_employee__job_id
+msgid "Job"
+msgstr ""
+
+#. module: trevi_hr_usability
+#: model:ir.model,name:trevi_hr_usability.model_hr_job
+msgid "Job Position"
+msgstr ""
+
+#. module: trevi_hr_usability
+#: model:ir.model.fields,field_description:trevi_hr_usability.field_hr_contract____last_update
+#: model:ir.model.fields,field_description:trevi_hr_usability.field_hr_employee____last_update
+#: model:ir.model.fields,field_description:trevi_hr_usability.field_hr_job____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: trevi_hr_usability
+#: model:ir.model.fields,field_description:trevi_hr_usability.field_hr_employee__country_id
+msgid "Nationality (Country)"
+msgstr ""
+
+#. module: trevi_hr_usability
+#: model:ir.model.fields,help:trevi_hr_usability.field_hr_job__no_of_employee
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: trevi_hr_usability
+#: code:addons/trevi_hr_usability/models/hr_simplify.py:0
+#: model:ir.model.constraint,message:trevi_hr_usability.constraint_hr_employee_unique_identification_id
+#, python-format
+msgid "Official Identifications must be unique!"
+msgstr ""
+
+#. module: trevi_hr_usability
+#: model:ir.model.fields,field_description:trevi_hr_usability.field_hr_job__expected_employees
+msgid "Total Forecasted Employees"
+msgstr ""
diff --git a/trevi_hr_usability/models/__init__.py b/trevi_hr_usability/models/__init__.py
new file mode 100644
index 00000000..3b30e548
--- /dev/null
+++ b/trevi_hr_usability/models/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import hr_simplify
diff --git a/trevi_hr_usability/models/hr_simplify.py b/trevi_hr_usability/models/hr_simplify.py
new file mode 100644
index 00000000..f6387907
--- /dev/null
+++ b/trevi_hr_usability/models/hr_simplify.py
@@ -0,0 +1,91 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import _, api, fields, models
+
+
+class HrEmployee(models.Model):
+    """Simplified Employee Record Interface."""
+
+    _name = "hr.employee"
+    _inherit = "hr.employee"
+    _sql_constraints = [
+        (
+            "unique_identification_id",
+            "unique(identification_id)",
+            _("Official Identifications must be unique!"),
+        ),
+    ]
+
+    @api.model
+    def _default_country(self):
+
+        cid = self.env["res.country"].search([("code", "=", "ET")])
+        if cid:
+            return cid[0]
+
+    country_id = fields.Many2one(default=_default_country)
+    job_id = fields.Many2one(
+        related="contract_id.job_id", comodel_name="hr.job", string="Job", readonly=True
+    )
+
+
+class HrContract(models.Model):
+
+    _inherit = "hr.contract"
+
+    @api.model
+    def _default_employee(self):
+
+        if self.env.context is not None:
+            e_ids = self.env.context.get("search_default_employee_id", False)
+            if e_ids:
+                return e_ids[0]
+
+    employee_id = fields.Many2one(default=_default_employee)
+    employee_dept_id = fields.Many2one(
+        string="Default Dept Id",
+        related="employee_id.department_id",
+        comodel_name="hr.department",
+    )
+
+    @api.onchange("employee_id")
+    def onchange_employee_id(self):
+
+        if self.employee_id:
+            dept = self.employee_id.department_id
+            self.employee_dept_id = dept.id
+        else:
+            self.employee_dept_id = False
+
+
+class HrJob(models.Model):
+
+    _name = "hr.job"
+    _inherit = "hr.job"
+
+    no_of_employee = fields.Integer(
+        string="Current Number of Employees",
+        compute="_compute_employees",
+        help="Number of employees currently occupying this job position.",
+    )
+    expected_employees = fields.Integer(
+        compute="_compute_employees",
+        string="Total Forecasted Employees",
+        help="Expected number of employees for this job position after new recruitment.",
+    )
+
+    @api.depends("no_of_recruitment", "employee_ids.job_id", "employee_ids.active")
+    def _compute_employees(self):
+        contract_data = self.env["hr.contract"].read_group(
+            [("job_id", "in", self.ids), ("date_end", "<=", fields.Date.today())],
+            ["job_id"],
+            ["job_id"],
+        )
+        result = {data["job_id"][0]: data["job_id_count"] for data in contract_data}
+        for record in self:
+            record.no_of_employee = result.get(record.id, 0)
+            record.expected_employees = (
+                result.get(record.id, 0) + record.no_of_recruitment
+            )
diff --git a/trevi_hr_usability/readme/CREDITS.rst b/trevi_hr_usability/readme/CREDITS.rst
new file mode 100644
index 00000000..d264bc7e
--- /dev/null
+++ b/trevi_hr_usability/readme/CREDITS.rst
@@ -0,0 +1 @@
+* Michael Telahun Makonnen <mtm@trevi.et>
diff --git a/trevi_hr_usability/readme/DESCRIPTION.rst b/trevi_hr_usability/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..bbbf499b
--- /dev/null
+++ b/trevi_hr_usability/readme/DESCRIPTION.rst
@@ -0,0 +1,9 @@
+Make Employee Records and Contracts Easier to Work With
+=======================================================
+#. Make the job id in employee object reference job id in latest contract.
+#. When moving from employee to contract pre-populate the employee field.
+#. In the contract form show only those positions belonging to the
+   department the employee belongs to.
+#. Make country (nationality) default to Ethiopia
+#. Make official identification document number unique
+#. Employees can only access their own contracts unless they're an HR Officer
diff --git a/trevi_hr_usability/security/ir.model.access.csv b/trevi_hr_usability/security/ir.model.access.csv
new file mode 100644
index 00000000..44f414c2
--- /dev/null
+++ b/trevi_hr_usability/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_contract_user,access_hr_contract,hr_contract.model_hr_contract,base.group_user,1,0,0,0
diff --git a/trevi_hr_usability/security/ir_rule.xml b/trevi_hr_usability/security/ir_rule.xml
new file mode 100644
index 00000000..74ca6ec9
--- /dev/null
+++ b/trevi_hr_usability/security/ir_rule.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" ?>
+<odoo>
+  <data noupdate="1">
+
+    <record id="property_rule_contract_employee" model="ir.rule">
+        <field name="name">Employee Own Contract</field>
+        <field name="model_id" ref="hr_contract.model_hr_contract" />
+        <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
+        <field name="groups" eval="[(4,ref('base.group_user'))]" />
+    </record>
+    <record id="property_rule_contract_officer" model="ir.rule">
+        <field name="name">HR Officer Contract</field>
+        <field name="model_id" ref="hr_contract.model_hr_contract" />
+        <field name="domain_force">[(1, '=', 1)]</field>
+        <field name="groups" eval="[(4,ref('hr.group_hr_user'))]" />
+    </record>
+
+  </data>
+</odoo>
diff --git a/trevi_hr_usability/static/description/icon.png b/trevi_hr_usability/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/trevi_hr_usability/static/description/icon.png differ
diff --git a/trevi_hr_usability/static/description/index.html b/trevi_hr_usability/static/description/index.html
new file mode 100644
index 00000000..e72e303f
--- /dev/null
+++ b/trevi_hr_usability/static/description/index.html
@@ -0,0 +1,416 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Simplify Employee Records.</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="simplify-employee-records">
+<h1 class="title">Simplify Employee Records.</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:f7efb0383961c66cfb025df43d014b7dbe3ddb0a70d3670cc91045e466c0b26f
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/trevi-software/trevi-hr/tree/14.0/trevi_hr_usability"><img alt="trevi-software/trevi-hr" src="https://img.shields.io/badge/github-trevi--software%2Ftrevi--hr-lightgray.png?logo=github" /></a></p>
+<div class="section" id="make-employee-records-and-contracts-easier-to-work-with">
+<h1>Make Employee Records and Contracts Easier to Work With</h1>
+<ol class="arabic simple">
+<li>Make the job id in employee object reference job id in latest contract.</li>
+<li>When moving from employee to contract pre-populate the employee field.</li>
+<li>In the contract form show only those positions belonging to the
+department the employee belongs to.</li>
+<li>Make country (nationality) default to Ethiopia</li>
+<li>Make official identification document number unique</li>
+<li>Employees can only access their own contracts unless they’re an HR Officer</li>
+</ol>
+<p><strong>Table of contents</strong></p>
+</div>
+<div class="section" id="bug-tracker">
+<h1>Bug Tracker</h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/trevi-software/trevi-hr/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/trevi-software/trevi-hr/issues/new?body=module:%20trevi_hr_usability%0Aversion:%2014.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>Credits</h1>
+<div class="section" id="authors">
+<h2>Authors</h2>
+<ul class="simple">
+<li>TREVI Software</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2>Other credits</h2>
+<ul class="simple">
+<li>Michael Telahun Makonnen &lt;<a class="reference external" href="mailto:mtm&#64;trevi.et">mtm&#64;trevi.et</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2>Maintainers</h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/trevi-software/trevi-hr/tree/14.0/trevi_hr_usability">trevi-software/trevi-hr</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/trevi_hr_usability/static/src/img/main_screenshot.png b/trevi_hr_usability/static/src/img/main_screenshot.png
new file mode 100644
index 00000000..ab78e067
Binary files /dev/null and b/trevi_hr_usability/static/src/img/main_screenshot.png differ
diff --git a/trevi_hr_usability/tests/__init__.py b/trevi_hr_usability/tests/__init__.py
new file mode 100644
index 00000000..144fc86d
--- /dev/null
+++ b/trevi_hr_usability/tests/__init__.py
@@ -0,0 +1,6 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import test_hr_contract
+from . import test_hr_simplify
diff --git a/trevi_hr_usability/tests/test_hr_contract.py b/trevi_hr_usability/tests/test_hr_contract.py
new file mode 100644
index 00000000..91099d4e
--- /dev/null
+++ b/trevi_hr_usability/tests/test_hr_contract.py
@@ -0,0 +1,145 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+
+from odoo import fields
+from odoo.exceptions import AccessError
+from odoo.tests import common, new_test_user
+
+
+class TestHrContract(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super(TestHrContract, cls).setUpClass()
+
+        cls.HrContract = cls.env["hr.contract"]
+        cls.HrEmployee = cls.env["hr.employee"]
+        cls.hro = new_test_user(
+            cls.env,
+            login="hro",
+            groups="base.group_user,hr.group_hr_user",
+            name="HRO",
+            email="hro@example.com",
+        )
+        cls.john = new_test_user(
+            cls.env,
+            login="john",
+            groups="base.group_user",
+            name="John",
+            email="j@example.com",
+        )
+        cls.eeJohn = cls.HrEmployee.create({"name": "John", "user_id": cls.john.id})
+
+    def test_view_own_contract(self):
+        """An employee can view his/her own contract"""
+
+        contract = self.HrContract.create(
+            {
+                "name": "CRef",
+                "employee_id": self.eeJohn.id,
+                "date_start": fields.Date.today(),
+                "wage": 1,
+            }
+        )
+        try:
+            contract.with_user(self.john.id).read([])
+        except AccessError:
+            self.fail("raised an AccessError Exception")
+
+    def test_create_contract_user_fails(self):
+        """Contract creation by regular user fails"""
+
+        with self.assertRaises(AccessError):
+            self.HrContract.with_user(self.john.id).create(
+                {
+                    "name": "CRef",
+                    "employee_id": self.eeJohn.id,
+                    "date_start": fields.Date.today(),
+                    "wage": 1,
+                }
+            )
+
+    def test_hr_contract_write_user_fails(self):
+        """Write access fails"""
+
+        contract = self.HrContract.create(
+            {
+                "name": "CRef",
+                "employee_id": self.eeJohn.id,
+                "date_start": fields.Date.today(),
+                "wage": 1,
+            }
+        )
+        with self.assertRaises(AccessError):
+            contract.with_user(self.john.id).wage = 2
+
+    def test_hr_contract_unlink_user_fails(self):
+        """Unlink access fails"""
+
+        contract = self.HrContract.create(
+            {
+                "name": "CRef",
+                "employee_id": self.eeJohn.id,
+                "date_start": fields.Date.today(),
+                "wage": 1,
+            }
+        )
+        with self.assertRaises(AccessError):
+            contract.with_user(self.john.id).unlink()
+
+    def test_view_contract_officer(self):
+        """An HR Officer can view any contract"""
+
+        contract = self.HrContract.create(
+            {
+                "name": "CRef",
+                "employee_id": self.eeJohn.id,
+                "date_start": fields.Date.today(),
+                "wage": 1,
+            }
+        )
+        try:
+            contract.with_user(self.hro.id).read([])
+        except AccessError:
+            self.fail("raised an AccessError Exception")
+
+    def test_create_contract_officer_fails(self):
+        """Contract creation by regular user fails"""
+
+        with self.assertRaises(AccessError):
+            self.HrContract.with_user(self.hro.id).create(
+                {
+                    "name": "CRef",
+                    "employee_id": self.eeJohn.id,
+                    "date_start": fields.Date.today(),
+                    "wage": 1,
+                }
+            )
+
+    def test_hr_contract_write_officer_fails(self):
+        """Write access fails"""
+
+        contract = self.HrContract.create(
+            {
+                "name": "CRef",
+                "employee_id": self.eeJohn.id,
+                "date_start": fields.Date.today(),
+                "wage": 1,
+            }
+        )
+        with self.assertRaises(AccessError):
+            contract.with_user(self.hro.id).wage = 2
+
+    def test_hr_contract_unlink_officer_fails(self):
+        """Unlink access fails"""
+
+        contract = self.HrContract.create(
+            {
+                "name": "CRef",
+                "employee_id": self.eeJohn.id,
+                "date_start": fields.Date.today(),
+                "wage": 1,
+            }
+        )
+        with self.assertRaises(AccessError):
+            contract.with_user(self.hro.id).unlink()
diff --git a/trevi_hr_usability/tests/test_hr_simplify.py b/trevi_hr_usability/tests/test_hr_simplify.py
new file mode 100644
index 00000000..ee1f24e8
--- /dev/null
+++ b/trevi_hr_usability/tests/test_hr_simplify.py
@@ -0,0 +1,154 @@
+# Copyright (C) 2021 Trevi Software (https://trevi.et)
+# Copyright (C) 2013 Michael Telahun Makonnen <mmakonnen@gmail.com>.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from datetime import timedelta
+
+from odoo.fields import Date
+from odoo.tests.common import Form, SavepointCase
+
+
+class TestHrSimplify(SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super(TestHrSimplify, cls).setUpClass()
+
+        # -- models
+        cls.Contract = cls.env["hr.contract"]
+        cls.Department = cls.env["hr.department"]
+        cls.Employee = cls.env["hr.employee"]
+        cls.Job = cls.env["hr.job"]
+
+        # -- departments
+        cls.dept_marketing = cls.Department.create({"name": "Marketing"})
+        cls.dept_RandD = cls.Department.create({"name": "Research and Development"})
+
+        # -- jobs
+        # -- marketing
+        cls.job_mkt_director = cls.Job.create({"name": "Marketing Director"})
+
+        # -- R&D
+        cls.job_rnd_manager = cls.Job.create(
+            {
+                "name": "Research and Development Manager",
+                "no_of_recruitment": 2,
+            }
+        )
+        cls.job_rnd_technician = cls.Job.create(
+            {
+                "name": "Research and Development Technician",
+                "no_of_recruitment": 4,
+            }
+        )
+
+        # -- employees
+        cls.emp_adam = cls.Employee.create(
+            {
+                "name": "Adam",
+                "gender": "male",
+                "department_id": cls.dept_marketing.id,
+                "job_id": cls.job_mkt_director.id,
+                "active": True,
+            }
+        )
+
+        cls.emp_kal = cls.Employee.create(
+            {
+                "name": "Kal",
+                "gender": "female",
+                "department_id": cls.dept_RandD.id,
+                "job_id": cls.job_rnd_manager.id,
+                "active": True,
+            }
+        )
+
+        cls.emp_tim = cls.Employee.create(
+            {
+                "name": "Tim",
+                "gender": "male",
+                "department_id": cls.dept_RandD.id,
+                "job_id": cls.job_rnd_technician.id,
+                "active": True,
+            }
+        )
+
+        cls.emp_ed = cls.Employee.create(
+            {
+                "name": "Ed",
+                "gender": "male",
+                "department_id": cls.dept_RandD.id,
+                "job_id": cls.job_rnd_technician.id,
+                "active": True,
+            }
+        )
+
+        # -- contract data
+        cls.contract_data = {
+            "state": "open",
+            "kanban_state": "normal",
+            "wage": 1,
+            "date_start": False,
+            "date_end": False,
+        }
+
+    def create_contract(
+        self, employee, job, start_date=None, end_date=None, name="Contract#1"
+    ):
+        self.contract_data["name"] = name
+        self.contract_data["employee_id"] = employee.id
+        self.contract_data["job_id"] = job.id
+        self.contract_data["date_start"] = (
+            Date.today() if start_date is None else start_date
+        )
+        self.contract_data["date_end"] = (
+            Date.today() + timedelta(days=90) if end_date is None else end_date
+        )
+        return self.Contract.create(self.contract_data)
+
+    def test_employee_country_defaults_to_et(self):
+        self.assertEqual(self.emp_adam.country_id, self.env.ref("base.et"))
+        self.assertEqual(self.emp_kal.country_id, self.env.ref("base.et"))
+
+    def test_onchange_employee_id(self):
+        contract = self.create_contract(self.emp_adam, self.job_mkt_director)
+        with Form(contract) as f:
+            f.employee_id = self.emp_kal
+            f.job_id = self.job_mkt_director
+            if self.env.ref("payroll.structure_base"):
+                f.struct_id = self.env.ref("payroll.structure_base")
+            self.assertEqual(f.employee_dept_id, self.dept_RandD)
+
+    def test_compute_employees(self):
+        self.create_contract(
+            name="Kal Contract",
+            employee=self.emp_kal,
+            job=self.job_rnd_manager,
+            start_date=(Date.today() - timedelta(days=(5 * 30))),
+            end_date=(Date.today() - timedelta(days=(2 * 30))),
+        )
+        self.create_contract(
+            name="Tim Contract",
+            employee=self.emp_tim,
+            job=self.job_rnd_technician,
+            start_date=(Date.today() - timedelta(days=(6 * 30))),
+            end_date=(Date.today() - timedelta(days=(2 * 30))),
+        )
+        self.create_contract(
+            name="Ed Contract",
+            employee=self.emp_ed,
+            job=self.job_rnd_technician,
+            start_date=(Date.today() - timedelta(days=(4 * 30))),
+            end_date=(Date.today() - timedelta(days=30)),
+        )
+
+        self.assertEqual(self.job_rnd_manager.no_of_employee, 1)
+        self.assertEqual(
+            self.job_rnd_manager.expected_employees,
+            (self.job_rnd_manager.no_of_recruitment + 1),
+        )
+
+        self.assertEqual(self.job_rnd_technician.no_of_employee, 2)
+        self.assertEqual(
+            self.job_rnd_technician.expected_employees,
+            (self.job_rnd_technician.no_of_recruitment + 2),
+        )
diff --git a/trevi_hr_usability/views/hr_simplify_view.xml b/trevi_hr_usability/views/hr_simplify_view.xml
new file mode 100644
index 00000000..535c17f2
--- /dev/null
+++ b/trevi_hr_usability/views/hr_simplify_view.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="view_contract_form" model="ir.ui.view">
+        <field name="name">hr.contract.form.inherit</field>
+        <field name="model">hr.contract</field>
+        <field name="inherit_id" ref="hr_contract.hr_contract_view_form" />
+        <field name="priority">99</field>
+        <field name="arch" type="xml">
+            <data>
+                <field name="employee_id" position="replace">
+                    <field name="employee_id" required="1" />
+                </field>
+                <field name="job_id" position="replace">
+                    <field name="employee_dept_id" invisible="1" />
+                    <field
+                        name="job_id"
+                        required="1"
+                        domain="[('department_id', '=', employee_dept_id)]"
+                    />
+                </field>
+            </data>
+        </field>
+    </record>
+
+</odoo>