diff --git a/hr_custody/README.rst b/hr_custody/README.rst
deleted file mode 100644
index 51301cfbf..000000000
--- a/hr_custody/README.rst
+++ /dev/null
@@ -1,47 +0,0 @@
-Open HRMS Custody Management
-============================
-
-Functionality to give and track the assets of a company to employees.
- - Creates a new menu item Custody Management under Employees
- - Can create custody contract with an employee
- - Can take the report of custody
-
-Depends
-=======
-[hr, mail, hr_employee_updation] addon Odoo
-
-Tech
-====
-* [Python] - Models
-* [XML] - Odoo views
-
-Installation
-============
-- www.odoo.com/documentation/10.0/setup/install.html
-- Install our custom addon
-
-License
-=======
-GNU AFFERO GENERAL PUBLIC LICENSE, Version 3 (AGPLv3)
-(http://www.gnu.org/licenses/agpl.html)
-
-Bug Tracker
-===========
-Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported.
-
-Credits
-=======
-* Cybrosys Techno Solutions <https://www.cybrosys.com>
-
-Author
-------
-
-Developers: Avinash Nk <avinash@cybrosys.in>
-            Jesni Banu <jesni@cybrosys.in>
-
-Maintainer
-----------
-
-This module is maintained by Cybrosys Technologies.
-
-For support and more information, please visit https://www.cybrosys.com.
diff --git a/hr_custody/__init__.py b/hr_custody/__init__.py
deleted file mode 100644
index 07a62f397..000000000
--- a/hr_custody/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Authors: Avinash Nk, Jesni Banu (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from . import models
-from . import reports
diff --git a/hr_custody/__manifest__.py b/hr_custody/__manifest__.py
deleted file mode 100644
index 372f4223b..000000000
--- a/hr_custody/__manifest__.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of Open HRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Authors: Avinash Nk, Jesni Banu (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-{
-    'name': 'Open HRMS Custody',
-    'version': '10.0.1.0.0',
-    'summary': """Manage the company properties when it is in the custody of an employee""",
-    'description': 'Manage the company properties when it is in the custody of an employee',
-    'category': 'Human Resources',
-    'author': 'Cybrosys Techno Solutions',
-    'company': 'Cybrosys Techno Solutions',
-    'maintainer': 'Cybrosys Techno Solutions',
-    'website': "https://www.openhrms.com",
-    'depends': ['hr', 'mail', 'hr_employee_updation'],
-    'data': [
-        'security/ir.model.access.csv',
-        'security/custody_security.xml',
-        'views/wizard_reason_view.xml',
-        'views/custody_view.xml',
-        'views/hr_custody_notification.xml',
-        'views/hr_employee_view.xml',
-        'views/notification_mail.xml',
-        'reports/custody_report.xml'
-    ],
-    'images': ['static/description/banner.jpg'],
-    'license': 'AGPL-3',
-    'demo': [],
-    'installable': True,
-    'auto_install': False,
-    'application': False,
-}
diff --git a/hr_custody/doc/RELEASE_NOTES.md b/hr_custody/doc/RELEASE_NOTES.md
deleted file mode 100644
index 946cda1b9..000000000
--- a/hr_custody/doc/RELEASE_NOTES.md
+++ /dev/null
@@ -1,6 +0,0 @@
-## Module hr_custody
-
-#### 30.03.2018
-#### Version 10.0.1.0.0
-##### ADD
-- Initial commit for OpenHrms Project
diff --git a/hr_custody/models/__init__.py b/hr_custody/models/__init__.py
deleted file mode 100644
index 5df886c18..000000000
--- a/hr_custody/models/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Authors: Avinash Nk, Jesni Banu (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from . import custody
-from . import hr_employee
-from . import wizard_reason
diff --git a/hr_custody/models/custody.py b/hr_custody/models/custody.py
deleted file mode 100644
index 24e837bbc..000000000
--- a/hr_custody/models/custody.py
+++ /dev/null
@@ -1,208 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Authors: Avinash Nk, Jesni Banu (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from datetime import datetime, timedelta
-from odoo import models, fields, api, _
-from odoo.exceptions import Warning, UserError
-from odoo.tools import image_resize_images
-
-
-class HrCustody(models.Model):
-    """
-        Hr custody contract creation model.
-        """
-    _name = 'hr.custody'
-    _description = 'Hr Custody Management'
-    _inherit = ['mail.thread', 'ir.needaction_mixin']
-
-    def mail_reminder(self):
-        now = datetime.now() + timedelta(days=1)
-        date_now = now.date()
-        match = self.search([('state', '=', 'approved')])
-        for i in match:
-            if i.return_date:
-                exp_date = fields.Date.from_string(i.return_date)
-                if exp_date <= date_now:
-                    base_url = self.env['ir.config_parameter'].get_param('web.base.url')
-                    url = base_url + _('/web#id=%s&view_type=form&model=hr.custody&menu_id=') % i.id
-                    mail_content = _('Hi %s,<br>As per the %s you took %s on %s for the reason of %s. S0 here we '
-                                     'remind you that you have to return that on or before %s. Otherwise, you can '
-                                     'renew the reference number(%s) by extending the return date through following '
-                                     'link.<br> <div style = "text-align: center; margin-top: 16px;"><a href = "%s"'
-                                     'style = "padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; '
-                                     'border-color:#875A7B;text-decoration: none; display: inline-block; '
-                                     'margin-bottom: 0px; font-weight: 400;text-align: center; vertical-align: middle; '
-                                     'cursor: pointer; white-space: nowrap; background-image: none; '
-                                     'background-color: #875A7B; border: 1px solid #875A7B; border-radius:3px;">'
-                                     'Renew %s</a></div>') % \
-                                    (i.employee.name, i.name, i.custody_name.name, i.date_request, i.purpose,
-                                        date_now, i.name, url, i.name)
-                    main_content = {
-                        'subject': _('REMINDER On %s') % i.name,
-                        'author_id': self.env.user.partner_id.id,
-                        'body_html': mail_content,
-                        'email_to': i.employee.work_email,
-                    }
-                    mail_id = self.env['mail.mail'].create(main_content)
-                    mail_id.mail_message_id.body = mail_content
-                    mail_id.send()
-                    if i.employee.user_id:
-                        mail_id.mail_message_id.write({'needaction_partner_ids': [(4, i.employee.user_id.partner_id.id)]})
-                        mail_id.mail_message_id.write({'partner_ids': [(4, i.employee.user_id.partner_id.id)]})
-
-    @api.model
-    def create(self, vals):
-        vals['name'] = self.env['ir.sequence'].next_by_code('hr.custody')
-        return super(HrCustody, self).create(vals)
-
-    @api.multi
-    def sent(self):
-        self.state = 'to_approve'
-
-    @api.multi
-    def send_mail(self):
-        template = self.env.ref('hr_custody.custody_email_notification_template')
-        self.env['mail.template'].browse(template.id).send_mail(self.id)
-        self.mail_send = True
-
-    @api.multi
-    def set_to_draft(self):
-        self.state = 'draft'
-
-    @api.multi
-    def renew_approve(self):
-        for custody in self.env['hr.custody'].search([('custody_name', '=', self.custody_name.id)]):
-            if custody.state == "approved":
-                raise UserError(_("Custody is not available now"))
-        self.return_date = self.renew_date
-        self.renew_date = ''
-        self.state = 'approved'
-
-    @api.multi
-    def renew_refuse(self):
-        for custody in self.env['hr.custody'].search([('custody_name', '=', self.custody_name.id)]):
-            if custody.state == "approved":
-                raise UserError(_("Custody is not available now"))
-        self.renew_date = ''
-        self.state = 'approved'
-
-    @api.multi
-    def approve(self):
-        for custody in self.env['hr.custody'].search([('custody_name', '=', self.custody_name.id)]):
-            if custody.state == "approved":
-                raise UserError(_("Custody is not available now"))
-        self.state = 'approved'
-
-    @api.multi
-    def set_to_return(self):
-        self.state = 'returned'
-        self.return_date = fields.datetime.now()
-
-    # return date validation
-    @api.constrains('return_date')
-    def validate_return_date(self):
-        if self.return_date < self.date_request:
-            raise Warning('Please Give Valid Return Date')
-
-    name = fields.Char(string='Code', copy=False)
-    company_id = fields.Many2one('res.company', 'Company', readonly=True,
-                                 default=lambda self: self.env.user.company_id)
-    rejected_reason = fields.Text(string='Rejected Reason', copy=False, readonly=1)
-    renew_rejected_reason = fields.Text(string='Renew Rejected Reason', copy=False, readonly=1)
-    date_request = fields.Date(string='Requested Date', required=True, track_visibility='always', readonly=True,
-                               states={'draft': [('readonly', False)]})
-    employee = fields.Many2one('hr.employee', string='Employee', required=True, readonly=True,
-                               states={'draft': [('readonly', False)]})
-    purpose = fields.Char(string='Reason', track_visibility='always', required=True, readonly=True,
-                          states={'draft': [('readonly', False)]})
-    custody_name = fields.Many2one('custody.property', string='Property', required=True, readonly=True,
-                                   states={'draft': [('readonly', False)]})
-    return_date = fields.Date(string='Return Date', required=True, track_visibility='always', readonly=True,
-                              states={'draft': [('readonly', False)]})
-    renew_date = fields.Date(string='Renewal Return Date', track_visibility='always', readonly=True, copy=False)
-    notes = fields.Html(string='Notes')
-    renew_return_date = fields.Boolean(default=False, copy=False)
-    renew_reject = fields.Boolean(default=False, copy=False)
-    state = fields.Selection([('draft', 'Draft'), ('to_approve', 'Waiting For Approval'), ('approved', 'Approved'),
-                              ('returned', 'Returned'), ('rejected', 'Refused')], string='Status', default='draft',
-                             track_visibility='always')
-    mail_send = fields.Boolean(string="Mail Send")
-
-
-class HrPropertyName(models.Model):
-    """
-            Hr property creation model.
-            """
-    _name = 'custody.property'
-    _description = 'Property Name'
-
-    name = fields.Char(string='Property Name', required=True)
-    image = fields.Binary(
-        "Image", attachment=True,
-        help="This field holds the image used for this provider, limited to 1024x1024px")
-    image_medium = fields.Binary(
-        "Medium-sized image", attachment=True,
-        help="Medium-sized image of this provider. It is automatically "
-             "resized as a 128x128px image, with aspect ratio preserved. "
-             "Use this field in form views or some kanban views.")
-    image_small = fields.Binary(
-        "Small-sized image", attachment=True,
-        help="Small-sized image of this provider. It is automatically "
-             "resized as a 64x64px image, with aspect ratio preserved. "
-             "Use this field anywhere a small image is required.")
-    desc = fields.Html(string='Description')
-    company_id = fields.Many2one('res.company', 'Company',
-                                 default=lambda self: self.env.user.company_id)
-
-    @api.model
-    def create(self, vals):
-        image_resize_images(vals)
-        return super(HrPropertyName, self).create(vals)
-
-    @api.multi
-    def write(self, vals):
-        image_resize_images(vals)
-        return super(HrPropertyName, self).write(vals)
-
-
-class HrReturnDate(models.TransientModel):
-    """Hr custody contract renewal wizard"""
-    _name = 'wizard.return.date'
-    _description = 'Hr Custody Name'
-
-    returned_date = fields.Date(string='Renewal Date', required=1)
-
-    # renewal date validation
-    @api.constrains('returned_date')
-    def validate_return_date(self):
-        context = self._context
-        custody_obj = self.env['hr.custody'].search([('id', '=', context.get('custody_id'))])
-        if self.returned_date <= custody_obj.date_request:
-            raise Warning('Please Give Valid Renewal Date')
-
-    @api.multi
-    def proceed(self):
-        context = self._context
-        custody_obj = self.env['hr.custody'].search([('id', '=', context.get('custody_id'))])
-        custody_obj.write({'renew_return_date': True,
-                           'renew_date': self.returned_date,
-                           'state': 'to_approve'})
diff --git a/hr_custody/models/hr_employee.py b/hr_custody/models/hr_employee.py
deleted file mode 100644
index 1cf7b1421..000000000
--- a/hr_custody/models/hr_employee.py
+++ /dev/null
@@ -1,118 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Authors: Avinash Nk, Jesni Banu (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from odoo import models, fields, api, _
-
-
-class HrCustody(models.Model):
-    _inherit = 'hr.employee'
-
-    custody_count = fields.Integer(compute='_custody_count', string='# Custody')
-    equipment_count = fields.Integer(compute='_equipment_count', string='# Equipments')
-
-    # count of all custody contracts
-    @api.multi
-    def _custody_count(self):
-        for each in self:
-            custody_ids = self.env['hr.custody'].search([('employee', '=', each.id)])
-            each.custody_count = len(custody_ids)
-
-    # count of all custody contracts that are in approved state
-    @api.multi
-    def _equipment_count(self):
-        for each in self:
-            equipment_obj = self.env['hr.custody'].search([('employee', '=', each.id), ('state', '=', 'approved')])
-            equipment_ids = []
-            for each1 in equipment_obj:
-                if each1.custody_name.id not in equipment_ids:
-                    equipment_ids.append(each1.custody_name.id)
-            each.equipment_count = len(equipment_ids)
-
-    # smart button action for returning the view of all custody contracts related to the current employee
-    @api.multi
-    def custody_view(self):
-        for each1 in self:
-            custody_obj = self.env['hr.custody'].search([('employee', '=', each1.id)])
-            custody_ids = []
-            for each in custody_obj:
-                custody_ids.append(each.id)
-            view_id = self.env.ref('hr_custody.hr_custody_form_view').id
-            if custody_ids:
-                if len(custody_ids) <= 1:
-                    value = {
-                        'view_type': 'form',
-                        'view_mode': 'form',
-                        'res_model': 'hr.custody',
-                        'view_id': view_id,
-                        'type': 'ir.actions.act_window',
-                        'name': _('Custody'),
-                        'res_id': custody_ids and custody_ids[0]
-                    }
-                else:
-                    value = {
-                        'domain': str([('id', 'in', custody_ids)]),
-                        'view_type': 'form',
-                        'view_mode': 'tree,form',
-                        'res_model': 'hr.custody',
-                        'view_id': False,
-                        'type': 'ir.actions.act_window',
-                        'name': _('Custody'),
-                        'res_id': custody_ids
-                    }
-
-                return value
-
-    # smart button action for returning the view of all custody contracts that are in approved state,
-    # related to the current employee
-    @api.multi
-    def equipment_view(self):
-        for each1 in self:
-            equipment_obj = self.env['hr.custody'].search([('employee', '=', each1.id), ('state', '=', 'approved')])
-            equipment_ids = []
-            for each in equipment_obj:
-                if each.custody_name.id not in equipment_ids:
-                    equipment_ids.append(each.custody_name.id)
-            view_id = self.env.ref('hr_custody.custody_custody_form_view').id
-            if equipment_ids:
-                if len(equipment_ids) <= 1:
-                    value = {
-                        'view_type': 'form',
-                        'view_mode': 'form',
-                        'res_model': 'custody.property',
-                        'view_id': view_id,
-                        'type': 'ir.actions.act_window',
-                        'name': _('Equipments'),
-                        'res_id': equipment_ids and equipment_ids[0]
-                    }
-                else:
-                    value = {
-                        'domain': str([('id', 'in', equipment_ids)]),
-                        'view_type': 'form',
-                        'view_mode': 'tree,form',
-                        'res_model': 'custody.property',
-                        'view_id': False,
-                        'type': 'ir.actions.act_window',
-                        'name': _('Equipments'),
-                        'res_id': equipment_ids
-                    }
-
-                return value
diff --git a/hr_custody/models/wizard_reason.py b/hr_custody/models/wizard_reason.py
deleted file mode 100644
index c98540ec2..000000000
--- a/hr_custody/models/wizard_reason.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Authors: Avinash Nk, Jesni Banu (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from odoo import models, fields, api, _
-
-
-class WizardReason(models.TransientModel):
-    """
-        Hr custody contract refuse wizard.
-            """
-    _name = 'wizard.reason'
-
-    @api.multi
-    def send_reason(self):
-        context = self._context
-        reject_obj = self.env[context.get('model_id')].search([('id', '=', context.get('reject_id'))])
-        if 'renew' in context.keys():
-            reject_obj.write({'state': 'approved',
-                              'renew_reject': True,
-                              'renew_rejected_reason': self.reason})
-        else:
-            if context.get('model_id') == 'hr.holidays':
-                reject_obj.write({'rejected_reason': self.reason})
-                reject_obj.action_refuse()
-            else:
-                reject_obj.write({'state': 'rejected',
-                                  'rejected_reason': self.reason})
-
-    reason = fields.Text(string="Reason")
diff --git a/hr_custody/reports/__init__.py b/hr_custody/reports/__init__.py
deleted file mode 100644
index 6341ef439..000000000
--- a/hr_custody/reports/__init__.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Authors: Avinash Nk, Jesni Banu (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from . import custody_report
diff --git a/hr_custody/reports/custody_report.py b/hr_custody/reports/custody_report.py
deleted file mode 100644
index 4ca04e1b1..000000000
--- a/hr_custody/reports/custody_report.py
+++ /dev/null
@@ -1,84 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Authors: Avinash Nk, Jesni Banu (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from odoo import models, fields, tools
-
-
-class CustodyHistory(models.Model):
-    _name = "report.custody"
-    _description = "Custody Analysis"
-    _auto = False
-
-    name = fields.Char(string='Code')
-    date_request = fields.Date(string='Requested Date')
-    employee = fields.Many2one('hr.employee', string='Employee')
-    purpose = fields.Char(string='Reason')
-    custody_name = fields.Many2one('custody.property', string='Custody Name')
-    return_date = fields.Date(string='Return Date')
-    renew_date = fields.Date(string='Renewal Return Date')
-    renew_return_date = fields.Boolean(string='Renewal Return Date')
-    state = fields.Selection([('draft', 'Draft'), ('to_approve', 'Waiting For Approval'), ('approved', 'Approved'),
-                              ('returned', 'Returned'), ('rejected', 'Refused')], string='Status')
-
-    _order = 'name desc'
-
-    def _select(self):
-        select_str = """
-             SELECT
-                    (select 1 ) AS nbr,
-                    t.id as id,
-                    t.name as name,
-                    t.date_request as date_request,
-                    t.employee as employee,
-                    t.purpose as purpose,
-                    t.custody_name as custody_name,
-                    t.return_date as return_date,
-                    t.renew_date as renew_date,
-                    t.renew_return_date as renew_return_date,
-                    t.state as state
-        """
-        return select_str
-
-    def _group_by(self):
-        group_by_str = """
-                GROUP BY
-                    t.id,
-                    name,
-                    date_request,
-                    employee,
-                    purpose,
-                    custody_name,
-                    return_date,
-                    renew_date,
-                    renew_return_date,
-                    state
-        """
-        return group_by_str
-
-    def init(self):
-        tools.sql.drop_view_if_exists(self._cr, 'report_custody')
-        self._cr.execute("""
-            CREATE view report_custody as
-              %s
-              FROM hr_custody t
-                %s
-        """ % (self._select(), self._group_by()))
diff --git a/hr_custody/reports/custody_report.xml b/hr_custody/reports/custody_report.xml
deleted file mode 100644
index 402d92e7c..000000000
--- a/hr_custody/reports/custody_report.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-    <data>
-         <record id="view_report_custody" model="ir.ui.view">
-            <field name="name">report.custody.pivot</field>
-            <field name="model">report.custody</field>
-            <field name="arch" type="xml">
-                <pivot string="Ticket Analysis" display_quantity="true" disable_linking="True">
-                     <field name="name" type="row"/>
-                 </pivot>
-             </field>
-        </record>
-
-        <record id="action_report_custody" model="ir.actions.act_window">
-            <field name="name">Custody Analysis</field>
-            <field name="res_model">report.custody</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">pivot</field>
-            <field name="context">{'group_by_no_leaf':1,'group_by':[]}</field>
-            <field name="help">This report allows you to analyse all Custody Requests. </field>
-        </record>
-
-        <menuitem name="Custody Analysis" action="action_report_custody" id="menu_custody_analysis"
-                  groups="hr.group_hr_manager"
-                  parent="hr_employee_updation.employee_report_menu" sequence="1"/>
-    </data>
-</odoo>
\ No newline at end of file
diff --git a/hr_custody/security/custody_security.xml b/hr_custody/security/custody_security.xml
deleted file mode 100644
index 311521f17..000000000
--- a/hr_custody/security/custody_security.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" ?>
-<odoo>
-    <record id="property_rule_custody" model="ir.rule">
-        <field name="name">Custody Multi Company</field>
-        <field name="model_id" ref="model_custody_property"/>
-        <field eval="True" name="global"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-    </record>
-
-    <record id="property_rule_custody_req" model="ir.rule">
-        <field name="name">Custody Request Multi Company</field>
-        <field name="model_id" ref="model_hr_custody"/>
-        <field eval="True" name="global"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-    </record>
-</odoo>
diff --git a/hr_custody/security/ir.model.access.csv b/hr_custody/security/ir.model.access.csv
deleted file mode 100644
index 2c8043f12..000000000
--- a/hr_custody/security/ir.model.access.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_custody_hr","hr.custody.hr","model_hr_custody","hr.group_hr_manager",1,1,1,1
-"access_hr_custody_hr_manager","hr.custody.user","model_hr_custody","hr.group_hr_user",1,1,1,1
-"access_hr_custody_hr_employee","hr.custody.employee","model_hr_custody","base.group_user",1,1,1,0
-"access_hr_custody_hr1","hr.custody.hr1","model_custody_property","hr.group_hr_manager",1,1,1,1
-"access_hr_custody_hr_manager1","hr.custody.user1","model_custody_property","hr.group_hr_user",1,1,1,1
-"access_hr_custody_hr_employee1","hr.custody.employee1","model_custody_property","base.group_user",1,1,1,0
-"access_hr_custody_hr2","hr.custody.hr2","model_wizard_return_date","hr.group_hr_manager",1,1,1,1
-"access_hr_custody_hr3","hr.custody.hr3","model_report_custody","hr.group_hr_manager",1,1,1,1
-"access_hr_custody_hr_manager2","hr.custody.user2","model_wizard_return_date","hr.group_hr_user",1,1,1,1
-"access_hr_custody_hr_manager3","hr.custody.user3","model_report_custody","hr.group_hr_user",1,1,1,1
-"access_hr_custody_hr_employee2","hr.custody.employee2","model_wizard_return_date","base.group_user",1,1,1,0
-
diff --git a/hr_custody/static/description/HRMS-BUTTON.png b/hr_custody/static/description/HRMS-BUTTON.png
deleted file mode 100644
index 0f1b65bea..000000000
Binary files a/hr_custody/static/description/HRMS-BUTTON.png and /dev/null differ
diff --git a/hr_custody/static/description/banner.jpg b/hr_custody/static/description/banner.jpg
deleted file mode 100644
index 6469f976b..000000000
Binary files a/hr_custody/static/description/banner.jpg and /dev/null differ
diff --git a/hr_custody/static/description/custody_property.png b/hr_custody/static/description/custody_property.png
deleted file mode 100644
index 09cdde7f3..000000000
Binary files a/hr_custody/static/description/custody_property.png and /dev/null differ
diff --git a/hr_custody/static/description/custody_request.png b/hr_custody/static/description/custody_request.png
deleted file mode 100644
index 1d82e0420..000000000
Binary files a/hr_custody/static/description/custody_request.png and /dev/null differ
diff --git a/hr_custody/static/description/cybro-service.png b/hr_custody/static/description/cybro-service.png
deleted file mode 100644
index 252929a86..000000000
Binary files a/hr_custody/static/description/cybro-service.png and /dev/null differ
diff --git a/hr_custody/static/description/cybro_logo.png b/hr_custody/static/description/cybro_logo.png
deleted file mode 100644
index bb309114c..000000000
Binary files a/hr_custody/static/description/cybro_logo.png and /dev/null differ
diff --git a/hr_custody/static/description/icon.png b/hr_custody/static/description/icon.png
deleted file mode 100644
index 8c486ecc1..000000000
Binary files a/hr_custody/static/description/icon.png and /dev/null differ
diff --git a/hr_custody/static/description/index.html b/hr_custody/static/description/index.html
deleted file mode 100644
index 61c9346ca..000000000
--- a/hr_custody/static/description/index.html
+++ /dev/null
@@ -1,111 +0,0 @@
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-        <h2 class="oe_slogan">Open HRMS</h2>
-        <h3 class="oe_slogan">Most advanced open source HR management software</h3>
-    </div>
-</section>
-<section class="oe_container">
-    <div class="oe_row oe_spaced oe_mt32">
-        <div class="oe_span">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <a href="https://www.openhrms.com/#request-demo">
-                    <img src="HRMS-BUTTON.png">
-                </a>
-            </div>
-        </div>
-    </div>
-</section>
-
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-        <h2 class="oe_slogan">Open HRMS Custody Management</h2>
-        <h3 class="oe_slogan">Manages Custody Handling Process</h3>
-        <h4 class="oe_slogan"><a href="https://www.cybrosys.com">Cybrosys Technologies</a> </h4>
-    </div>
-    <div class="oe_row oe_spaced" style="padding-left:65px;">
-        <h4>Features:</h4>
-        <div>
-            <span style="color:green;"> &#9745; </span> Managing custody handling process.<br/>
-            <span style="color:green;"> &#9745; </span> Option to renewal.<br/>
-            <span style="color:green;"> &#9745; </span> Option to take reports.<br/>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container ">
-    <div class="oe_row oe_spaced">
-        <div class="oe_picture">
-            <h3 class="oe_slogan">Overview</h3>
-            <p class="oe_mt32 text-justify" style="text-align: center;">
-                Blues over resource tracking? No more worries.
-                OHRMS Custody Management system constitutes the ultimate
-                solution for a  transparent custody of company resources.
-            </p>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-        <h4 class="oe_slogan">Custody Request</h4>
-        <div class="oe_span12">
-            <p class='oe_mt32'>
-                &#x261B; Create a Custody Request.<br>
-                &#x261B; Send for Approval.<br>
-            </p>
-            <div class="oe_row_img oe_centered">
-                <img class="oe_picture oe_screenshot" src="custody_request.png">
-            </div>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container ">
-    <div class="oe_row oe_spaced">
-        <h4 class="oe_slogan">Property</h4>
-        <div class="oe_span12">
-            <p class='oe_mt32'>
-                &#x261B; Create a Property of Company.<br>
-            <p>
-            <div class="oe_row_img oe_centered">
-                <img class="oe_picture oe_screenshot" src="custody_property.png">
-            </div>
-        </div>
-    </div>
-</section>
-
-
-<div class="row section-content">
-    <div class="col-md-6 img-content">
-        <h3>Our Odoo Services</h3>
-    </div>
-    <div class="bc-span col-md-12">
-        <div class="inner-span">
-            <a target="_blank" href="https://www.openhrms.com">
-                <img class="img-border img-responsive thumbnail" src="cybro-service.png">
-            </a>
-        </div>
-    </div>
-</div>
-
-<section class="oe_container oe_dark">
-    <h2 class="oe_slogan" style="margin-top:20px;" >Need Any Help?</h2>
-    <div class="oe_slogan" style="margin-top:10px !important;">
-        <div>
-            <a  class="btn btn-primary btn-lg mt8"
-            style="color: #FFFFFF !important;border-radius: 0;" href="https://www.cybrosys.com"><i
-            class="fa fa-envelope"></i> Email </a> <a
-            class="btn btn-primary btn-lg mt8" style="color: #FFFFFF !important;border-radius: 0;"
-            href="https://www.cybrosys.com/contact/"><i
-            class="fa fa-phone"></i> Contact Us </a> <a
-            class="btn btn-primary btn-lg mt8" style="color: #FFFFFF !important;border-radius: 0;"
-            href="https://www.cybrosys.com/odoo-customization-and-installation/"><i
-            class="fa fa-check-square"></i> Request Customization </a>
-        </div>
-        <br>
-        <img src="cybro_logo.png" style="width: 190px; margin-bottom: 20px;" class="center-block">
-    </div>
-</section>
-
diff --git a/hr_custody/views/custody_view.xml b/hr_custody/views/custody_view.xml
deleted file mode 100644
index 9a95fe075..000000000
--- a/hr_custody/views/custody_view.xml
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <record id="seq_hr_custody_seq" model="ir.sequence">
-            <field name="name">Custody Code</field>
-            <field name="code">hr.custody</field>
-            <field name="prefix">CR</field>
-            <field eval="4" name="padding" />
-            <field eval="False" name="company_id"/>
-        </record>
-
-        <record model='ir.ui.view' id='wizard_return_date_form'>
-            <field name="name">wizard.return.date.form</field>
-            <field name="model">wizard.return.date</field>
-            <field name="arch" type="xml">
-                <form string="Renewal Request">
-                    <group>
-                        <group>
-                            <field name="returned_date"/>
-                        </group>
-                    </group>
-                    <footer>
-                        <button name="proceed" string="Proceed" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </footer>
-                </form>
-            </field>
-        </record>
-
-        <record model='ir.ui.view' id='custody_custody_form_view'>
-            <field name="name">custody.property.form</field>
-            <field name="model">custody.property</field>
-            <field name="arch" type="xml">
-                <form string="Equipments">
-                    <sheet>
-                        <field name="image" widget='image' class="oe_avatar" options='{"preview_image": "image_medium"}'/>
-                        <div class="oe_title">
-                            <h1><field name="name" placeholder="Name"/></h1>
-                        </div>
-                        <group>
-                            <group>
-                                <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/>
-                            </group>
-                            <group></group>
-                        </group>
-                        <notebook>
-                            <page name="desc" string="Description">
-                                <field name="desc"/>
-                            </page>
-                        </notebook>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-        <record model='ir.actions.act_window' id='wizard_return_date_act'>
-            <field name="name">Custody Request</field>
-            <field name="res_model">wizard.return.date</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="wizard_return_date_form"/>
-            <field name="target">new</field>
-        </record>
-
-        <record id="hr_custody_form_view" model="ir.ui.view">
-            <field name="name">hr.custody.form</field>
-            <field name="model">hr.custody</field>
-            <field name="arch" type="xml">
-                <form string="Custody">
-                    <header>
-                        <button string="Send For Approval"  type="object" name="sent"
-                                attrs="{'invisible': [('state','not in',('draft'))]}"/>
-                        <button string="Approve"  groups="hr.group_hr_manager" type="object" name="approve"
-                                attrs="{'invisible': ['|',('state','not in',('to_approve')),
-                                ('renew_return_date','=',True)]}"/>
-                        <button string="Renewal Approval"  groups="hr.group_hr_manager" type="object" name="renew_approve"
-                                attrs="{'invisible': ['|',('state','not in',('to_approve')),
-                                ('renew_return_date','=',False)]}"/>
-                        <button string="Refuse" groups="hr.group_hr_manager" type="action" name="%(hr_custody.wizard_reason_act)d"
-                                attrs="{'invisible': ['|',('state','not in',('to_approve')),
-                                ('renew_return_date','=',True)]}" class="btn-primary" context="{'reject_id':id,'model_id':'hr.custody'}"/>
-                        <button class="btn-primary" name="%(hr_custody.wizard_reason_act)d" string="Refuse" groups="hr.group_hr_manager" type="action"
-                                attrs="{'invisible': ['|',('state','not in',('to_approve')),
-                                ('renew_return_date','=',False)]}" context="{'reject_id':id,'model_id':'hr.custody','renew': 'renew'}"/>
-                        <button string="Set to Draft" type="object" name="set_to_draft"
-                                attrs="{'invisible': [('state','not in',('rejected'))]}"/>
-                        <button string="Return" type="object" name="set_to_return" groups="hr.group_hr_manager"
-                                attrs="{'invisible': [('state','not in',('approved'))]}"/>
-                        <button string="Send Mail" type="object" name="send_mail" groups="hr.group_hr_manager"
-                                attrs="{'invisible': ['|',('mail_send', '=', False),('state','not in',('approved'))]}"/>
-                        <button string="Send Mail" type="object" class="oe_highlight" name="send_mail" groups="hr.group_hr_manager"
-                                attrs="{'invisible': ['|',('mail_send', '=', True),('state','not in',('approved'))]}"/>
-                        <button string="Renew" type="action" name="%(wizard_return_date_act)d"
-                                context="{'custody_id':id}"
-                                attrs="{'invisible': ['|',('state','not in',('approved')),
-                                                      ('renew_return_date','=',True)]}"/>
-                        <field name="state" widget="statusbar" statusbar_visible="draft,to_approve,approved,returned"/>
-                    </header>
-                    <sheet>
-                        <h1>
-                            <field name="name" readonly="1" nolabel="1"/>
-                        </h1>
-                        <group>
-                            <group>
-                                <field name="custody_name" options="{'no_open':True,'no_create':True}"
-                                       domain="[('company_id','child_of',[company_id])]"/>
-                                <field name="renew_return_date" invisible="1"/>
-                                <field name="renew_reject" invisible="1"/>
-                                <field name="mail_send" invisible="1"/>
-                                <field name="employee"/>
-                                <field name="purpose"/>
-                            </group>
-                            <group>
-                                <field name="date_request"/>
-                                <field name="return_date" attrs="{'invisible': [('renew_return_date','=',True),
-                                ('renew_date','not in',[None,False]),('renew_reject','=',False)]}"/>
-                                <field name="renew_date" attrs="{'invisible': ['|',('renew_return_date','=',False),
-                                ('state','!=','to_approve')]}"/>
-                                <field name="rejected_reason" attrs="{'invisible': [('state','not in',('rejected'))]}"/>
-                                <field name="renew_rejected_reason" attrs="{'invisible': ['|',('renew_reject','=',False),('state','not in',('approved'))]}"/>
-                                <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/>
-                            </group>
-                        </group>
-                        <notebook>
-                            <page string="Notes">
-                                <field name="notes"/>
-                            </page>
-                        </notebook>
-                    </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="hr_custody_tree_view" model="ir.ui.view">
-            <field name="name">hr.custody.tree</field>
-            <field name="model">hr.custody</field>
-            <field name="arch" type="xml">
-                <tree decoration-info="state == 'draft'" colors="red:current_date > return_date;grey:state == 'rejected';green:state == 'approved';
-                black:state == 'to_approve';grey:state == 'returned';">
-                    <field name="name"/>
-                    <field name="custody_name"/>
-                    <field name="employee"/>
-                    <field name="purpose"/>
-                    <field name="date_request"/>
-                    <field name="return_date"/>
-                    <field name="state"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="hr_property_tree_view" model="ir.ui.view">
-            <field name="name">hr_property_tree_view.tree</field>
-            <field name="model">custody.property</field>
-            <field name="arch" type="xml">
-                <tree>
-                    <field name="name"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="hr_custody_search_view" model="ir.ui.view">
-            <field name="name">hr.custody.search</field>
-            <field name="model">hr.custody</field>
-            <field name="arch" type="xml">
-                <search string="Custody">
-                    <field name="name"/>
-                    <field name="custody_name"/>
-                    <field name="employee"/>
-                    <field name="purpose"/>
-                    <field name="date_request"/>
-                    <field name="return_date"/>
-                    <field name="state"/>
-                    <separator/>
-                    <group expand="0" string="Group By">
-                        <filter string="Status" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Employee" domain="[]" context="{'group_by':'employee'}"/>
-                        <filter string="Custody Name" domain="[]" context="{'group_by':'custody_name'}"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
-        <record id="action_hr_custody" model="ir.actions.act_window">
-            <field name="name">Custody</field>
-            <field name="res_model">hr.custody</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="search_view_id" ref="hr_custody_search_view"/>
-            <field name="help" type="html">
-                <p class="oe_view_nocontent_create">
-                    Click to Create a New Record.
-                </p>
-            </field>
-        </record>
-
-        <record id="action_hr_property" model="ir.actions.act_window">
-            <field name="name">Property</field>
-            <field name="res_model">custody.property</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="help" type="html">
-                <p class="oe_view_nocontent_create">
-                    Click to Create a New Record.
-                </p>
-            </field>
-        </record>
-
-        <menuitem id="hr_custody_main_menu" parent="hr.menu_hr_root"
-                  name="Custody Management" sequence="20"/>
-
-        <menuitem action="action_hr_custody" id="hr_custody_menu" parent="hr_custody.hr_custody_main_menu"
-                  name="Custody Request" sequence="1"/>
-
-        <menuitem action="action_hr_property" id="hr_property_menu" parent="hr_custody.hr_custody_main_menu"
-                  name="Property" sequence="5" groups="hr.group_hr_user"/>
-    </data>
-</odoo>
\ No newline at end of file
diff --git a/hr_custody/views/hr_custody_notification.xml b/hr_custody/views/hr_custody_notification.xml
deleted file mode 100644
index dbe813ae3..000000000
--- a/hr_custody/views/hr_custody_notification.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<odoo>
-    <data>
-        <record model="ir.cron" id="hr_custody_data_reminder">
-            <field name="name">HR Custody Return Notification</field>
-            <field name="interval_number">1</field>
-            <field name="interval_type">days</field>
-            <field name="numbercall">-1</field>
-            <field name="doall" eval="False"/>
-            <field name="model" eval="'hr.custody'"/>
-            <field name="function" eval="'mail_reminder'"/>
-            <field name="args" eval="'()'" />
-        </record>
-    </data>
-</odoo>
diff --git a/hr_custody/views/hr_employee_view.xml b/hr_custody/views/hr_employee_view.xml
deleted file mode 100644
index 148f55ac1..000000000
--- a/hr_custody/views/hr_employee_view.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <record model="ir.ui.view" id="custody_hr_employee_inherit_form_view">
-            <field name="name">hr.employee.form.inherit.view</field>
-            <field name="model">hr.employee</field>
-            <field name="inherit_id" ref="hr.view_employee_form"/>
-            <field name="arch" type="xml">
-                <div class="oe_button_box" position="inside">
-                    <button class="oe_stat_button" name="custody_view" type="object" icon="fa-list-ol">
-                        <field string="Custody" name="custody_count" widget="statinfo"/>
-                    </button>
-                    <button class="oe_stat_button" name="equipment_view" type="object" icon="fa-tablet">
-                        <field string="Equipments" name="equipment_count" widget="statinfo"/>
-                    </button>
-                </div>
-            </field>
-        </record>
-    </data>
-</odoo>
\ No newline at end of file
diff --git a/hr_custody/views/notification_mail.xml b/hr_custody/views/notification_mail.xml
deleted file mode 100644
index 189af3fa8..000000000
--- a/hr_custody/views/notification_mail.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <record id="custody_email_notification_template" model="mail.template">
-            <field name="name">Custody e-mail template</field>
-            <field name="email_from">${object.company_id and object.company_id.email or ''}</field>
-            <field name="subject">Notification to return company asset-${object.custody_name.name}</field>
-            <field name="email_to">${object.email|safe}</field>
-            <field name="lang">${object.lang}</field>
-            <field name="model_id" ref="hr_custody.model_hr_custody"/>
-            <field name="auto_delete" eval="True"/>
-            <field name="body_html">
-                    <![CDATA[
-                          <p>Dear ${(object.employee.name)},<br/><br/>
-                          You are in possession of the company asset
-                          <strong>"${(object.custody_name.name)}"</strong>
-                          since <strong>${(object.return_date)}.</strong><br/><br/>
-                          Please kindly return the property as soon as possible.<br/><br/></p>
-                          Regards,<br/><br/>
-                          ${(object.company_id.name)}]]>
-            </field>
-        </record>
-    </data>
-</odoo>
\ No newline at end of file
diff --git a/hr_custody/views/wizard_reason_view.xml b/hr_custody/views/wizard_reason_view.xml
deleted file mode 100644
index 64e79a125..000000000
--- a/hr_custody/views/wizard_reason_view.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <record model='ir.ui.view' id='wizard_reason_form'>
-            <field name="name">wizard.reason.form</field>
-            <field name="model">wizard.reason</field>
-            <field name="arch" type="xml">
-                <form string="Update Reason">
-                    <group>
-                        <field name="reason" required="True"/>
-                    </group>
-                    <footer>
-                        <button name="send_reason" string="Proceed" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </footer>
-                </form>
-            </field>
-        </record>
-
-        <record model='ir.actions.act_window' id='wizard_reason_act'>
-            <field name="name">Update Reason</field>
-            <field name="res_model">wizard.reason</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="wizard_reason_form"/>
-            <field name="target">new</field>
-        </record>
-    </data>
-</odoo>
\ No newline at end of file
diff --git a/hr_employee_shift/README.rst b/hr_employee_shift/README.rst
deleted file mode 100644
index af76a519c..000000000
--- a/hr_employee_shift/README.rst
+++ /dev/null
@@ -1,43 +0,0 @@
-OHRMS Employee Shift v10
-========================
-
-Easily create, manage, and track employee shift schedules
-
-Depends
-=======
-[hr] addon Odoo
-
-Tech
-====
-* [Python] - Models
-* [XML] - Odoo views
-
-Installation
-============
-- www.odoo.com/documentation/10.0/setup/install.html
-- Install our custom addon
-
-License
-=======
-GNU AFFERO GENERAL PUBLIC LICENSE, Version 3 (LGPLv3)
-(http://www.gnu.org/licenses/agpl.html)
-
-Bug Tracker
-===========
-Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported.
-
-Credits
-=======
-* Cybrosys Techno Solutions <https://www.cybrosys.com>
-
-Author
-------
-
-Developer: Saritha Sahadevan, saritha@cybrosys.in
-
-Maintainer
-----------
-
-This module is maintained by Cybrosys Technologies.
-
-For support and more information, please visit https://www.cybrosys.com.
diff --git a/hr_employee_shift/RELEASE_NOTES.md b/hr_employee_shift/RELEASE_NOTES.md
deleted file mode 100644
index 932b379ec..000000000
--- a/hr_employee_shift/RELEASE_NOTES.md
+++ /dev/null
@@ -1,6 +0,0 @@
-## Module hr_employee_shift
-
-#### 30.03.2018
-#### Version 10.0.1.0.0
-##### ADD
-- Initial commit for OpenHrms Project
diff --git a/hr_employee_shift/__init__.py b/hr_employee_shift/__init__.py
deleted file mode 100644
index 7cacd9c23..000000000
--- a/hr_employee_shift/__init__.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHrms Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Saritha Sahadevan (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from . import models
diff --git a/hr_employee_shift/__manifest__.py b/hr_employee_shift/__manifest__.py
deleted file mode 100644
index ce263e552..000000000
--- a/hr_employee_shift/__manifest__.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of Open Hrms Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Saritha Sahadevan (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-{
-    'name': "Open HRMS Employee Shift",
-    'version': '10.0.1.0',
-    'summary': """Easily create, manage, and track employee shift schedules.""",
-    'description': """Easily create, manage, and track employee shift schedules.""",
-    'category': 'Human Resource',
-    'author': 'Cybrosys Techno Solutions',
-    'company': 'Cybrosys Techno Solutions',
-    'maintainer': 'Cybrosys Techno Solutions',
-    'website': "https://www.openhrms.com",
-    'depends': ['hr', 'hr_payroll'],
-    'data': [
-        'security/ir.model.access.csv',
-        'security/hr_employee_shift_security.xml',
-        'views/hr_employee_shift_view.xml',
-        'views/hr_employee_contract_view.xml',
-        'views/hr_generate_shift_view.xml',
-        'views/templates.xml',
-    ],
-    'images': ["static/description/banner.jpg"],
-    'license': "AGPL-3",
-    'installable': True,
-    'application': True,
-}
diff --git a/hr_employee_shift/models/__init__.py b/hr_employee_shift/models/__init__.py
deleted file mode 100644
index e00ab4743..000000000
--- a/hr_employee_shift/models/__init__.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHrms Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Saritha Sahadevan (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from . import hr_employee_shift, hr_employee_contract, hr_generate_shift, hr_shift_payroll
diff --git a/hr_employee_shift/models/hr_employee_contract.py b/hr_employee_shift/models/hr_employee_contract.py
deleted file mode 100644
index 532d3f2d7..000000000
--- a/hr_employee_shift/models/hr_employee_contract.py
+++ /dev/null
@@ -1,75 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHrms Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Saritha Sahadevan (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from odoo.exceptions import Warning
-from odoo import models, fields, api, _
-
-
-class HrEmployeeContract(models.Model):
-    _inherit = 'hr.contract'
-
-    shift_schedule = fields.One2many('hr.shift.schedule', 'rel_hr_schedule', string="Shift Schedule")
-    working_hours = fields.Many2one('resource.calendar', string='Working Schedule')
-    department_id = fields.Many2one('hr.department', string="Department", required=True)
-
-
-class HrSchedule(models.Model):
-    _name = 'hr.shift.schedule'
-
-    start_date = fields.Date(string="Date From", required=True)
-    end_date = fields.Date(string="Date To", required=True)
-    rel_hr_schedule = fields.Many2one('hr.contract')
-    hr_shift = fields.Many2one('resource.calendar', string="Shift", required=True)
-
-    @api.onchange('start_date', 'end_date')
-    def get_department(self):
-        """Adding domain to  the hr_shift field"""
-        hr_department = None
-        if self.start_date:
-            hr_department = self.rel_hr_schedule.department_id.id
-        return {
-            'domain': {
-                'hr_shift': [('hr_department', '=', hr_department)]
-            }
-        }
-
-    @api.multi
-    def write(self, vals):
-        self._check_overlap(vals)
-        return super(HrSchedule, self).write(vals)
-
-    @api.model
-    def create(self, vals):
-        self._check_overlap(vals)
-        return super(HrSchedule, self).create(vals)
-
-    def _check_overlap(self, vals):
-        if vals.get('start_date', False) and vals.get('end_date', False):
-            shifts = self.env['hr.shift.schedule'].search([('rel_hr_schedule', '=', vals.get('rel_hr_schedule'))])
-            for each in shifts:
-                if each != shifts[-1]:
-                    if each.end_date >= vals.get('start_date') or each.start_date >= vals.get('start_date'):
-                        raise Warning(_('The dates may not overlap with one another.'))
-            if vals.get('start_date') > vals.get('end_date'):
-                raise Warning(_('Start date should be less than end date.'))
-        return True
-
diff --git a/hr_employee_shift/models/hr_employee_shift.py b/hr_employee_shift/models/hr_employee_shift.py
deleted file mode 100644
index 7fd6a3e1d..000000000
--- a/hr_employee_shift/models/hr_employee_shift.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHrms Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Saritha Sahadevan (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from odoo.exceptions import ValidationError
-from odoo import models, fields, api
-
-
-class HrEmployeeShift(models.Model):
-    _inherit = 'resource.calendar'
-
-    color = fields.Integer(string='Color Index')
-    hr_department = fields.Many2one('hr.department', string="Department", required=True)
-    sequence = fields.Integer(string="Sequence", required=True, default=1)
-
-    @api.constrains('sequence')
-    def validate_seq(self):
-        record = self.env['resource.calendar'].search([('hr_department', '=', self.hr_department.id),
-                                                       ('sequence', '=', self.sequence)
-                                                       ])
-        if len(record) > 1:
-            raise ValidationError("One record with same sequence is already active."
-                                  "You can't activate more than one record  at a time")
diff --git a/hr_employee_shift/models/hr_generate_shift.py b/hr_employee_shift/models/hr_generate_shift.py
deleted file mode 100644
index db60362c6..000000000
--- a/hr_employee_shift/models/hr_generate_shift.py
+++ /dev/null
@@ -1,101 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHrms Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Saritha Sahadevan (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from odoo import models, fields
-
-
-class HrGenerateShift(models.Model):
-    _name = 'hr.shift.generate'
-
-    hr_department = fields.Many2one('hr.department', string="Department")
-    start_date = fields.Date(string="Start Date", required=True)
-    end_date = fields.Date(string="End Date", required=True)
-
-    def action_schedule_shift(self):
-        """Create mass schedule for all departments based on the shift scheduled in corresponding employee's contract"""
-
-        if self.hr_department:
-            for contract in self.env['hr.contract'].search([('department_id', '=', self.hr_department.id)]):
-                if contract.shift_schedule:
-                    for shift_val in contract.shift_schedule:
-                        shift = shift_val.hr_shift
-                    start_date = self.start_date
-                    end_date = self.end_date
-                    shift_obj = self.env['resource.calendar'].search([('hr_department', '=', self.hr_department.id),
-                                                                      ('name', '=', shift.name)], limit=1)
-                    sequence = shift_obj.sequence
-                    seq_no = sequence + 1
-                    new_shift = self.env['resource.calendar'].search([
-                        ('sequence', '=', seq_no), ('hr_department', '=', self.hr_department.id)], limit=1)
-                    if new_shift:
-                        shift_ids = [(0, 0, {
-                                    'hr_shift': new_shift.id,
-                                    'start_date': start_date,
-                                    'end_date': end_date
-                                })]
-                        contract.shift_schedule = shift_ids
-                    else:
-                        seq_no = 1
-                        new_shift = self.env['resource.calendar'].search([
-                            ('sequence', '=', seq_no), ('hr_department', '=', self.hr_department.id)], limit=1)
-                        if new_shift:
-                            shift_ids = [(0, 0, {
-                                'hr_shift': new_shift.id,
-                                'start_date': start_date,
-                                'end_date': end_date
-                            })]
-                            contract.shift_schedule = shift_ids
-        else:
-            for contract in self.env['hr.contract'].search([]):
-                if contract.shift_schedule and contract.department_id:
-                    for shift_val in contract.shift_schedule:
-                        shift = shift_val.hr_shift
-                    start_date = self.start_date
-                    end_date = self.end_date
-                    shift_obj = self.env['resource.calendar'].search([('hr_department', '=', contract.department_id.id),
-                                                                      ('name', '=', shift.name)], limit=1)
-                    sequence = shift_obj.sequence
-                    seq_no = sequence + 1
-                    new_shift = self.env['resource.calendar'].search([
-                        ('sequence', '=', seq_no), ('hr_department', '=', contract.department_id.id)], limit=1)
-                    if new_shift:
-                        shift_ids = [(0, 0, {
-                            'hr_shift': new_shift.id,
-                            'start_date': start_date,
-                            'end_date': end_date
-                        })]
-                        contract.shift_schedule = shift_ids
-                    else:
-                        seq_no = 1
-                        new_shift = self.env['resource.calendar'].search([
-                            ('sequence', '=', seq_no), ('hr_department', '=', contract.department_id.id)], limit=1)
-                        shift_ids = [(0, 0, {
-                            'hr_shift': new_shift.id,
-                            'start_date': start_date,
-                            'end_date': end_date
-                        })]
-                        contract.shift_schedule = shift_ids
-
-
-
-
-
diff --git a/hr_employee_shift/models/hr_shift_payroll.py b/hr_employee_shift/models/hr_shift_payroll.py
deleted file mode 100644
index 2c25766df..000000000
--- a/hr_employee_shift/models/hr_shift_payroll.py
+++ /dev/null
@@ -1,109 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHrms Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Saritha Sahadevan (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from datetime import datetime, timedelta
-from odoo import models, fields, api, _, tools
-
-
-class HrPayroll(models.Model):
-    _inherit = 'hr.payslip'
-
-    @api.model
-    def get_worked_day_lines(self, contract_ids, date_from, date_to):
-        """
-        @param contract_ids: list of contract id
-        @return: returns a list of dict containing the input that should be applied for the given contract between date_from and date_to
-        """
-
-        def was_on_leave_interval(employee_id, date_from, date_to):
-            date_from = fields.Datetime.to_string(date_from)
-            date_to = fields.Datetime.to_string(date_to)
-            return self.env['hr.holidays'].search([
-                ('state', '=', 'validate'),
-                ('employee_id', '=', employee_id),
-                ('type', '=', 'remove'),
-                ('date_from', '<=', date_from),
-                ('date_to', '>=', date_to)
-            ], limit=1)
-
-        res = []
-        # fill only if the contract as a working schedule linked
-        uom_day = self.env.ref('product.product_uom_day', raise_if_not_found=False)
-        for contract in self.env['hr.contract'].browse(contract_ids).filtered(lambda contract: contract):
-            uom_hour = contract.employee_id.resource_id.calendar_id.uom_id or self.env.ref('product.product_uom_hour',
-                                                                                           raise_if_not_found=False)
-            interval_data = []
-            holidays = self.env['hr.holidays']
-            attendances = {
-                'name': _("Normal Working Days paid at 100%"),
-                'sequence': 1,
-                'code': 'WORK100',
-                'number_of_days': 0.0,
-                'number_of_hours': 0.0,
-                'contract_id': contract.id,
-            }
-            leaves = {}
-
-            # Gather all intervals and holidays
-            for days in contract.shift_schedule:
-                start_date = datetime.strptime(days.start_date, tools.DEFAULT_SERVER_DATE_FORMAT)
-                end_date = datetime.strptime(days.end_date, tools.DEFAULT_SERVER_DATE_FORMAT)
-
-                nb_of_days = (end_date - start_date).days + 1
-                for day in range(0, nb_of_days):
-
-                    working_intervals_on_day = days.hr_shift.get_working_intervals_of_day(
-                        start_dt=start_date + timedelta(days=day))
-                    for interval in working_intervals_on_day:
-                        interval_data.append(
-                            (interval, was_on_leave_interval(contract.employee_id.id, interval[0], interval[1])))
-
-            # Extract information from previous data. A working interval is considered:
-            # - as a leave if a hr.holiday completely covers the period
-            # - as a working period instead
-            for interval, holiday in interval_data:
-                holidays |= holiday
-                hours = (interval[1] - interval[0]).total_seconds() / 3600.0
-                if holiday:
-                    # if he was on leave, fill the leaves dict
-                    if holiday.holiday_status_id.name in leaves:
-                        leaves[holiday.holiday_status_id.name]['number_of_hours'] += hours
-                    else:
-                        leaves[holiday.holiday_status_id.name] = {
-                            'name': holiday.holiday_status_id.name,
-                            'sequence': 5,
-                            'code': holiday.holiday_status_id.name,
-                            'number_of_days': 0.0,
-                            'number_of_hours': hours,
-                            'contract_id': contract.id,
-                        }
-                else:
-                    # add the input vals to tmp (increment if existing)
-                    attendances['number_of_hours'] += hours
-            # Clean-up the results
-            leaves = [value for key, value in leaves.items()]
-            for data in [attendances] + leaves:
-                data['number_of_days'] = uom_hour._compute_quantity(data['number_of_hours'], uom_day) \
-                    if uom_day and uom_hour \
-                    else data['number_of_hours'] / 8.0
-                res.append(data)
-        return res
\ No newline at end of file
diff --git a/hr_employee_shift/security/hr_employee_shift_security.xml b/hr_employee_shift/security/hr_employee_shift_security.xml
deleted file mode 100644
index 2b9a20882..000000000
--- a/hr_employee_shift/security/hr_employee_shift_security.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" ?>
-<odoo>
-    <record id="property_rule_hr_shift" model="ir.rule">
-        <field name="name">Hr Shift Multi Company</field>
-        <field name="model_id" ref="model_hr_shift_schedule"/>
-        <field eval="True" name="global"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-    </record>
-
-    <record id="property_rule_hr_shift_generate" model="ir.rule">
-        <field name="name">Hr Shift Genarate Multi Company</field>
-        <field name="model_id" ref="model_hr_shift_generate"/>
-        <field eval="True" name="global"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-    </record>
-</odoo>
\ No newline at end of file
diff --git a/hr_employee_shift/security/ir.model.access.csv b/hr_employee_shift/security/ir.model.access.csv
deleted file mode 100644
index a51d85c3b..000000000
--- a/hr_employee_shift/security/ir.model.access.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_hr_employee_shift_hr_employee_shift,hr_employee_shift.hr_shift_schedule,model_hr_shift_schedule,hr.group_hr_manager,1,1,1,1
-access_hr_employee_shift_hr_employee_shift1,hr_employee_shift.hr_shift_generate,model_hr_shift_generate,hr.group_hr_manager,1,1,1,1
\ No newline at end of file
diff --git a/hr_employee_shift/static/description/HRMS-BUTTON.png b/hr_employee_shift/static/description/HRMS-BUTTON.png
deleted file mode 100644
index 0f1b65bea..000000000
Binary files a/hr_employee_shift/static/description/HRMS-BUTTON.png and /dev/null differ
diff --git a/hr_employee_shift/static/description/banner.jpg b/hr_employee_shift/static/description/banner.jpg
deleted file mode 100644
index 9d6978271..000000000
Binary files a/hr_employee_shift/static/description/banner.jpg and /dev/null differ
diff --git a/hr_employee_shift/static/description/contract1.png b/hr_employee_shift/static/description/contract1.png
deleted file mode 100644
index 2fcae184f..000000000
Binary files a/hr_employee_shift/static/description/contract1.png and /dev/null differ
diff --git a/hr_employee_shift/static/description/create_shift.png b/hr_employee_shift/static/description/create_shift.png
deleted file mode 100644
index 9bdaf57ea..000000000
Binary files a/hr_employee_shift/static/description/create_shift.png and /dev/null differ
diff --git a/hr_employee_shift/static/description/cybro-service.png b/hr_employee_shift/static/description/cybro-service.png
deleted file mode 100644
index 252929a86..000000000
Binary files a/hr_employee_shift/static/description/cybro-service.png and /dev/null differ
diff --git a/hr_employee_shift/static/description/cybro_logo.png b/hr_employee_shift/static/description/cybro_logo.png
deleted file mode 100644
index bb309114c..000000000
Binary files a/hr_employee_shift/static/description/cybro_logo.png and /dev/null differ
diff --git a/hr_employee_shift/static/description/generate_schedule.png b/hr_employee_shift/static/description/generate_schedule.png
deleted file mode 100644
index 72b434978..000000000
Binary files a/hr_employee_shift/static/description/generate_schedule.png and /dev/null differ
diff --git a/hr_employee_shift/static/description/icon.png b/hr_employee_shift/static/description/icon.png
deleted file mode 100644
index 674251dd4..000000000
Binary files a/hr_employee_shift/static/description/icon.png and /dev/null differ
diff --git a/hr_employee_shift/static/description/index.html b/hr_employee_shift/static/description/index.html
deleted file mode 100644
index cea71fbf1..000000000
--- a/hr_employee_shift/static/description/index.html
+++ /dev/null
@@ -1,129 +0,0 @@
-<section class="oe_container bg-gray-lighter" xmlns="http://www.w3.org/1999/html">
-    <div class="oe_row">
-        <div class="oe_span">
-            <h2 class="oe_slogan">Open HRMS</h2>
-            <h3 class="oe_slogan">Most advanced open source HR management software</h3>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced oe_mt32">
-        <div class="oe_span">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <a href="https://www.openhrms.com/#request-demo">
-                    <img src="HRMS-BUTTON.png">
-                </a>
-            </div>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-        <div class="oe_span12">
-            <h2 class="oe_slogan">Employee Shift Management</h2>
-            <h3 class="oe_slogan">Easily create, manage, and track employee shift schedules.</h3>
-            <h3 class="oe_slogan"><a href="https://www.cybrosys.com">Cybrosys Technologies</a> </h3>
-        </div>
-        <div class="oe_row oe_spaced">
-            <h4><p style="margin-left: 42px;">Major Features:</p></h4>
-            <ul>
-                <li style="list-style:none !important;"><span style="color:green;"> &#9733;</span>&nbsp;&nbsp; Define list of Work Shifts</li>
-                <li style="list-style:none !important;"><span style="color:green;"> &#9733;</span>&nbsp;&nbsp; Define flexible hour wise shift</li>
-                <li style="list-style:none !important;"><span style="color:green;"> &#9733;</span>&nbsp;&nbsp; Assign shift in employee contract</li>
-                <li style="list-style:none !important;"><span style="color:green;"> &#9733;</span>&nbsp;&nbsp; Assign new shift automatically</li>
-            </ul>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-        <div class="oe_picture">
-            <h3 class="oe_slogan">Overview</h3>
-                <p class="oe_mt32">
-                   Employee Shift Management is a component of Open HRMS suit.
-                    This module allows the user to create and manage employee work shifts.
-                    Administrator can create various shifts according to the working hours and assign the Shift in
-                    employee work contract. The module also helps to automatically assign new shift according to
-                    the shift sequence
-                </p>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-        <div class="oe_span12">
-            <p><h2>Create Employee Shift</h2> </p>
-            <div class="oe_demo oe_picture oe_screenshot">
-                <img src="create_shift.png">
-            </div>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-        <p><h2>Employee Shift In Contract</h2> </p>
-        <div class="oe_span6">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <img src="contract1.png">
-            </div>
-        </div>
-        <div class="oe_span6">
-            <p>Have an option to schedule shift in employee contract form.
-                It is very important to create atleast one shift schedule  manually in contract form</p>
-        </div>
-    </div>
-</section>
-
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-        <p><h2>Generate Automatic Shifts</h2></p>
-        <p class="oe_mt32">
-            <p>Automatically assign new shift according to the shift sequence</p>
-        </p>
-        <div class="oe_span6">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <img src="generate_schedule.png">
-            </div>
-        </div>
-        <div class="oe_span6">
-            <p><h2> Employee Shifts</h2> </p>
-            <div class="oe_demo oe_picture oe_screenshot">
-                <img src="shift.png">
-            </div>
-        </div>
-    </div>
-</section>
-
-<div class="row section-content">
-    <div class="col-md-6 img-content">
-        <h3>Our Odoo Services</h3>
-        </div>
-        <div class="bc-span col-md-12"><div class="inner-span"><a target="_blank" href="https://www.openhrms.com"><img class="img-border img-responsive thumbnail" src="cybro-service.png"></a></div></div>
-    </div>
-</div>
-
-<section class="oe_container">
-    <h2 class="oe_slogan" style="margin-top:20px;" >Need Any Help?</h2>
-    <div class="oe_slogan" style="margin-top:10px !important;">
-        <div>
-            <a  class="btn btn-primary btn-lg mt8"
-            style="color: #FFFFFF !important;border-radius: 0;" href="https://www.cybrosys.com"><i
-            class="fa fa-envelope"></i> Email </a> <a
-            class="btn btn-primary btn-lg mt8" style="color: #FFFFFF !important;border-radius: 0;"
-            href="https://www.cybrosys.com/contact/"><i
-            class="fa fa-phone"></i> Contact Us </a> <a
-            class="btn btn-primary btn-lg mt8" style="color: #FFFFFF !important;border-radius: 0;"
-            href="https://www.cybrosys.com/odoo-customization-and-installation/"><i
-            class="fa fa-check-square"></i> Request Customization </a>
-        </div>
-        <br>
-        <img src="cybro_logo.png" style="width: 190px; margin-bottom: 20px;" class="center-block">
-    </div>
-</section>
-
diff --git a/hr_employee_shift/static/description/shift.png b/hr_employee_shift/static/description/shift.png
deleted file mode 100644
index e1669ff62..000000000
Binary files a/hr_employee_shift/static/description/shift.png and /dev/null differ
diff --git a/hr_employee_shift/static/src/css/shift_dashboard.css b/hr_employee_shift/static/src/css/shift_dashboard.css
deleted file mode 100644
index f99fe0e91..000000000
--- a/hr_employee_shift/static/src/css/shift_dashboard.css
+++ /dev/null
@@ -1,7 +0,0 @@
-
-.style_shift{
-    color: black !important;
-    font-size: 15px;
-    text-align: center;
-    padding: 10px 0px 2px 3px;
-}
diff --git a/hr_employee_shift/static/src/less/shift_dashboard.less b/hr_employee_shift/static/src/less/shift_dashboard.less
deleted file mode 100644
index 60f8a66a4..000000000
--- a/hr_employee_shift/static/src/less/shift_dashboard.less
+++ /dev/null
@@ -1,18 +0,0 @@
-@dashboard-bg-color: white;
-
-.o_kanban_view.o_kanban_dashboard.o_shift_kanban {
-    @sale-table-spacing: 20px;
-
-    .o_kanban_record {
-        min-height: 150px;
-        max-width: 250px !important;
-        @media (min-width: @screen-sm-min) {
-            min-width: 20px;
-
-        }
-    }
-    .oe_kanban_content{
-        padding-top: 50px!important;
-    }
-
-}
\ No newline at end of file
diff --git a/hr_employee_shift/views/hr_employee_contract_view.xml b/hr_employee_shift/views/hr_employee_contract_view.xml
deleted file mode 100644
index bf9ddbec0..000000000
--- a/hr_employee_shift/views/hr_employee_contract_view.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <record id="employee_contract_form_inherited" model="ir.ui.view">
-            <field name="name">employee.contract</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='working_hours']" position="replace">
-                    <field name="working_hours" invisible="1"/>
-                </xpath>
-                <xpath expr="//field[@name='department_id']" position="replace">
-                    <field name="department_id"/>
-                </xpath>
-                <xpath expr="//group[@name='duration_group']" position="after">
-                    <group colspan="2" string="Shift Schedule">
-                        <field name="shift_schedule" nolabel="1">
-                            <tree editable="1">
-                                <field name="start_date"/>
-                                <field name="end_date"/>
-                                <field name="hr_shift"/>
-                            </tree>
-                        </field>
-                    </group>
-                </xpath>
-            </field>
-        </record>
-    </data>
-</odoo>
\ No newline at end of file
diff --git a/hr_employee_shift/views/hr_employee_shift_view.xml b/hr_employee_shift/views/hr_employee_shift_view.xml
deleted file mode 100644
index aaecc2768..000000000
--- a/hr_employee_shift/views/hr_employee_shift_view.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-         <record id="resource_calendar_form" model="ir.ui.view">
-            <field name="name">resource.calendar</field>
-            <field name="model">resource.calendar</field>
-            <field name="inherit_id" ref="resource.resource_calendar_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//field[@name='name']" position="after">
-                    <field name="hr_department"/>
-                    <field name="sequence"/>
-                    <field name="color" invisible="1"/>
-                </xpath>
-            </field>
-        </record>
-
-        <record id="shift_template_kanban_view" model="ir.ui.view">
-            <field name="name">employee.shift.kanban</field>
-            <field name="model">resource.calendar</field>
-            <field name="arch" type="xml">
-                <kanban class="oe_background_grey o_kanban_dashboard o_shift_kanban">
-                    <field name="color"/>
-                    <templates>
-                        <t t-name="kanban-box">
-                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click ">
-                                <div class="o_dropdown_kanban dropdown">
-                                    <a class="dropdown-toggle btn" data-toggle="dropdown" href="#" >
-                                        <span class="fa fa-bars fa-lg"/>
-                                    </a>
-                                    <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
-                                        <t t-if="widget.editable"><li><a type="edit">Edit</a></li></t>
-                                        <t t-if="widget.deletable"><li><a type="delete">Delete</a></li></t>
-                                        <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
-                                    </ul>
-                                </div>
-                                <div class="oe_kanban_content">
-                                    <div class="row">
-                                        <div class="o_primary style_shift">
-                                            <div class="text-center"><strong><field name="name"/></strong></div>
-                                        </div>
-
-                                    </div>
-                                </div>
-                                <div class="oe_kanban_details">
-                                    <strong>
-                                        <div class="text-center">
-                                            <span t-if="record.hr_department.value">[<field name="hr_department"/>]</span>
-                                        </div>
-                                    </strong>
-                                </div>
-                            </div>
-                            </t>
-                    </templates>
-                </kanban>
-            </field>
-        </record>
-
-        <record id="resource.action_resource_calendar_form" model="ir.actions.act_window">
-            <field name="name">Shift Working Time</field>
-            <field name="res_model">resource.calendar</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">kanban,tree,form</field>
-            <field name="view_id" eval="False"/>
-            <field name="search_view_id" ref="resource.view_resource_calendar_search"/>
-            <field name="help" type="html">
-              <p class="oe_view_nocontent_create">
-                Define working hours and time table that could be scheduled to your project members
-              </p>
-            </field>
-        </record>
-
-        <menuitem name="Shifts" id="hr_employee_shift.menu_shift" parent="hr.menu_human_resources_configuration"
-              action="resource.action_resource_calendar_form"/>
-
-    </data>
-</odoo>
\ No newline at end of file
diff --git a/hr_employee_shift/views/hr_generate_shift_view.xml b/hr_employee_shift/views/hr_generate_shift_view.xml
deleted file mode 100644
index 63d411109..000000000
--- a/hr_employee_shift/views/hr_generate_shift_view.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<odoo>
-    <data>
-    <!-- explicit wizard view definition -->
-        <record model="ir.ui.view" id="hr_employee_shift.generate_schedule_form">
-            <field name="name">hr_employee_shift_generate_schedule form</field>
-            <field name="model">hr.shift.generate</field>
-            <field name="arch" type="xml">
-                <form  create="false" edit="false">
-                    <sheet>
-                        <group>
-                            <group>
-                                <field name="hr_department"/>
-                            </group>
-                        </group>
-                        <group>
-                            <group>
-                                <field name="start_date"/>
-                            </group>
-                            <group>
-                                <field name="end_date"/>
-                            </group>
-                        </group>
-                        <footer>
-                            <button string="Generate" name="action_schedule_shift" type="object"
-                                class="oe_highlight"/>
-                            <button string="Cancel" special="cancel"
-                                class="oe_link"/>
-                        </footer>
-                    </sheet>
-
-                </form>
-            </field>
-        </record>
-
-    <!-- actions opening views on models -->
-    <record model="ir.actions.act_window" id="hr_employee_shift.generate_schedule_action_window">
-        <field name="name">Employee Shift</field>
-        <field name="res_model">hr.shift.generate</field>
-        <field name="view_mode">form</field>
-        <field name="target">new</field>
-    </record>
-
-    <!-- menu item -->
-    <menuitem name="Employee Shift" id="menu_shift_schedule_generate_id_menu" parent="hr.menu_hr_root" action="hr_employee_shift.generate_schedule_action_window" groups="hr.group_hr_manager"/>
-    <menuitem name="Generate Schedule" id="hr_employee_shift.menu_shift_schedule_generate_id" parent="menu_shift_schedule_generate_id_menu" action="hr_employee_shift.generate_schedule_action_window" groups="hr.group_hr_manager"/>
-
-  </data>
-</odoo>
\ No newline at end of file
diff --git a/hr_employee_shift/views/templates.xml b/hr_employee_shift/views/templates.xml
deleted file mode 100644
index 6768c74e2..000000000
--- a/hr_employee_shift/views/templates.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets_backend" name="project assets" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <link rel="stylesheet" href="/hr_employee_shift/static/src/css/shift_dashboard.css"/>
-            <link rel="stylesheet" href="/hr_employee_shift/static/src/less/shift_dashboard.less"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/hr_employee_transfer/README.rst b/hr_employee_transfer/README.rst
deleted file mode 100644
index 7ace5dbfb..000000000
--- a/hr_employee_transfer/README.rst
+++ /dev/null
@@ -1,39 +0,0 @@
-Open HRMS Employee Transfer v10
-===============================
-
-Employee transfer between branches.
-
-Depends
-=======
-[hr] addon Odoo
-
-Tech
-====
-* [Python] - Models
-* [XML] - Odoo views
-
-Installation
-============
-- www.odoo.com/documentation/10.0/setup/install.html
-- Install our custom addon
-
-
-Bug Tracker
-===========
-Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported.
-
-Credits
-=======
-* Cybrosys Techno Solutions <https://www.cybrosys.com>
-
-Author
-------
-
-Developer: Sreejith P @ cybrosys, sreejith@cybrosys.in
-
-Maintainer
-----------
-
-This module is maintained by Cybrosys Technologies.
-
-For support and more information, please visit https://www.cybrosys.com.
diff --git a/hr_employee_transfer/__init__.py b/hr_employee_transfer/__init__.py
deleted file mode 100644
index a0fdc10fe..000000000
--- a/hr_employee_transfer/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-# -*- coding: utf-8 -*-
-from . import models
diff --git a/hr_employee_transfer/__manifest__.py b/hr_employee_transfer/__manifest__.py
deleted file mode 100644
index 93472ca4c..000000000
--- a/hr_employee_transfer/__manifest__.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of Open HRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Sreejith P (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-{
-    'name': 'Open HRMS Branch Transfer',
-    'version': '10.0.1.0.0',
-    'summary': 'Employee transfer between branches',
-    'category': 'Generic Modules/Human Resources',
-    'author': 'Cybrosys Techno solutions',
-    'maintainer': 'Cybrosys Techno Solutions',
-    'company': 'Cybrosys Techno Solutions',
-    'website': 'https://www.openhrms.com',
-    'depends': ['base',
-                'hr_employee_updation'
-                ],
-    'data': [
-        'views/employee_transfer.xml',
-        'security/ir.model.access.csv',
-        'security/branch_security.xml',
-    ],
-    'images': ['static/description/banner.jpg'],
-    'installable': True,
-    'application': True,
-    'auto_install': False,
-    'license': 'AGPL-3',
-}
diff --git a/hr_employee_transfer/docs/RELEASE_NOTES.md b/hr_employee_transfer/docs/RELEASE_NOTES.md
deleted file mode 100644
index 2dba1e095..000000000
--- a/hr_employee_transfer/docs/RELEASE_NOTES.md
+++ /dev/null
@@ -1,6 +0,0 @@
-## Module hr_employee_transfer
-
-#### 30.03.2018
-#### Version 10.0.1.0.0
-##### ADD
-- Initial commit for OpenHrms Project
diff --git a/hr_employee_transfer/models/__init__.py b/hr_employee_transfer/models/__init__.py
deleted file mode 100644
index 3adb57604..000000000
--- a/hr_employee_transfer/models/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- coding: utf-8 -*-
-from . import employee_transfer
-from . import hr_contract
-from . import res_company
diff --git a/hr_employee_transfer/models/employee_transfer.py b/hr_employee_transfer/models/employee_transfer.py
deleted file mode 100644
index 6d17c07a0..000000000
--- a/hr_employee_transfer/models/employee_transfer.py
+++ /dev/null
@@ -1,90 +0,0 @@
-# -*- coding: utf-8 -*-
-from datetime import date
-from odoo import models, fields, api, _
-from odoo.tools import DEFAULT_SERVER_DATE_FORMAT
-
-
-class EmployeeTransfer(models.Model):
-    _name = 'employee.transfer'
-    _description = 'Employee Transfer'
-    _order = "id desc"
-
-    def _default_employee(self):
-        emp_ids = self.env['hr.employee'].search([('user_id', '=', self.env.uid)])
-        return emp_ids and emp_ids[0] or False
-
-    name = fields.Char(string='Name', help='Give a name to the Transfer', copy=False, default="/")
-    employee_id = fields.Many2one('hr.employee', string='Employee', required=True)
-    date = fields.Date(string='Date', default=fields.Date.today())
-    branch = fields.Many2one('transfer.company', string='Transfer Branch', requried=True, copy=False)
-    state = fields.Selection(
-        [('draft', 'New'), ('cancel', 'Cancelled'), ('transfer', 'Transferred'), ('done', 'Post')],
-        string='Status', readonly=True, copy=False, default='draft')
-    sequence_number = fields.Integer(string='Sequence Number', help='A unique sequence number for the Transfer',
-                                     default=1, copy=False)
-    company_id = fields.Many2one('res.company', string='Company', required=True,
-                                 related='employee_id.company_id', store=True)
-    note = fields.Text(string='Internal Notes')
-    responsible = fields.Many2one('hr.employee', string='Responsible', default=_default_employee, readonly=True)
-
-    @api.one
-    def transfer(self):
-        obj_emp = self.env['hr.employee'].browse(self.employee_id.id)
-        emp = {}
-        for this in self:
-            emp = {
-                'name': self.employee_id.name,
-                'company_id': self.branch.company_id,
-
-            }
-        new_emp = self.env['hr.employee'].create(emp)
-        if obj_emp.address_home_id:
-            obj_emp.address_home_id.active = False
-        for obj_contract in self.env['hr.contract'].search([('employee_id', '=', self.employee_id.id)]):
-            if obj_contract.date_end:
-                continue
-            if not obj_contract.date_end:
-                obj_contract.write({'date_end': date.today().strftime(DEFAULT_SERVER_DATE_FORMAT)})
-                self.wage = obj_contract.wage
-        self.state = 'transfer'
-        self.employee_id = new_emp
-        obj_emp.write({'active': False})
-
-    @api.multi
-    def receive_employee(self):
-        print self.employee_id.company_id.id
-        for this in self:
-            if this._context is None:
-                context = {}
-            partner = {}
-            for i in this:
-                partner = {
-                    'name': i.employee_id.name,
-                    'company_id': i.branch.company_id,
-                }
-            partner_created = self.env['res.partner'].create(partner)
-            self.env['hr.employee'].browse(this.employee_id.id).write({'address_home_id': partner_created.id})
-            return {
-                'name': _('Contract'),
-                'view_type': 'form',
-                'view_mode': 'form',
-                'res_model': 'hr.contract',
-                'type': 'ir.actions.act_window',
-                'target': 'current',
-                'context': {'default_employee_id': this.employee_id.id,
-                            'default_date_start': this.date,
-                            'default_emp_transfer': this.id,
-                            },
-            }
-
-    @api.one
-    def cancel_transfer(self):
-        obj_emp = self.env['hr.employee'].browse(self.employee_id.id)
-        emp = {
-            'name': self.employee_id.name,
-            'company_id': self.company_id.id,
-        }
-        obj_emp.write(emp)
-        for obj_contract in self.env['hr.contract'].search([('employee_id', '=', self.employee_id.id)]):
-            obj_contract.unlink()
-        self.state = 'cancel'
diff --git a/hr_employee_transfer/models/hr_contract.py b/hr_employee_transfer/models/hr_contract.py
deleted file mode 100644
index 87fc8a0d2..000000000
--- a/hr_employee_transfer/models/hr_contract.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from odoo import models, fields, api
-
-
-class HrContract(models.Model):
-    _inherit = 'hr.contract'
-
-    company_id = fields.Many2one('res.company', 'Company', default=lambda self: self.env.user.company_id)
-    from_transfer = fields.Boolean(string='Transferred', default=False)
-    emp_transfer = fields.Many2one('employee.transfer', string='Transferred Employee')
-
-    @api.model
-    def create(self, vals):
-        res = super(HrContract, self).create(vals)
-        if res.emp_transfer:
-            self.env['employee.transfer'].browse(res.emp_transfer.id).write({'state': 'done'})
-        return res
diff --git a/hr_employee_transfer/models/hr_employee.py b/hr_employee_transfer/models/hr_employee.py
deleted file mode 100644
index 42df9efdd..000000000
--- a/hr_employee_transfer/models/hr_employee.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-from odoo import models, fields, api
-
-
-class HrContract(models.Model):
-    _inherit = 'hr.employee'
-
-    transfer_detail = fields.One2many('transfer.detail', 'employee_id', string='Transfer Details')
-
-
-class TransferDetails(models.Model):
-
-    _name = 'transfer.detail'
-    _description = 'Transfer Details'
-
-    employee_id = fields.Many2one('hr.employee', string='Employee')
-    date = fields.Date(string='Date', copy=False)
-    company_id = fields.Many2one('res.company', string='Company')
-    pre_company = fields.Many2one('res.company', string='Previous Company')
diff --git a/hr_employee_transfer/models/res_company.py b/hr_employee_transfer/models/res_company.py
deleted file mode 100644
index 77c228a24..000000000
--- a/hr_employee_transfer/models/res_company.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-from odoo import models, fields, api
-
-
-class EmployeeTransfer(models.Model):
-    _name = 'transfer.company'
-    _description = 'Transfer Company'
-    _order = "id desc"
-
-    name = fields.Char(string='Name', copy=False, ondelete='cascade')
-    company_id = fields.Integer(string='Company', help='Company name same as res.company', copy=False)
-
-
-class ResCompany(models.Model):
-    _inherit = 'res.company'
-
-    def init(self):
-        obj_company = self.env['res.company'].search([])
-
-        for company in obj_company:
-            obj_branch = self.env['transfer.company'].search([('company_id', '=', company.id)])
-            com = {}
-            if not obj_branch:
-                com = {
-                    'name': company.name,
-                    'company_id': company.id,
-                }
-                obj = self.env['transfer.company'].create(com)
-
-    @api.model
-    def create(self, res):
-        result = super(ResCompany, self).create(res)
-        com = {}
-        com = {
-                'name': result.name,
-                'company_id': result.id,
-
-            }
-        self.env['transfer.company'].create(com)
-        return result
diff --git a/hr_employee_transfer/security/branch_security.xml b/hr_employee_transfer/security/branch_security.xml
deleted file mode 100644
index f22cc5870..000000000
--- a/hr_employee_transfer/security/branch_security.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <record id="employee_rule" model="ir.rule">
-            <field name="name">Employee Rule</field>
-            <field name="model_id" ref="hr.model_hr_employee"/>
-            <field name="global" eval="True"/>
-            <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-        </record>
-
-        <record id="employee_contract_rule" model="ir.rule">
-            <field name="name">Contract Rules</field>
-            <field name="model_id" ref="hr_contract.model_hr_contract"/>
-            <field name="global" eval="True"/>
-            <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-        </record>
-    </data>
-</odoo>
diff --git a/hr_employee_transfer/security/ir.model.access.csv b/hr_employee_transfer/security/ir.model.access.csv
deleted file mode 100644
index beea229f4..000000000
--- a/hr_employee_transfer/security/ir.model.access.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_employee_transfer,employee.transfer,model_employee_transfer,hr.group_hr_user,1,1,0,0
-access_employee_transfer_manager,employee.transfer.manager,model_employee_transfer,hr.group_hr_manager,1,1,1,0
-access_employee_transfer_company,employee.company.manager,base.model_res_company,hr.group_hr_manager,1,1,1,0
-access_transfer_company,transfer.company.manager,model_transfer_company,hr.group_hr_manager,1,1,1,0
diff --git a/hr_employee_transfer/static/description/HRMS-BUTTON.png b/hr_employee_transfer/static/description/HRMS-BUTTON.png
deleted file mode 100644
index 0f1b65bea..000000000
Binary files a/hr_employee_transfer/static/description/HRMS-BUTTON.png and /dev/null differ
diff --git a/hr_employee_transfer/static/description/banner.jpg b/hr_employee_transfer/static/description/banner.jpg
deleted file mode 100644
index 1859d8b14..000000000
Binary files a/hr_employee_transfer/static/description/banner.jpg and /dev/null differ
diff --git a/hr_employee_transfer/static/description/create_a_transfer.png b/hr_employee_transfer/static/description/create_a_transfer.png
deleted file mode 100644
index ed7e55916..000000000
Binary files a/hr_employee_transfer/static/description/create_a_transfer.png and /dev/null differ
diff --git a/hr_employee_transfer/static/description/create_contract.png b/hr_employee_transfer/static/description/create_contract.png
deleted file mode 100644
index 84717bcd2..000000000
Binary files a/hr_employee_transfer/static/description/create_contract.png and /dev/null differ
diff --git a/hr_employee_transfer/static/description/cybro-service.png b/hr_employee_transfer/static/description/cybro-service.png
deleted file mode 100644
index 252929a86..000000000
Binary files a/hr_employee_transfer/static/description/cybro-service.png and /dev/null differ
diff --git a/hr_employee_transfer/static/description/cybro_logo.png b/hr_employee_transfer/static/description/cybro_logo.png
deleted file mode 100644
index bb309114c..000000000
Binary files a/hr_employee_transfer/static/description/cybro_logo.png and /dev/null differ
diff --git a/hr_employee_transfer/static/description/icon.png b/hr_employee_transfer/static/description/icon.png
deleted file mode 100644
index 7fec29119..000000000
Binary files a/hr_employee_transfer/static/description/icon.png and /dev/null differ
diff --git a/hr_employee_transfer/static/description/index.html b/hr_employee_transfer/static/description/index.html
deleted file mode 100644
index cf3a4edf3..000000000
--- a/hr_employee_transfer/static/description/index.html
+++ /dev/null
@@ -1,103 +0,0 @@
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-        <h2 class="oe_slogan">Open HRMS</h2>
-        <h3 class="oe_slogan">Most advanced open source HR management software</h3>
-    </div>
-</section>
-<section class="oe_container">
-    <div class="oe_row oe_spaced oe_mt32">
-        <div class="oe_span">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <a href="https://www.openhrms.com/#request-demo">
-                    <img src="HRMS-BUTTON.png">
-                </a>
-            </div>
-        </div>
-    </div>
-</section>
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-        <h2 class="oe_slogan">Branch Transfer</h2>
-        <h3 class="oe_slogan">Employee transfer between branches</h3>
-        <h4 class="oe_slogan"><a href="https://www.cybrosys.com">Cybrosys Technologies</a> </h4>
-    </div>
-    <div class="oe_row oe_spaced" style="padding-left:65px;">
-        <h4>Features:</h4>
-        <div>
-            <span style="color:green;"> &#9745; </span> Transfer Employee between branches.<br/>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container ">
-    <div class="oe_row oe_spaced">
-        <div class="oe_picture">
-            <h3 class="oe_slogan">Overview</h3>
-            <p class="oe_mt32 text-justify" style="text-align: center;">
-                Transferring employees between company is a basic thing in a organization. Now Odoo lacks a provision for employee transfer. This module gives a basic structure for employee transfer
-            </p>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-        <h4 class="oe_slogan">Employee Transfer</h4>
-        <div class="oe_span12">
-            <p class='oe_mt32'>
-                &#x261B; Create a Employee Transfer.<br>
-                &#x261B; Select the Transfer Company.<br>
-                &#x261B; Click on the sent button.<br>
-            </p>
-            <div class="oe_row_img oe_centered">
-                <img class="oe_picture oe_screenshot" src="create_a_transfer.png">
-            </div>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container ">
-    <div class="oe_row oe_spaced">
-        <h4 class="oe_slogan">Contract</h4>
-        <div class="oe_span12">
-            <p class='oe_mt32'>
-                &#x261B; Create new contract.<br>
-            <p>
-            <div class="oe_row_img oe_centered">
-                <img class="oe_picture oe_screenshot" src="create_contract.png">
-            </div>
-        </div>
-    </div>
-</section>
-
-<div class="row section-content">
- <div class="col-md-6 img-content">
- <h3>Our Odoo Services</h3>
-
-
-             </div>    <div class="bc-span col-md-12"><div class="inner-span"><a target="_blank" href="https://www.openhrms.com"><img class="img-border img-responsive thumbnail" src="cybro-service.png"></a></div></div>
-
-</div>
-
-</div>
-
-<section class="oe_container oe_dark">
-    <h2 class="oe_slogan" style="margin-top:20px;" >Need Any Help?</h2>
-    <div class="oe_slogan" style="margin-top:10px !important;">
-        <div>
-            <a  class="btn btn-primary btn-lg mt8"
-            style="color: #FFFFFF !important;border-radius: 0;" href="https://www.cybrosys.com"><i
-            class="fa fa-envelope"></i> Email </a> <a
-            class="btn btn-primary btn-lg mt8" style="color: #FFFFFF !important;border-radius: 0;"
-            href="https://www.cybrosys.com/contact/"><i
-            class="fa fa-phone"></i> Contact Us </a> <a
-            class="btn btn-primary btn-lg mt8" style="color: #FFFFFF !important;border-radius: 0;"
-            href="https://www.cybrosys.com/odoo-customization-and-installation/"><i
-            class="fa fa-check-square"></i> Request Customization </a>
-        </div>
-        <br>
-        <img src="cybro_logo.png" style="width: 190px; margin-bottom: 20px;" class="center-block">
-    </div>
-</section>
-
diff --git a/hr_employee_transfer/views/employee_transfer.xml b/hr_employee_transfer/views/employee_transfer.xml
deleted file mode 100644
index a255eb507..000000000
--- a/hr_employee_transfer/views/employee_transfer.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-    <record id="employee_transfer" model="ir.ui.view">
-        <field name="name">Employee Transfer</field>
-        <field name="model">employee.transfer</field>
-        <field name="arch" type="xml">
-            <form string="Employee Transfer">
-                <header>
-                    <button name="transfer" string="Transfer" class="oe_highlight" type="object" states="draft"
-                    groups="hr.group_hr_manager"/>
-                    <button name="receive_employee" string="Receive" class="oe_highlight" type="object"
-                            groups="hr.group_hr_manager" states="transfer"/>
-                    <button name="cancel_transfer" string="Cancel" type="object"
-                        attrs="{'invisible':[('state','in',('draft', 'cancel'))]}" groups="hr.group_hr_manager"/>
-                    <field name="state" widget="statusbar" statusbar_visible="draft,transfer,done" />
-                </header>
-                <sheet>
-                    <div class="oe_title oe_left">
-                        <h2>
-                            <field name="name" class="oe_inline" placeholder="Name"/>
-                        </h2>
-                    </div>
-                    <group>
-                        <group>
-                            <field name="employee_id" options="{'no_create': True}" attrs="{'readonly' : [('state', '!=', 'draft')] }"/>
-                            <field name="date" attrs="{'readonly' : [('state', '!=', 'draft')] }"/>
-                            <field name="branch" groups="base.group_multi_company" options="{'no_create': True}"
-                            attrs="{'readonly' : [('state', '!=', 'draft')] }"/>
-                        </group>
-                        <group>
-                            <field name="company_id" groups="base.group_multi_company" options="{'no_create': True}"/>
-                            <field name="responsible" options="{'no_create': True}"/>
-                        </group>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Internal Notes" >
-                            <field name="note"/>
-                        </page>
-                    </notebook>
-                </sheet>
-            </form>
-        </field>
-    </record>
-    <record id="employee_transfer_tree" model="ir.ui.view">
-        <field name="name">Employee Transfer Tree</field>
-        <field name="model">employee.transfer</field>
-        <field name="arch" type="xml">
-            <tree string="Employee Transfer" decoration-info="state == 'draft'" decoration-muted="state in ('done','cancel')">
-                <field name="name"/>
-                <field name="employee_id"/>
-                <field name="date"/>
-                <field name="branch" groups="base.group_multi_company"/>
-                <!--<field name="amount_total" sum="Amount total" widget="monetary"/>-->
-                <field name="company_id" groups="base.group_multi_company"/>
-                <field name="state"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="action_employee_transfer" model="ir.actions.act_window">
-        <field name="name">Employee Transfer</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">employee.transfer</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-        <field name="view_id" eval="False"/>
-        <field name="domain">[]</field>
-        <field name="help" type="html">
-            <p class="oe_view_nocontent_create">
-                Click to create a new Transfer.
-            </p><p>
-                Use this menu to browse previous transfer. To record new
-                transfer, you may use the create button.
-            </p>
-        </field>
-    </record>
-    <!--<menuitem id="menu_transfer_root" name="Employee Transfer" parent="hr.menu_hr_root" sequence="2" groups="hr.group_hr_manager"/>-->
-    <menuitem id="menu_employee_transfer" name="Employee Transfer" parent="hr_employee_updation.menu_hr_management" sequence="3"
-              action="action_employee_transfer" groups="hr.group_hr_manager"/>
-</odoo>
diff --git a/hr_employee_updation/README.md b/hr_employee_updation/README.md
deleted file mode 100644
index 93877f956..000000000
--- a/hr_employee_updation/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-Open HRMS Employee Info
------------------------
-Supporting Addon for Open HRMS, Added Advanced Fields On Employee Master.
-
-Connect with experts
---------------------
-
-If you have any question/queries/additional works on OpenHRMS or this module, You can drop an email directly to Cybrosys.
-
-Contacts
---------
-info - info@cybrosys.com
-Jesni Banu - jesni@cybrosys.in
-
-Website:
-https://www.openhrms.com
-https://www.cybrosys.com
diff --git a/hr_employee_updation/__init__.py b/hr_employee_updation/__init__.py
deleted file mode 100644
index b579ce91c..000000000
--- a/hr_employee_updation/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Jesni Banu (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from . import models
-
-
diff --git a/hr_employee_updation/__manifest__.py b/hr_employee_updation/__manifest__.py
deleted file mode 100644
index 6181591f9..000000000
--- a/hr_employee_updation/__manifest__.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Jesni Banu (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-{
-    'name': 'Open HRMS Employee Info',
-    'version': '10.0.1.1.0',
-    'summary': """Adding Advanced Fields In Employee Master""",
-    'description': 'This module helps you to add more information in employee records.',
-    'category': 'Generic Modules/Human Resources',
-    'author': 'Cybrosys Techno Solutions',
-    'company': 'Cybrosys Techno Solutions',
-    'website': "https://www.openhrms.com",
-    'depends': ['base', 'hr', 'mail', 'hr_gamification'],
-    'data': [
-        'security/ir.model.access.csv',
-        'views/hr_employee_view.xml',
-        'views/hr_notification.xml',
-    ],
-    'demo': [],
-    'images': ['static/description/banner.jpg'],
-    'license': 'AGPL-3',
-    'installable': True,
-    'auto_install': False,
-    'application': False,
-}
diff --git a/hr_employee_updation/doc/RELEASE_NOTES.md b/hr_employee_updation/doc/RELEASE_NOTES.md
deleted file mode 100644
index 3fceaa8fc..000000000
--- a/hr_employee_updation/doc/RELEASE_NOTES.md
+++ /dev/null
@@ -1,11 +0,0 @@
-## Module <hr_employee_updation>
-
-#### 07.04.2018
-#### Version 10.0.1.1.0
-##### CHG
-- Index updated.
-
-#### 30.03.2018
-#### Version 10.0.1.0.0
-##### ADD
-- Initial commit for Open HRMS Project
diff --git a/hr_employee_updation/models/__init__.py b/hr_employee_updation/models/__init__.py
deleted file mode 100644
index 01c1233ae..000000000
--- a/hr_employee_updation/models/__init__.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Jesni Banu (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from . import hr_employee
-
-
-
-
diff --git a/hr_employee_updation/models/hr_employee.py b/hr_employee_updation/models/hr_employee.py
deleted file mode 100644
index 3bfb66702..000000000
--- a/hr_employee_updation/models/hr_employee.py
+++ /dev/null
@@ -1,107 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Jesni Banu (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from datetime import datetime, timedelta
-from odoo import models, fields, _
-
-GENDER_SELECTION = [('male', 'Male'),
-                    ('female', 'Female'),
-                    ('other', 'Other')]
-
-
-class HrEmployeeContractName(models.Model):
-    """This class is to add emergency contact table"""
-    _name = 'hr.emergency.contact'
-    _description = 'HR Emergency Contact'
-
-    number = fields.Char(string='Number', help='Contact Number')
-    relation = fields.Char(string='Contact', help='Relation with employee')
-    employee_obj = fields.Many2one('hr.employee', invisible=1)
-
-
-class HrEmployeeFamilyInfo(models.Model):
-    """Table for keep employee family information"""
-    _name = 'hr.employee.family'
-    _description = 'HR Employee Family'
-
-    member_name = fields.Char(string='Name', related='employee_ref.name', store=True)
-    employee_ref = fields.Many2one(string="Is Employee",
-                                   help='If family member currently is an employee of same company, '
-                                        'then please tick this field',
-                                   comodel_name='hr.employee')
-    employee_id = fields.Many2one(string="Employee", help='Select corresponding Employee', comodel_name='hr.employee',
-                                  invisible=1)
-    relation = fields.Selection([('father', 'Father'),
-                                 ('mother', 'Mother'),
-                                 ('daughter', 'Daughter'),
-                                 ('son', 'Son'),
-                                 ('wife', 'Wife')], string='Relationship', help='Relation with employee')
-    member_contact = fields.Char(string='Contact No', related='employee_ref.personal_mobile', store=True)
-
-
-class HrEmployee(models.Model):
-    _inherit = 'hr.employee'
-
-    def mail_reminder(self):
-        now = datetime.now() + timedelta(days=1)
-        date_now = now.date()
-        match = self.search([])
-        for i in match:
-            if i.id_expiry_date:
-                exp_date = fields.Date.from_string(i.id_expiry_date) - timedelta(days=14)
-                if date_now >= exp_date:
-                    mail_content = "  Hello  " + i.name + ",<br>Your ID " + i.identification_id + "is going to expire on " + \
-                                   str(i.id_expiry_date) + ". Please renew it before expiry date"
-                    main_content = {
-                        'subject': _('ID-%s Expired On %s') % (i.identification_id, i.id_expiry_date),
-                        'author_id': self.env.user.partner_id.id,
-                        'body_html': mail_content,
-                        'email_to': i.work_email,
-                    }
-                    self.env['mail.mail'].create(main_content).send()
-        match1 = self.search([])
-        for i in match1:
-            if i.passport_expiry_date:
-                exp_date1 = fields.Date.from_string(i.passport_expiry_date) - timedelta(days=180)
-                if date_now >= exp_date1:
-                    mail_content = "  Hello  " + i.name + ",<br>Your Passport " + i.passport_id + "is going to expire on " + \
-                                   str(i.passport_expiry_date) + ". Please renew it before expiry date"
-                    main_content = {
-                        'subject': _('Passport-%s Expired On %s') % (i.passport_id, i.passport_expiry_date),
-                        'author_id': self.env.user.partner_id.id,
-                        'body_html': mail_content,
-                        'email_to': i.work_email,
-                    }
-                    self.env['mail.mail'].create(main_content).send()
-    personal_mobile = fields.Char(string='Mobile', related='address_home_id.mobile', store=True)
-    emergency_contact = fields.One2many('hr.emergency.contact', 'employee_obj', string='Emergency Contact')
-    joining_date = fields.Date(string='Joining Date')
-    id_expiry_date = fields.Date(string='Expiry Date', help='Expiry date of Identification ID')
-    passport_expiry_date = fields.Date(string='Expiry Date', help='Expiry date of Passport ID')
-    id_attachment_id = fields.Many2many('ir.attachment', 'id_attachment_rel', 'id_ref', 'attach_ref',
-                                        string="Attachment", help='You can attach the copy of your Id')
-    passport_attachment_id = fields.Many2many('ir.attachment', 'passport_attachment_rel', 'passport_ref', 'attach_ref1',
-                                              string="Attachment",
-                                              help='You can attach the copy of Passport')
-    fam_ids = fields.One2many('hr.employee.family', 'employee_id', string='Family', help='Family Information')
-
-
diff --git a/hr_employee_updation/security/ir.model.access.csv b/hr_employee_updation/security/ir.model.access.csv
deleted file mode 100644
index c17dd7d95..000000000
--- a/hr_employee_updation/security/ir.model.access.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_employee_family_employee","hr.employee.family_employee","model_hr_employee_family","base.group_user",1,0,0,0
-"access_hr_employee_family_manager","hr.employee.family_manager","model_hr_employee_family","hr.group_hr_manager",1,1,1,1
-"access_hr_employee_family_user","hr.employee.family_user","model_hr_employee_family","hr.group_hr_user",1,1,1,1
-"access_hr_employee_emergency_contact","hr.emergency.contact","model_hr_emergency_contact","base.group_user",1,0,0,0
-"access_hr_employee_emergency_contact_manager","hr.emergency.contact","model_hr_emergency_contact","hr.group_hr_manager",1,1,1,1
-"access_hr_employee_emergency_contact_user","hr.emergency.contact","model_hr_emergency_contact","hr.group_hr_user",1,1,1,1
\ No newline at end of file
diff --git a/hr_employee_updation/static/description/HRMS-BUTTON.png b/hr_employee_updation/static/description/HRMS-BUTTON.png
deleted file mode 100644
index 0f1b65bea..000000000
Binary files a/hr_employee_updation/static/description/HRMS-BUTTON.png and /dev/null differ
diff --git a/hr_employee_updation/static/description/banner.jpg b/hr_employee_updation/static/description/banner.jpg
deleted file mode 100644
index 663c0a0a9..000000000
Binary files a/hr_employee_updation/static/description/banner.jpg and /dev/null differ
diff --git a/hr_employee_updation/static/description/cybro-service.png b/hr_employee_updation/static/description/cybro-service.png
deleted file mode 100644
index 252929a86..000000000
Binary files a/hr_employee_updation/static/description/cybro-service.png and /dev/null differ
diff --git a/hr_employee_updation/static/description/cybro_logo.png b/hr_employee_updation/static/description/cybro_logo.png
deleted file mode 100644
index bb309114c..000000000
Binary files a/hr_employee_updation/static/description/cybro_logo.png and /dev/null differ
diff --git a/hr_employee_updation/static/description/emergency_contact.png b/hr_employee_updation/static/description/emergency_contact.png
deleted file mode 100644
index 2fd7ba18e..000000000
Binary files a/hr_employee_updation/static/description/emergency_contact.png and /dev/null differ
diff --git a/hr_employee_updation/static/description/family_info.png b/hr_employee_updation/static/description/family_info.png
deleted file mode 100644
index b3d3fbb65..000000000
Binary files a/hr_employee_updation/static/description/family_info.png and /dev/null differ
diff --git a/hr_employee_updation/static/description/icon.png b/hr_employee_updation/static/description/icon.png
deleted file mode 100644
index cc02f7a68..000000000
Binary files a/hr_employee_updation/static/description/icon.png and /dev/null differ
diff --git a/hr_employee_updation/static/description/index.html b/hr_employee_updation/static/description/index.html
deleted file mode 100644
index 293c0a13e..000000000
--- a/hr_employee_updation/static/description/index.html
+++ /dev/null
@@ -1,127 +0,0 @@
-<section class="oe_container">
-    <div class="oe_row">
-        <h2 class="oe_slogan"><a href="https://www.openhrms.com">Open HRMS</a></h2>
-        <h3 class="oe_slogan">Most advanced open source HR management software</h3>
-    </div>
-</section>
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced oe_mt32">
-        <div class="oe_span">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <a href="https://www.openhrms.com/#request-demo">
-                    <img src="HRMS-BUTTON.png">
-                </a>
-                <div class="oe_demo_footer oe_centeralign">Online Demo</div>
-            </div>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-        <h2 class="oe_slogan">Open HRMS Employee Info</h2>
-        <h3 class="oe_slogan">Added Advance Fields On Employee Master</h3>
-        <h4 class="oe_slogan"><a href="https://www.cybrosys.com">Cybrosys Technologies</a> </h4>
-    </div>
-    <div class="oe_row oe_spaced" style="padding-left:65px;">
-        <h4>Features:</h4>
-        <div>
-            <span style="color:green;"> &#9745; </span> Added family information.<br/>
-            <span style="color:green;"> &#9745; </span> Added joining date and contact info.<br/>
-            <span style="color:green;"> &#9745; </span> Added passport and id expiry date and attachments.<br/>
-            <span style="color:green;"> &#9745; </span> Added expiry notification for passport and id documents.<br/>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-        <div class="oe_picture">
-            <h3 class="oe_slogan">Overview</h3>
-            <p class="oe_mt32 text-justify" style="text-align: center;">
-                This module added some advanced features on Employee master.
-                Such as family info, joining date, passport and Id expiry date.
-                This module also sends expiry notification for passport and id to corresponding employees.
-            </p>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-        <h4 class="oe_slogan">Identification ID & Passport ID</h4>
-        <div class="oe_span12">
-            <div class="oe_row_img oe_centered">
-                <img class="oe_picture oe_screenshot" src="personal_info.png">
-            </div>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-        <h4 class="oe_slogan">Emergency Contact Number</h4>
-        <div class="oe_span12">
-            <div class="oe_row_img oe_centered">
-                <img class="oe_picture oe_screenshot" src="emergency_contact.png">
-            </div>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-        <h4 class="oe_slogan">Family Information</h4>
-        <div class="oe_span12">
-            <div class="oe_row_img oe_centered">
-                <img class="oe_picture oe_screenshot" src="family_info.png">
-            </div>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-        <h4 class="oe_slogan">Joining Date</h4>
-        <div class="oe_span12">
-            <div class="oe_row_img oe_centered">
-                <img class="oe_picture oe_screenshot" src="joining_date.png">
-            </div>
-        </div>
-    </div>
-</section>
-
-<div class="row section-content">
-    <div class="col-md-6 img-content">
-        <h3>Our Odoo Services</h3>
-    </div>
-    <div class="bc-span col-md-12">
-        <div class="inner-span">
-            <a target="_blank" href="https://www.openhrms.com">
-                <img class="img-border img-responsive thumbnail" src="cybro-service.png">
-            </a>
-        </div>
-    </div>
-</div>
-
-<section class="oe_container">
-    <h2 class="oe_slogan" style="margin-top:20px;" >Need Any Help?</h2>
-    <div class="oe_slogan" style="margin-top:10px !important;">
-        <div>
-            <a  class="btn btn-primary btn-lg mt8"
-            style="color: #FFFFFF !important;border-radius: 0;" href="https://www.cybrosys.com"><i
-            class="fa fa-envelope"></i> Email </a> <a
-            class="btn btn-primary btn-lg mt8" style="color: #FFFFFF !important;border-radius: 0;"
-            href="https://www.cybrosys.com/contact/"><i
-            class="fa fa-phone"></i> Contact Us </a> <a
-            class="btn btn-primary btn-lg mt8" style="color: #FFFFFF !important;border-radius: 0;"
-            href="https://www.cybrosys.com/odoo-customization-and-installation/"><i
-            class="fa fa-check-square"></i> Request Customization </a>
-        </div>
-        <br>
-        <img src="cybro_logo.png" style="width: 190px; margin-bottom: 20px;" class="center-block">
-    </div>
-</section>
-
-
diff --git a/hr_employee_updation/static/description/joining_date.png b/hr_employee_updation/static/description/joining_date.png
deleted file mode 100644
index e1575e52f..000000000
Binary files a/hr_employee_updation/static/description/joining_date.png and /dev/null differ
diff --git a/hr_employee_updation/static/description/personal_info.png b/hr_employee_updation/static/description/personal_info.png
deleted file mode 100644
index 3c9901c4b..000000000
Binary files a/hr_employee_updation/static/description/personal_info.png and /dev/null differ
diff --git a/hr_employee_updation/views/hr_employee_view.xml b/hr_employee_updation/views/hr_employee_view.xml
deleted file mode 100644
index 6e347a137..000000000
--- a/hr_employee_updation/views/hr_employee_view.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <menuitem id="employee_report_menu" name="Reports" parent="hr.menu_hr_root" sequence="30"
-                  groups="hr.group_hr_manager,hr.group_hr_user"/>
-        <menuitem id="menu_hr_management" name="HR Management" parent="hr.menu_hr_root" sequence="5"
-                  groups="hr.group_hr_manager,hr.group_hr_user"/>
-        <record model="ir.ui.view" id="hr_employee_inherit_form_view">
-            <field name="name">hr.employee.form.view</field>
-            <field name="model">hr.employee</field>
-            <field name="inherit_id" ref="hr.view_employee_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//page[@name='personal_information']/group" position="inside">
-                    <group name="emergency_contact" colspan="4" string="Emergency Contact">
-                        <field name="emergency_contact">
-                            <tree editable="bottom">
-                                <field name="number"/>
-                                <field name="relation"/>
-                            </tree>
-                        </field>
-                    </group>
-                </xpath>
-                <field name="address_home_id" position="after">
-                    <field name="personal_mobile"/>
-                </field>
-                <field name="user_id" position="after">
-                    <field name="joining_date"/>
-                </field>
-                <field name="identification_id" position="replace"/>
-                <field name="passport_id" position="replace"/>
-                <xpath expr="//page[@name='personal_information']/group/group[1]" position="after">
-                    <group name="identification_id" string="Identification ID">
-                        <field name="identification_id"/>
-                        <field name="id_expiry_date"  groups="hr.group_hr_user" attrs="{'invisible': [('identification_id', 'in', [None,False])]}"/>
-                        <field name="id_attachment_id" groups="hr.group_hr_user" widget="many2many_binary" class="oe_inline" attrs="{'invisible': [('identification_id', 'in', [None,False])]}"/>
-                    </group>
-                    <group name="passport_id" string="Passport ID">
-                        <field name="passport_id"/>
-                        <field name="passport_expiry_date" groups="hr.group_hr_user" attrs="{'invisible': [('passport_id', 'in', [None,False])]}"/>
-                        <field name="passport_attachment_id" groups="hr.group_hr_user" widget="many2many_binary" class="oe_inline" attrs="{'invisible': [('passport_id', 'in', [None,False])]}"/>
-                    </group>
-                </xpath>
-
-                <page name="hr_settings" position="after">
-                    <page name="family_info" string="Family Information" groups="hr.group_hr_user">
-                        <group string="Family">
-                            <field name="fam_ids" nolabel="1">
-                                <tree editable="bottom">
-                                    <field name="member_name"/>
-                                    <field name="relation"/>
-                                    <field name="member_contact"/>
-                                </tree>
-                            </field>
-                        </group>
-                    </page>
-                </page>
-            </field>
-        </record>
-
-        <record id="hr_gamification.hr_hr_employee_view_form" model="ir.ui.view">
-            <field name="name">hr.employee.view.form.inherit</field>
-            <field name="model">hr.employee</field>
-            <field name="inherit_id" ref="hr.view_employee_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//page[@name='public']" position="after">
-                    <page string="Received Badges" attrs="{'invisible': [('user_id', '=', False)]}">
-                        <div name="badges" groups="hr.group_hr_user">
-                            <field name="has_badges" invisible="1"/>
-                            <button string="Grant a Badge" type="action" name="%(hr_gamification.action_reward_wizard)d"/> to reward this employee for a good action
-                            <div class="oe_view_nocontent" attrs="{'invisible': [('has_badges', '=', True)]}">
-                                <p class="oe_view_nocontent_create">
-                                    Click to grant this employee his first badge
-                                </p><p class="oe_grey">
-                                    Badges are rewards of good work. Give them to people you believe deserve it.
-                                </p>
-                            </div>
-                        </div>
-                        <field name="badge_ids" widget="many2many_kanban" />
-                    </page>
-                </xpath>
-            </field>
-        </record>
-    </data>
-</odoo>
\ No newline at end of file
diff --git a/hr_employee_updation/views/hr_notification.xml b/hr_employee_updation/views/hr_notification.xml
deleted file mode 100644
index 91ea067a6..000000000
--- a/hr_employee_updation/views/hr_notification.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<odoo>
-    <data>
-        <record model="ir.cron" id="employee_data_reminder">
-            <field name="name">HR Employee Data Expiration</field>
-            <field name="interval_number">1</field>
-            <field name="interval_type">days</field>
-            <field name="numbercall">-1</field>
-            <field name="doall" eval="False"/>
-            <field name="model" eval="'hr.employee'"/>
-            <field name="function" eval="'mail_reminder'"/>
-            <field name="args" eval="'()'" />
-        </record>
-    </data>
-</odoo>
diff --git a/hr_insurance/README.rst b/hr_insurance/README.rst
deleted file mode 100644
index f5cae3780..000000000
--- a/hr_insurance/README.rst
+++ /dev/null
@@ -1,39 +0,0 @@
-OHRMS Employee Insurance Management v10
-=======================================
-
-Employee insurance management for Open HRMS.
-
-Depends
-=======
-[hr] addon Odoo
-
-Tech
-====
-* [Python] - Models
-* [XML] - Odoo views
-
-Installation
-============
-- www.odoo.com/documentation/10.0/setup/install.html
-- Install our custom addon
-
-
-Bug Tracker
-===========
-Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported.
-
-Credits
-=======
-* Cybrosys Techno Solutions <https://www.cybrosys.com>
-
-Author
-------
-
-Developer: Treesa Maria Jude @ cybrosys, treesa@cybrosys.in
-
-Maintainer
-----------
-
-This module is maintained by Cybrosys Technologies.
-
-For support and more information, please visit https://www.cybrosys.com.
diff --git a/hr_insurance/RELEASE_NOTES.md b/hr_insurance/RELEASE_NOTES.md
deleted file mode 100644
index 1d80f982a..000000000
--- a/hr_insurance/RELEASE_NOTES.md
+++ /dev/null
@@ -1,6 +0,0 @@
-## Module hr_insurance
-
-#### 30.03.2018
-#### Version 10.0.1.0.0
-##### ADD
-- Initial commit for OpenHrms Project
diff --git a/hr_insurance/__init__.py b/hr_insurance/__init__.py
deleted file mode 100644
index 1609385da..000000000
--- a/hr_insurance/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Treesa Maria Jude (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-
-from . import models
diff --git a/hr_insurance/__manifest__.py b/hr_insurance/__manifest__.py
deleted file mode 100644
index 5dc94fbc4..000000000
--- a/hr_insurance/__manifest__.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of Open HRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Treesa Maria Jude  (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-
-{
-    'name': 'Open HRMS Employee Insurance Management',
-    'version': '10.0.1.0.0',
-    'summary': """Employee Insurance Management for Open HRMS.""",
-    'description': """Manages insurance amounts for employees to be deducted from salary""",
-    'category': 'Human Resources',
-    'author': 'Cybrosys Techno solutions',
-    'maintainer': 'Cybrosys Techno Solutions',
-    'company': 'Cybrosys Techno Solutions',
-    'website': 'https://www.openhrms.com',
-    'depends': [
-                'base', 'hr', 'hr_payroll',
-                ],
-    'data': [
-        'security/ir.model.access.csv',
-        'security/hr_insurance_security.xml',
-        'views/employee_insurance_view.xml',
-        'views/insurance_salary_stucture.xml',
-        'views/policy_management.xml',
-              ],
-    'images': ['static/description/banner.jpg'],
-    'license': 'AGPL-3',
-    'installable': True,
-    'auto_install': False,
-    'application': False,
-}
diff --git a/hr_insurance/models/__init__.py b/hr_insurance/models/__init__.py
deleted file mode 100644
index d83103344..000000000
--- a/hr_insurance/models/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Treesa Maria Jude (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-
-from . import policy_details
-from . import employee_insurance
diff --git a/hr_insurance/models/employee_insurance.py b/hr_insurance/models/employee_insurance.py
deleted file mode 100644
index bd6cf5d58..000000000
--- a/hr_insurance/models/employee_insurance.py
+++ /dev/null
@@ -1,121 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Treesa Maria Jude (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-
-import time
-from datetime import datetime
-from dateutil import relativedelta
-from odoo import models, fields, api, _
-
-
-class EmployeeInsurance(models.Model):
-    _name = 'hr.insurance'
-    _description = 'HR Insurance'
-    _rec_name = 'employee_id'
-
-    employee_id = fields.Many2one('hr.employee', string='Employee', required=True)
-    policy_id = fields.Many2one('insurance.policy', string='Policy', required=True)
-    amount = fields.Float(string='Policy Amount', required=True)
-    sum_insured = fields.Float(string="Sum Insured", required=True)
-    policy_coverage = fields.Selection([('monthly', 'Monthly'), ('yearly', 'Yearly')],
-                                       required=True, default='monthly',
-                                       string='Policy Coverage',)
-    date_from = fields.Date(string='Date From',
-                            default=time.strftime('%Y-%m-%d'), readonly=True)
-    date_to = fields.Date(string='Date To',   readonly=True,
-                          default=str(datetime.now() + relativedelta.relativedelta(months=+1, day=1, days=-1))[:10])
-    state = fields.Selection([('active', 'Active'),
-                              ('expired', 'Expired'), ],
-                             default='active', string="State",compute='get_status')
-    company_id = fields.Many2one('res.company', string='Company', required=True,
-                                 default=lambda self: self.env.user.company_id)
-
-    def get_status(self):
-        current_datetime = datetime.now()
-        for i in self:
-            x = datetime.strptime(i.date_from, '%Y-%m-%d')
-            y = datetime.strptime(i.date_to, '%Y-%m-%d')
-            print x
-            print current_datetime
-            print y
-            if x <= current_datetime and y >= current_datetime:
-                i.state = 'active'
-
-            else:
-                i.state = 'expired'
-
-    @api.constrains('policy_coverage')
-    @api.onchange('policy_coverage')
-    def get_policy_period(self):
-
-        if self.policy_coverage == 'monthly':
-            self.date_to = str(datetime.now() + relativedelta.relativedelta(months=+1, day=1, days=-1))[:10]
-        if self.policy_coverage == 'yearly':
-            self.date_to = str(datetime.now() + relativedelta.relativedelta(months=+12))[:10]
-
-
-class HrInsurance(models.Model):
-    _inherit = 'hr.employee'
-
-    insurance_percentage = fields.Float(string="Company Percentage ")
-    deduced_amount_per_month = fields.Float(string="Salary deduced per month", compute="get_deduced_amount")
-    deduced_amount_per_year = fields.Float(string="Salary deduced per year", compute="get_deduced_amount")
-    insurance = fields.One2many('hr.insurance', 'employee_id', string="Insurance",
-                                domain=[('state', '=', 'active')])
-
-    def get_deduced_amount(self):
-        current_datetime = datetime.now()
-        for emp in self:
-            ins_amount = 0
-            for ins in emp.insurance:
-
-                x = datetime.strptime(ins.date_from, '%Y-%m-%d')
-                y = datetime.strptime(ins.date_to, '%Y-%m-%d')
-                if x < current_datetime and y > current_datetime:
-                    if ins.policy_coverage == 'monthly':
-
-                        ins_amount = ins_amount + (ins.amount*12)
-                    else:
-
-                        ins_amount = ins_amount + ins.amount
-
-            emp.deduced_amount_per_year = ins_amount-((ins_amount*emp.insurance_percentage)/100)
-            emp.deduced_amount_per_month = emp.deduced_amount_per_year/12
-
-
-class InsuranceRuleInput(models.Model):
-    _inherit = 'hr.payslip'
-
-    # insurance_amount = fields.Float("Insurance amount", compute='get_inputs')
-
-    def get_inputs(self, contract_ids, date_from, date_to):
-        """This Compute the other inputs to employee payslip.
-                           """
-        res = super(InsuranceRuleInput, self).get_inputs(contract_ids, date_from, date_to)
-
-        contract_obj = self.env['hr.contract']
-        emp_id = contract_obj.browse(contract_ids[0]).employee_id
-        for result in res:
-            if emp_id.deduced_amount_per_month != 0 and result.get('code') == 'INSUR':
-                            result['amount'] = emp_id.deduced_amount_per_month
-        return res
-
diff --git a/hr_insurance/models/policy_details.py b/hr_insurance/models/policy_details.py
deleted file mode 100644
index 0b0b07866..000000000
--- a/hr_insurance/models/policy_details.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Treesa Maria Jude (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-
-from odoo import models, fields, api
-
-
-class InsurancePolicy(models.Model):
-    _name = 'insurance.policy'
-
-    name = fields.Char(string='Name', required=True)
-    note_field = fields.Html(string='Comment')
-    company_id = fields.Many2one('res.company', string='Company', required=True,
-                                 default=lambda self: self.env.user.company_id)
diff --git a/hr_insurance/security/hr_insurance_security.xml b/hr_insurance/security/hr_insurance_security.xml
deleted file mode 100644
index e96c9cb84..000000000
--- a/hr_insurance/security/hr_insurance_security.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" ?>
-<odoo>
-    <record id="property_rule_hr_shift" model="ir.rule">
-        <field name="name">Hr Insurancy Company</field>
-        <field name="model_id" ref="model_hr_insurance"/>
-        <field eval="True" name="global"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-    </record>
-
-    <record id="property_rule_hr_shift_generate" model="ir.rule">
-        <field name="name">Hr Insurance Policy company</field>
-        <field name="model_id" ref="model_insurance_policy"/>
-        <field eval="True" name="global"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-    </record>
-</odoo>
\ No newline at end of file
diff --git a/hr_insurance/security/ir.model.access.csv b/hr_insurance/security/ir.model.access.csv
deleted file mode 100644
index 030098bdb..000000000
--- a/hr_insurance/security/ir.model.access.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-
-access_hr_insurance_policy_officer,hr.insurance_policy.officer,hr_insurance.model_insurance_policy,hr.group_hr_user,1,1,1,1
-access_hr_insurance_policy_employee,hr.insurance_policy.employee,hr_insurance.model_insurance_policy,hr.group_hr_manager,1,1,1,1
-access_hr_insurance_policy_manager,hr.insurance_policy.manager,hr_insurance.model_insurance_policy,base.group_user,1,0,0,0
-access_hr_insurance_officer,hr.insurance.officer,hr_insurance.model_hr_insurance,hr.group_hr_user,1,1,1,1
-access_hr_insurance_employee,hr.insurance.employee,hr_insurance.model_hr_insurance,hr.group_hr_manager,1,1,1,1
-access_hr_insurance_manager,hr.insurance.manager,hr_insurance.model_hr_insurance,base.group_user,1,0,0,0
diff --git a/hr_insurance/static/description/HRMS-BUTTON.png b/hr_insurance/static/description/HRMS-BUTTON.png
deleted file mode 100644
index 0f1b65bea..000000000
Binary files a/hr_insurance/static/description/HRMS-BUTTON.png and /dev/null differ
diff --git a/hr_insurance/static/description/banner.jpg b/hr_insurance/static/description/banner.jpg
deleted file mode 100644
index f64af7d11..000000000
Binary files a/hr_insurance/static/description/banner.jpg and /dev/null differ
diff --git a/hr_insurance/static/description/cybro-service.png b/hr_insurance/static/description/cybro-service.png
deleted file mode 100644
index 0a648278c..000000000
Binary files a/hr_insurance/static/description/cybro-service.png and /dev/null differ
diff --git a/hr_insurance/static/description/cybro_logo.png b/hr_insurance/static/description/cybro_logo.png
deleted file mode 100644
index bb309114c..000000000
Binary files a/hr_insurance/static/description/cybro_logo.png and /dev/null differ
diff --git a/hr_insurance/static/description/employee.png b/hr_insurance/static/description/employee.png
deleted file mode 100644
index b3241d3fb..000000000
Binary files a/hr_insurance/static/description/employee.png and /dev/null differ
diff --git a/hr_insurance/static/description/icon.png b/hr_insurance/static/description/icon.png
deleted file mode 100644
index b65b2782f..000000000
Binary files a/hr_insurance/static/description/icon.png and /dev/null differ
diff --git a/hr_insurance/static/description/index.html b/hr_insurance/static/description/index.html
deleted file mode 100644
index eb55e19a3..000000000
--- a/hr_insurance/static/description/index.html
+++ /dev/null
@@ -1,120 +0,0 @@
-<section class="oe_container bg-gray-lighter" xmlns="http://www.w3.org/1999/html">
-    <div class="oe_row">
-        <div class="oe_span">
-            <h2 class="oe_slogan">OpenHRMS</h2>
-            <h3 class="oe_slogan">Most advanced open source HR management software</h3>
-        </div>
-
-
-    </div>
-</section>
-<section class="oe_container">
-    <div class="oe_row oe_spaced oe_mt32">
-        <div class="oe_span">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <a href="https://www.openhrms.com/#request-demo">
-                    <img src="HRMS-BUTTON.png">
-                </a>
-               
-            </div>
-        </div>
-
-    </div>
-</section>
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-        <h2 class="oe_slogan">OHRMS Employee Insurance Management</h2>
-        <h3 class="oe_slogan">Employee Insurance Management for OHRMS</h3>
-        <h4 class="oe_slogan">Cybrosys Technologies , www.cybrosys.com</h4>
-            <p class='oe_mt32'>
-                This module allows tracking the insurance details allowed for employees. Also
-                efficiently manages the insurance allowances with the salary. You can manage
-                the percentage of insurance amount to be deduced from the salary.
-        </p>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_padded">
-        <h2 class="oe_slogan">Set Insurance For Employees</h2>
-        <div class="oe_span12">
-
-        </div>
-       <div class="oe_span13">
-            <div class="oe_demo oe_screenshot">
-                    <img src="insurance.png">
-            </div>
-        </div>
-    </div>
-</section>
-
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_padded">
-        <h2 class="oe_slogan">Policy Management</h2>
-
-       <div class="oe_span13">
-            <div class="oe_demo oe_screenshot">
-                    <img src="policy.png">
-            </div>
-        </div>
-
-    </div>
-</section>
-
-
-<section class="oe_container">
-    <div class="oe_row oe_padded">
-          <div class="oe_span12">
-        <h2 class="oe_slogan">Employee Insurance Details</h2>
-
-        </div>
-       <div class="oe_span13">
-            <div class="oe_demo oe_screenshot">
-                    <img src="employee.png">
-            </div>
-        </div></div>
-</section>
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_padded">
-          <div class="oe_span12">
-        <h2 class="oe_slogan">Amount Deduced On Payslip</h2>
-        </div>
-       <div class="oe_span13">
-            <div class="oe_demo oe_screenshot">
-                    <img src="payslip.png">
-            </div>
-        </div></div>
-</section>
-
-<div class="row section-content">
- <div class="col-md-6 img-content">
- <h3>Our Odoo Services</h3>
-
-
-             </div>    <div class="bc-span col-md-12"><div class="inner-span"><a target="_blank" href="https://www.openhrms.com"><img class="img-border img-responsive thumbnail" src="cybro-service.png"></a></div></div>
-
-</div>
-
-<section class="oe_container">
-		<h2 class="oe_slogan" style="margin-top:20px;" >Need Any Help?</h2>
-		<div class="oe_slogan" style="margin-top:10px !important;">
-            <div>
-				<a  class="btn btn-primary btn-lg mt8"
-				style="color: #FFFFFF !important;border-radius: 0;" href="http://www.cybrosys.com"><i
-				class="fa fa-envelope"></i> Email </a> <a
-				class="btn btn-primary btn-lg mt8" style="color: #FFFFFF !important;border-radius: 0;"
-				href="http://www.cybrosys.com/contact/"><i
-				class="fa fa-phone"></i> Contact Us </a> <a
-				class="btn btn-primary btn-lg mt8" style="color: #FFFFFF !important;border-radius: 0;"
-				href="http://www.cybrosys.com/odoo-customization-and-installation/"><i
-				class="fa fa-check-square"></i> Request Customization </a>
-	        </div>
-            <br>
-		    <img src="cybro_logo.png" style="width: 190px; margin-bottom: 20px;" class="center-block">
-            </div>
-</section>
-
-
diff --git a/hr_insurance/static/description/insurance.png b/hr_insurance/static/description/insurance.png
deleted file mode 100644
index 884b58383..000000000
Binary files a/hr_insurance/static/description/insurance.png and /dev/null differ
diff --git a/hr_insurance/static/description/payslip.png b/hr_insurance/static/description/payslip.png
deleted file mode 100644
index defd554be..000000000
Binary files a/hr_insurance/static/description/payslip.png and /dev/null differ
diff --git a/hr_insurance/static/description/policy.png b/hr_insurance/static/description/policy.png
deleted file mode 100644
index 1601f33af..000000000
Binary files a/hr_insurance/static/description/policy.png and /dev/null differ
diff --git a/hr_insurance/views/employee_insurance_view.xml b/hr_insurance/views/employee_insurance_view.xml
deleted file mode 100644
index af2fc270c..000000000
--- a/hr_insurance/views/employee_insurance_view.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-
-        <record id="hr_employee_insurance_form" model="ir.ui.view">
-        <field name="name">hr.employee.Insurance_form</field>
-        <field name="model">hr.employee</field>
-        <field name="inherit_id" ref="hr.view_employee_form"/>
-        <field name="arch" type="xml">
-            <xpath expr="//page[@name='hr_settings']" position="after">
-                <page name="insurance" string="Insurance">
-                    <group>
-                        <group>
-                            <field name="insurance_percentage">%</field>
-                        </group>
-                        <group>
-                            <field name="deduced_amount_per_year"/>
-                            <field name="deduced_amount_per_month"/>
-                        </group>
-                    </group>
-                    <field name="insurance" context="{'default_employee_id':id}"/>
-
-                </page>
-            </xpath>
-        </field>
-    </record>
-
-
-
-
-        <record id="employee_insurance__details_form" model="ir.ui.view">
-            <field name="name">Employee Insurance</field>
-            <field name="model">hr.insurance</field>
-            <field name="arch" type="xml">
-                <form string="Employee Insurance">
-                    <header>
-                     <field name="state" widget="statusbar" statusbar_visible="active,expired"/>
-                    </header>
-                    <sheet>
-                        <!--<header>-->
-                            <!--<field name="state" class="oe_no_button" placeholder="State" style="width: 37%%" options='{"no_open": True}'/>-->
-                        <!--</header>-->
-                        <group>
-                            <group>
-                                <field name="employee_id"/>
-                                <field name="policy_coverage"/>
-                                <label for="date_from" string="Policy Period"/>
-			<div>
-				<field name="date_from" class="oe_inline" on_change="1" modifiers="{'readonly': [['state', 'not in', ['draft']]], 'required': true}"/>
-				  -
-				<field name="date_to" class="oe_inline" on_change="1" modifiers="{'readonly': [['state', 'not in', ['draft']]], 'required': true}"/>
-			</div>
-                            </group>
-                            <group>
-                                <field name="policy_id"/>
-                                <field name="sum_insured"/>
-                                <field name="amount"/>
-                                <field name="company_id"/>
-                            </group>
-                        </group>
-
-                    </sheet>
-                </form>
-            </field>
-        </record>
-        <record id="employee_insurance_details_tree" model="ir.ui.view">
-            <field name="name">Employee Insurance</field>
-            <field name="model">hr.insurance</field>
-            <field name="arch" type="xml">
-                <tree string="Employee Insurance">
-                     <field name="employee_id"/>
-                    <field name="policy_id"/>
-                    <field name="policy_coverage"/>
-                    <field name="sum_insured"/>
-                    <field name="amount"/>
-                    <field name="date_from" />
-				<field name="date_to"/>
-                    <field name="company_id"/>
-                </tree>
-            </field>
-        </record>
-        <record id="action_employee_insurance_details" model="ir.actions.act_window">
-            <field name="name">Employee Insurance</field>
-            <field name="res_model">hr.insurance</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="help" type="html">
-                <p class="oe_view_nocontent_create">
-                    You have'nt created any policy yet.
-                </p>
-            </field>
-        </record>
-
-        <menuitem
-                id="hr_insurance_main_menu"
-                parent ="hr.menu_hr_root"
-                name="HR Insurance"/>
-
-        <menuitem
-                id="hr_employee_insurance_menu"
-                name="Employee Insurance"
-                parent="hr_insurance_main_menu"
-                action="action_employee_insurance_details"/>
-    </data>
-</odoo>
\ No newline at end of file
diff --git a/hr_insurance/views/insurance_salary_stucture.xml b/hr_insurance/views/insurance_salary_stucture.xml
deleted file mode 100644
index 46d8b7285..000000000
--- a/hr_insurance/views/insurance_salary_stucture.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<odoo>
-    <data>
-
-        <!--<record id="hr_payslip_rule_insurance" model="hr.salary.rule">-->
-            <!--<field name="code">INSUR</field>-->
-            <!--<field name="name">Insurance Amount</field>-->
-            <!--<field name="category_id" ref="hr_payroll.DED"/>-->
-            <!--<field name="amount_select">code</field>-->
-            <!--<field name="amount_python_compute">result = -(payslip.insurance_amount)</field>-->
-            <!--<field name="appears_on_payslip" eval="True"/>-->
-            <!--<field name="sequence" eval="190"/>-->
-        <!--</record>-->
-
-
-        <!--&lt;!&ndash;<record id="hr_payroll.structure_base" model="hr.payroll.structure">&ndash;&gt;-->
-            <!--&lt;!&ndash;<field eval="[(4, ref('hr_payslip_rule_warning')), (4, ref('hr_payslip_rule_reward'))]"&ndash;&gt;-->
-                   <!--&lt;!&ndash;name="rule_ids"/>&ndash;&gt;-->
-        <!--&lt;!&ndash;</record>&ndash;&gt;-->
-        <!-- Insurance rule -->
-        <record id="hr_payslip_rule_insurance" model="hr.salary.rule">
-            <field name="code">INSUR</field>
-            <field name="name">Insurance Amount</field>
-            <field name="category_id" ref="hr_payroll.DED"/>
-            <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = -(inputs.INSUR.amount)</field>
-            <field name="appears_on_payslip" eval="True"/>
-            <field name="sequence" eval="190"/>
-        </record>
-
-        <record id="hr_rule_input_insurance" model="hr.rule.input">
-            <field name="code">INSUR</field>
-            <field name="name">Insurance Amount</field>
-            <field name="input_id" ref="hr_payslip_rule_insurance"/>
-        </record>
-
-        <record id="hr_payroll.structure_base" model="hr.payroll.structure">
-            <field eval="[(4, ref('hr_payslip_rule_insurance'))]"
-                   name="rule_ids"/>
-        </record>
-        </data></odoo>
\ No newline at end of file
diff --git a/hr_insurance/views/policy_management.xml b/hr_insurance/views/policy_management.xml
deleted file mode 100644
index 1766e5e3c..000000000
--- a/hr_insurance/views/policy_management.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <record id="insurance_policy_details_form" model="ir.ui.view">
-            <field name="name">Insurance Policy Details</field>
-            <field name="model">insurance.policy</field>
-            <field name="arch" type="xml">
-                <form string="Policy Details">
-                    <sheet>
-
-                        <group>
-                            <group>
-                                <field name="name"/>
-
-                            </group>
-                            <group>
-                                <field name="company_id"/>
-                            </group>
-
-                        </group>
-                        <notebook>
-                            <page string="Extra Notes">
-                                <field name="note_field"/>
-                            </page>
-                        </notebook>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-        <record id="insurance_policy_details_tree" model="ir.ui.view">
-            <field name="name">Insurance Policy Details</field>
-            <field name="model">insurance.policy</field>
-            <field name="arch" type="xml">
-                <tree string="Policy Details">
-                    <field name="name"/>
-                     <field name="company_id"/>
-                </tree>
-            </field>
-        </record>
-        <record id="action_insurance_policy_management" model="ir.actions.act_window">
-            <field name="name">Insurance Policy </field>
-            <field name="res_model">insurance.policy</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="help" type="html">
-                <p class="oe_view_nocontent_create">
-                    You have'nt created any policy yet.
-                </p>
-            </field>
-        </record>
-
-        <menuitem
-                id="policy_management_menu"
-                name="Policy"
-                parent="hr_insurance_main_menu"
-                action="action_insurance_policy_management"/>
-    </data>
-</odoo>
-
diff --git a/hr_leave_request_aliasing/README.md b/hr_leave_request_aliasing/README.md
deleted file mode 100644
index bbebcea82..000000000
--- a/hr_leave_request_aliasing/README.md
+++ /dev/null
@@ -1,25 +0,0 @@
-Open HRMS Leave Request Aliasing
---------------------------------
-Supporting Addon for Open HRMS, Allows You To Create Leave Request Automatically From Incoming Emails.
-
-Connect with experts
---------------------
-
-If you have any question/queries/additional works on OpenHRMS or this module, You can drop an email directly to Cybrosys.
-
-Technical Notes
----------------
-
-Here you need to send leave request through email with the following rules.
-* You must send leave request through your registered email id.
-* Mail subject must be start with 'LEAVE REQUEST '
-* Mail body must contain date as per given format (%d/%m/%Y)
-
-Contacts
---------
-info - info@cybrosys.com
-Jesni Banu - jesni@cybrosys.in
-
-Website:
-https://www.openhrms.com
-https://www.cybrosys.com
diff --git a/hr_leave_request_aliasing/RELEASE_NOTES.md b/hr_leave_request_aliasing/RELEASE_NOTES.md
deleted file mode 100644
index 406ed1b41..000000000
--- a/hr_leave_request_aliasing/RELEASE_NOTES.md
+++ /dev/null
@@ -1,6 +0,0 @@
-## Module <hr_leave_request_aliasing>
-
-#### 30.03.2018
-#### Version 10.0.1.0.0
-##### ADD
-- Initial commit for OpenHrms Project
diff --git a/hr_leave_request_aliasing/__init__.py b/hr_leave_request_aliasing/__init__.py
deleted file mode 100644
index b579ce91c..000000000
--- a/hr_leave_request_aliasing/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Jesni Banu (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from . import models
-
-
diff --git a/hr_leave_request_aliasing/__manifest__.py b/hr_leave_request_aliasing/__manifest__.py
deleted file mode 100644
index 5ec63469a..000000000
--- a/hr_leave_request_aliasing/__manifest__.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of Open HRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Jesni Banu (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-{
-    'name': 'Open HRMS Leave Request Aliasing',
-    'version': '10.0.1.1.0',
-    'summary': """Allows You To Create Leave Request Automatically From Incoming Mails""",
-    'description': 'This module allows you to create leave request directly from incoming mails.',
-    'category': 'Generic Modules/Human Resources',
-    'author': 'Cybrosys Techno Solutions',
-    'company': 'Cybrosys Techno Solutions',
-    'website': "https://www.openhrms.com",
-    'depends': ['base_setup', 'hr_holidays'],
-    'data': [
-        'data/web_planner_data.xml',
-        'views/hr_leave_template.xml',
-        'views/leave_request_alias_view.xml',
-        'views/res_config_views.xml',
-    ],
-    'demo': [],
-    'images': ['static/description/banner.jpg'],
-    'license': 'AGPL-3',
-    'installable': True,
-    'auto_install': False,
-    'application': False,
-}
diff --git a/hr_leave_request_aliasing/data/web_planner_data.xml b/hr_leave_request_aliasing/data/web_planner_data.xml
deleted file mode 100644
index c21ce1667..000000000
--- a/hr_leave_request_aliasing/data/web_planner_data.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="hr_leave_planner">
-        <t t-call="web_planner.pages">
-            <t t-call="web_planner.category">
-                <t t-set="menu_categorytitle">Setup</t>
-                <t t-set="menu_categoryclasses" t-value="'fa-magic'"/>
-                <t t-call="web_planner.page">
-                    <t t-set="page_title">Get Mobile</t>
-                    <t t-if="not (alias_name and alias_domain)">
-                        <div class="alert alert-warning" role="alert">
-                            <strong>Your email gateway is not configured.</strong> Please configure your email
-                            gateway from the Settings app, menu <i>General Settings</i>.
-                        </div>
-                        <p>
-                            Once your email gateway is configured, come back to this screen
-                            to setup the next steps.
-                        </p>
-                    </t>
-                    <t t-if="alias_name and alias_domain">
-                        <p>
-                            To create leave request by email, send leave request by email with the following
-                            information:
-                        </p>
-
-                        <dl class="dl-horizontal">
-                            <dt>From: Your Email</dt>
-                            <dd>Your Email Address</dd>
-                            <dt>To:</dt>
-                            <dd><t t-esc="alias_name"/>@<t t-esc="alias_domain"/></dd>
-                            <dt>Subject: </dt>
-                            <dd><strong class="text-info">LEAVE REQUEST</strong> Free Description with Date From: and Date To:<strong class="text-primary"></strong></dd>
-                        </dl>
-                        <hr class="mb32"/>
-                        <p>
-                            The <strong class="text-info">LEAVE REQUEST</strong> is mandatory and should be in the
-                            subject of your email. This
-                            will root the leave request automatically on your
-                            Odoo.
-                        </p><p>
-                            Also you need to set <strong class="text-primary">Date From: and Date To:</strong>
-                            at the end of the body of your email.
-                        </p>
-                        <div class="alert alert-info" role="alert">
-                            <b>Note:</b> Set the same email address on your employee form(working email) than
-                            the one you use are your "From:". Otherwise, your
-                            leave request will not be accepted by email.
-                        </div>
-                    </t>
-                </t>
-            </t>
-
-            <t t-call="web_planner.page">
-                <t t-set="page_title">End</t>
-                <t t-set="hide_title" t-value="True"/>
-                <t t-set="hide_from_menu" t-value="True"/>
-                <t t-set="hide_mark_as_done" t-value="True"/>
-                <h1 class="text-center o_planner_trophy" data-icon="&#xe006;" />
-                <div class="text-center">
-                    <h1>Congratulations, you're done!</h1>
-                    <h3>We hope this feature helped you manage your leave request efficiently.</h3>
-                    <h4>Don't hesitate to <a href="mailto:info@cybrosys.com" target="_blank">send us an email</a> to describe<br/> your experience or to suggest improvements!</h4>
-
-                    <p>Have a wonderful day,<br/>- Cybrosys</p>
-                    <img src="/hr_leave_request_aliasing/static/description/cybro_logo.png"/>
-                </div>
-            </t>
-        </t>
-    </template>
-
-    <record id="planner_hr_leave" model="web.planner">
-        <field name="name">Leave strategy planner</field>
-        <field name="view_id" ref="hr_leave_planner"/>
-        <field name="menu_id" ref="hr_holidays.menu_hr_holidays_root"/>
-        <field name="planner_application">planner_hr_leave</field>
-        <field name="tooltip_planner"><![CDATA[
-            Send receipts by email to create leave request efficiently.
-            ]]>
-        </field>
-    </record>
-</odoo>
diff --git a/hr_leave_request_aliasing/doc/RELEASE_NOTES.md b/hr_leave_request_aliasing/doc/RELEASE_NOTES.md
deleted file mode 100644
index 9005d58cc..000000000
--- a/hr_leave_request_aliasing/doc/RELEASE_NOTES.md
+++ /dev/null
@@ -1,11 +0,0 @@
-## Module <hr_leave_request_aliasing>
-
-#### 07.04.2018
-#### Version 10.0.1.1.0
-##### CHG
-- Index updated
-
-#### 30.03.2018
-#### Version 10.0.1.0.0
-##### ADD
-- Initial commit for Open HRMS Project
diff --git a/hr_leave_request_aliasing/models/__init__.py b/hr_leave_request_aliasing/models/__init__.py
deleted file mode 100644
index 79435f83b..000000000
--- a/hr_leave_request_aliasing/models/__init__.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Jesni Banu (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from . import leave_request_alias
-from . import res_config
-from . import web_planner
-
-
diff --git a/hr_leave_request_aliasing/models/leave_request_alias.py b/hr_leave_request_aliasing/models/leave_request_alias.py
deleted file mode 100644
index 2e326c22b..000000000
--- a/hr_leave_request_aliasing/models/leave_request_alias.py
+++ /dev/null
@@ -1,73 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Jesni Banu (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-import re
-from datetime import datetime, timedelta
-from odoo import models, api
-from odoo.tools import email_split
-
-
-class HrLeaveAlias(models.Model):
-    _inherit = 'hr.holidays'
-
-    @api.model
-    def message_new(self, msg_dict, custom_values=None):
-        """This function extracts required fields of hr.holidays from incoming mail then creating records"""
-        try:
-            if custom_values is None:
-                custom_values = {}
-            msg_subject = msg_dict.get('subject', '')
-            subject = re.search('LEAVE REQUEST', msg_subject)
-            if subject is not None:
-                email_address = email_split(msg_dict.get('email_from', False))[0]
-                employee = self.env['hr.employee'].sudo().search([
-                    '|',
-                    ('work_email', 'ilike', email_address),
-                    ('user_id.email', 'ilike', email_address)
-                ], limit=1)
-                msg_body = msg_dict.get('body', '')
-                cleaner = re.compile('<.*?>')
-                clean_msg_body = re.sub(cleaner, '', msg_body)
-                date_list = re.findall(r'\d{2}/\d{2}/\d{4}', clean_msg_body)
-                if len(date_list) > 0:
-                    date_from = date_list[0]
-                    if len(date_list) > 1:
-                        start_date = datetime.strptime(date_list[1], '%d/%m/%Y')
-                        date_to = start_date + timedelta(days=0)
-                    else:
-                        start_date = datetime.strptime(date_list[0], '%d/%m/%Y')
-                        date_to = start_date + timedelta(days=1)
-                    no_of_days_temp = (datetime.strptime(str(date_to), "%Y-%m-%d %H:%M:%S") -
-                                       datetime.strptime(date_from, '%d/%m/%Y')).days
-                    custom_values.update({
-                        'name': msg_subject.strip(),
-                        'employee_id': employee.id,
-                        'holiday_status_id': 1,
-                        'date_from': date_from,
-                        'date_to': date_to,
-                        'no_of_days_temp': no_of_days_temp
-                    })
-            return super(HrLeaveAlias, self).message_new(msg_dict, custom_values)
-        except:
-            pass
-
-
diff --git a/hr_leave_request_aliasing/models/res_config.py b/hr_leave_request_aliasing/models/res_config.py
deleted file mode 100644
index b01f49a7a..000000000
--- a/hr_leave_request_aliasing/models/res_config.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Jesni Banu (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from odoo import api, fields, models
-
-
-class HrLeaveConfigSettings(models.TransientModel):
-    _name = 'hr.leave.config.settings'
-    _inherit = 'res.config.settings'
-
-    alias_prefix = fields.Char(string='Default Alias Name for Leave', help='Default Alias Name for Leave')
-    alias_domain = fields.Char(string='Alias Domain', help='Default Alias Domain for Leave',
-                               default=lambda self: self.env["ir.config_parameter"].get_param("mail.catchall.domain"))
-
-    @api.model
-    def get_default_alias_prefix(self, fields):
-        alias_name = self.env.ref('hr_leave_request_aliasing.mail_alias_leave').alias_name
-        return {'alias_prefix': alias_name}
-
-    @api.multi
-    def set_default_alias_prefix(self):
-        for record in self:
-            self.env.ref('hr_leave_request_aliasing.mail_alias_leave').write({'alias_name': record.alias_prefix})
-
diff --git a/hr_leave_request_aliasing/models/web_planner.py b/hr_leave_request_aliasing/models/web_planner.py
deleted file mode 100644
index e62a026d5..000000000
--- a/hr_leave_request_aliasing/models/web_planner.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Jesni Banu (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from odoo import api, models
-
-
-class PlannerHrLeave(models.Model):
-    """This class is used to activate web.planner feature in 'hr_leave_request_aliasing' module"""
-
-    _inherit = 'web.planner'
-
-    @api.model
-    def _get_planner_application(self):
-        planner = super(PlannerHrLeave, self)._get_planner_application()
-        planner.append(['planner_hr_leave', 'Leave Planner'])
-        return planner
-
-    @api.model
-    def _prepare_planner_hr_leave_data(self):
-        alias_record = self.env.ref('hr_leave_request_aliasing.mail_alias_leave')
-        return {
-            'alias_domain': alias_record.alias_domain,
-            'alias_name': alias_record.alias_name,
-        }
-
diff --git a/hr_leave_request_aliasing/static/description/HRMS-BUTTON.png b/hr_leave_request_aliasing/static/description/HRMS-BUTTON.png
deleted file mode 100644
index 0f1b65bea..000000000
Binary files a/hr_leave_request_aliasing/static/description/HRMS-BUTTON.png and /dev/null differ
diff --git a/hr_leave_request_aliasing/static/description/banner.jpg b/hr_leave_request_aliasing/static/description/banner.jpg
deleted file mode 100644
index 06286d846..000000000
Binary files a/hr_leave_request_aliasing/static/description/banner.jpg and /dev/null differ
diff --git a/hr_leave_request_aliasing/static/description/cybro-service.png b/hr_leave_request_aliasing/static/description/cybro-service.png
deleted file mode 100644
index 252929a86..000000000
Binary files a/hr_leave_request_aliasing/static/description/cybro-service.png and /dev/null differ
diff --git a/hr_leave_request_aliasing/static/description/cybro_logo.png b/hr_leave_request_aliasing/static/description/cybro_logo.png
deleted file mode 100644
index bb309114c..000000000
Binary files a/hr_leave_request_aliasing/static/description/cybro_logo.png and /dev/null differ
diff --git a/hr_leave_request_aliasing/static/description/icon.png b/hr_leave_request_aliasing/static/description/icon.png
deleted file mode 100644
index 2ebe3a208..000000000
Binary files a/hr_leave_request_aliasing/static/description/icon.png and /dev/null differ
diff --git a/hr_leave_request_aliasing/static/description/index.html b/hr_leave_request_aliasing/static/description/index.html
deleted file mode 100644
index 4faef8c08..000000000
--- a/hr_leave_request_aliasing/static/description/index.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<section class="oe_container">
-    <div class="oe_row">
-        <h2 class="oe_slogan"><a href="https://www.openhrms.com">Open HRMS</a></h2>
-        <h3 class="oe_slogan">Most advanced open source HR management software</h3>
-    </div>
-</section>
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced oe_mt32">
-        <div class="oe_span">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <a href="https://www.openhrms.com/#request-demo">
-                    <img src="HRMS-BUTTON.png">
-                </a>
-            </div>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-        <h2 class="oe_slogan">Open HRMS Leave Request Aliasing</h2>
-        <h3 class="oe_slogan">Creating Leave Request, Automatically From Incoming Emails</h3>
-        <h4 class="oe_slogan"><a href="https://www.cybrosys.com">Cybrosys Technologies</a> </h4>
-    </div>
-    <div class="oe_row oe_spaced" style="padding-left:65px;">
-        <h4>Features:</h4>
-        <div>
-            <span style="color:green;"> &#9745; </span> Automation on Leaves Request Mails.<br/>
-            <span style="color:green;"> &#9745; </span> Option to Set Aliasing Domain Separately for Leave Request.<br/>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-        <div class="oe_picture">
-            <h3 class="oe_slogan">Overview</h3>
-            <p class="oe_mt32 text-justify" style="text-align: center;">
-                Email aliasing is a default feature in Odoo which allows the user to fetch contents to ERP records directly from incoming emails.
-                The feature is a type of automation. Since we can configure the E-mails to fetch contents directly.
-                So here we are providing one of the new module to create leave request automatically from incoming email.
-            </p>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-        <div class="oe_span12" style="text-align: center;">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <img style="border:8px solid white;" src="mail_aliasing.png">
-            </div>
-            <span>
-                <i>Here we can send leave request through our registered email id. Then it will create leave
-                request in Odoo. We must ensure that our mail subject must start with 'LEAVE REQUEST ' and date
-                format must be as '%d/%m/%Y'.</i>
-            </span>
-        </div>
-    </div>
-</section>
-
-
-<div class="row section-content">
-    <div class="col-md-6 img-content">
-        <h3>Our Odoo Services</h3>
-    </div>
-    <div class="bc-span col-md-12">
-        <div class="inner-span">
-            <a target="_blank" href="https://www.openhrms.com">
-                <img class="img-border img-responsive thumbnail" src="cybro-service.png">
-            </a>
-        </div>
-    </div>
-</div>
-
-<section class="oe_container oe_dark">
-    <h2 class="oe_slogan" style="margin-top:20px;" >Need Any Help?</h2>
-    <div class="oe_slogan" style="margin-top:10px !important;">
-        <div>
-            <a  class="btn btn-primary btn-lg mt8"
-            style="color: #FFFFFF !important;border-radius: 0;" href="https://www.cybrosys.com"><i
-            class="fa fa-envelope"></i> Email </a> <a
-            class="btn btn-primary btn-lg mt8" style="color: #FFFFFF !important;border-radius: 0;"
-            href="https://www.cybrosys.com/contact/"><i
-            class="fa fa-phone"></i> Contact Us </a> <a
-            class="btn btn-primary btn-lg mt8" style="color: #FFFFFF !important;border-radius: 0;"
-            href="https://www.cybrosys.com/odoo-customization-and-installation/"><i
-            class="fa fa-check-square"></i> Request Customization </a>
-        </div>
-        <br>
-        <img src="cybro_logo.png" style="width: 190px; margin-bottom: 20px;" class="center-block">
-    </div>
-</section>
\ No newline at end of file
diff --git a/hr_leave_request_aliasing/static/description/mail_aliasing.png b/hr_leave_request_aliasing/static/description/mail_aliasing.png
deleted file mode 100644
index 5b499b18a..000000000
Binary files a/hr_leave_request_aliasing/static/description/mail_aliasing.png and /dev/null differ
diff --git a/hr_leave_request_aliasing/static/src/js/web_planner_hr_leave.js b/hr_leave_request_aliasing/static/src/js/web_planner_hr_leave.js
deleted file mode 100644
index f05102334..000000000
--- a/hr_leave_request_aliasing/static/src/js/web_planner_hr_leave.js
+++ /dev/null
@@ -1,6 +0,0 @@
-odoo.define('planner_hr_leave.planner', function (require) {
-"use strict";
-
-var planner = require('web.planner.common');
-
-});
diff --git a/hr_leave_request_aliasing/views/hr_leave_template.xml b/hr_leave_request_aliasing/views/hr_leave_template.xml
deleted file mode 100644
index 46bd54628..000000000
--- a/hr_leave_request_aliasing/views/hr_leave_template.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <template id="assets_backend_expense" name="hr_leave assets" inherit_id="web.assets_backend">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/hr_leave_request_aliasing/static/src/js/web_planner_hr_leave.js"></script>
-            </xpath>
-        </template>
-    </data>
-</odoo>
-
diff --git a/hr_leave_request_aliasing/views/leave_request_alias_view.xml b/hr_leave_request_aliasing/views/leave_request_alias_view.xml
deleted file mode 100644
index f4430dc30..000000000
--- a/hr_leave_request_aliasing/views/leave_request_alias_view.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <record id="mail_alias_leave" model="mail.alias">
-        <field name="alias_name">leave</field>
-        <field name="alias_model_id" ref="model_hr_holidays"/>
-        <field name="alias_user_id" ref="base.user_root"/>
-        <field name="alias_contact">employees</field>
-    </record>
-</odoo>
diff --git a/hr_leave_request_aliasing/views/res_config_views.xml b/hr_leave_request_aliasing/views/res_config_views.xml
deleted file mode 100644
index 0ad909589..000000000
--- a/hr_leave_request_aliasing/views/res_config_views.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <record id="view_hr_leave_configuration" model="ir.ui.view">
-            <field name="name">Configure Leave</field>
-            <field name="model">hr.leave.config.settings</field>
-            <field name="inherit_id" eval="False"/>
-            <field name="arch" type="xml">
-                <form class="oe_form_configuration">
-                    <header>
-                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
-                        <button string="Cancel" type="object" name="cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <group string="Leaves" name="config_alias">
-                        <label for="id" string="Leave Email Alias"/>
-                        <div>
-                            <div attrs="{'invisible': [('alias_domain', 'in', ['localhost', '', False])]}">
-                                <p class="text-muted">
-                                    You can setup a generic email alias to create
-                                    incoming leave request easily. Write an email with the desired
-                                    format to create leave request in one click.
-                                    Format:- Start subject with 'LEAVE REQUEST'. After your mail content mention
-                                    'Date From:' and 'Date To:'.
-                                </p>
-                                <field name="alias_prefix" class="oe_inline"/>
-                                <span>@</span>
-                                <field name="alias_domain"  class="oe_inline" readonly="1"/>
-                            </div>
-                            <div attrs="{'invisible': [('alias_domain', 'not in', ['localhost', '', False])]}">
-                                <button type="action"
-                                    name="base_setup.action_general_configuration"
-                                    string="Setup your domain alias" class="oe_link"/>
-                            </div>
-                        </div>
-                    </group>
-                </form>
-            </field>
-        </record>
-
-        <record id="action_hr_leave_configuration" model="ir.actions.act_window">
-            <field name="name">Configure Leave</field>
-            <field name="res_model">hr.leave.config.settings</field>
-            <field name="view_mode">form</field>
-            <field name="target">inline</field>
-        </record>
-
-        <menuitem id="menu_hr_leave_global_settings" name="Settings"
-            parent="hr_holidays.menu_hr_holidays_root" sequence="96" action="action_hr_leave_configuration" groups="base.group_system"/>
-    </data>
-</odoo>
diff --git a/hr_multi_company/README.md b/hr_multi_company/README.md
deleted file mode 100644
index 92115909a..000000000
--- a/hr_multi_company/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-OHRMS Multi Company
----------------------
-Supporting Addon for Open HRMS, Added Advance Fields On Employee Master
-
-Connect with experts
---------------------
-
-If you have any question/queries/additional works on OpenHRMS or this module, You can drop an email directly to Cybrosys.
-
-Contacts
---------
-info - info@cybrosys.com
-Jesni Banu - jesni@cybrosys.in
-
-Website:
-https://www.openhrms.com
-https://www.cybrosys.com
diff --git a/hr_multi_company/__init__.py b/hr_multi_company/__init__.py
deleted file mode 100644
index 9c6d6e056..000000000
--- a/hr_multi_company/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of Open HRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Jesni Banu (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from . import models
-
-
diff --git a/hr_multi_company/__manifest__.py b/hr_multi_company/__manifest__.py
deleted file mode 100644
index 877db055e..000000000
--- a/hr_multi_company/__manifest__.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of Open HRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Jesni Banu (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-{
-    'name': 'Open HRMS Multi-Company',
-    'version': '10.0.1.1.0',
-    'summary': """Enables Multi-Company""",
-    'description': 'This module enables multi company features',
-    'category': 'Generic Modules/Human Resources',
-    'author': 'Cybrosys Techno Solutions',
-    'company': 'Cybrosys Techno Solutions',
-    'website': "https://www.openhrms.com",
-    'depends': ['base', 'hr_contract', 'hr_payroll', 'hr_attendance', 'hr_employee_transfer'],
-    'data': [
-        'views/hr_company_view.xml',
-        'views/multi_company_view.xml',
-    ],
-    'demo': [],
-    'images': ['static/description/banner.jpg'],
-    'license': 'AGPL-3',
-    'installable': True,
-    'auto_install': False,
-    'application': False,
-}
diff --git a/hr_multi_company/doc/RELEASE_NOTES.md b/hr_multi_company/doc/RELEASE_NOTES.md
deleted file mode 100644
index 29f2bd9f2..000000000
--- a/hr_multi_company/doc/RELEASE_NOTES.md
+++ /dev/null
@@ -1,11 +0,0 @@
-## Module <hr_multi_company>
-
-#### 09.04.2018
-#### Version 10.0.1.1.0
-##### CHG
-- Index updated.
-
-#### 30.03.2018
-#### Version 10.0.1.0.0
-##### ADD
-- Initial commit for Open HRMS Project
diff --git a/hr_multi_company/models/__init__.py b/hr_multi_company/models/__init__.py
deleted file mode 100644
index 0e2cb3558..000000000
--- a/hr_multi_company/models/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of Open HRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Jesni Banu (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from . import hr_multi_company
-
diff --git a/hr_multi_company/models/hr_multi_company.py b/hr_multi_company/models/hr_multi_company.py
deleted file mode 100644
index 2f30de346..000000000
--- a/hr_multi_company/models/hr_multi_company.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of Open HRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Jesni Banu (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from odoo import models, fields
-
-
-class HrAttendanceMultiCompany(models.Model):
-    _inherit = 'hr.attendance'
-
-    company_id = fields.Many2one('res.company', 'Company', copy=False, readonly=True,
-                                 default=lambda self: self.env.user.company_id)
-
-
-class HrLeaveMultiCompany(models.Model):
-    _inherit = 'hr.holidays'
-
-    company_id = fields.Many2one('res.company', 'Company', copy=False, readonly=True,
-                                 default=lambda self: self.env.user.company_id)
-
-
-class HrPayslipMultiCompany(models.Model):
-    _inherit = 'hr.payslip.run'
-
-    company_id = fields.Many2one('res.company', 'Company', copy=False, readonly=True,
-                                 default=lambda self: self.env.user.company_id)
-
-
-class HrSalaryCategoryMultiCompany(models.Model):
-    _inherit = 'hr.salary.rule.category'
-
-    company_id = fields.Many2one('res.company', 'Company', copy=False, readonly=True,
-                                 default=lambda self: self.env.user.company_id)
diff --git a/hr_multi_company/static/description/HRMS-BUTTON.png b/hr_multi_company/static/description/HRMS-BUTTON.png
deleted file mode 100644
index 0f1b65bea..000000000
Binary files a/hr_multi_company/static/description/HRMS-BUTTON.png and /dev/null differ
diff --git a/hr_multi_company/static/description/banner.jpg b/hr_multi_company/static/description/banner.jpg
deleted file mode 100644
index a53eab0ca..000000000
Binary files a/hr_multi_company/static/description/banner.jpg and /dev/null differ
diff --git a/hr_multi_company/static/description/cybro-service.png b/hr_multi_company/static/description/cybro-service.png
deleted file mode 100644
index 252929a86..000000000
Binary files a/hr_multi_company/static/description/cybro-service.png and /dev/null differ
diff --git a/hr_multi_company/static/description/cybro_logo.png b/hr_multi_company/static/description/cybro_logo.png
deleted file mode 100644
index bb309114c..000000000
Binary files a/hr_multi_company/static/description/cybro_logo.png and /dev/null differ
diff --git a/hr_multi_company/static/description/icon.png b/hr_multi_company/static/description/icon.png
deleted file mode 100644
index 1dbe70d04..000000000
Binary files a/hr_multi_company/static/description/icon.png and /dev/null differ
diff --git a/hr_multi_company/static/description/index.html b/hr_multi_company/static/description/index.html
deleted file mode 100644
index 1b9ddda35..000000000
--- a/hr_multi_company/static/description/index.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<section class="oe_container">
-    <div class="oe_row">
-        <h2 class="oe_slogan"><a href="https://www.openhrms.com">Open HRMS</a></h2>
-        <h3 class="oe_slogan">Most advanced open source HR management software</h3>
-    </div>
-</section>
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced oe_mt32">
-        <div class="oe_span">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <a href="https://www.openhrms.com/#request-demo">
-                    <img src="HRMS-BUTTON.png">
-                </a>
-            </div>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-        <h2 class="oe_slogan">Open HRMS Multi Company</h2>
-        <h3 class="oe_slogan">Managing Multi Company In HR Processes</h3>
-        <h4 class="oe_slogan"><a href="https://www.cybrosys.com">Cybrosys Technologies</a> </h4>
-    </div>
-    <div class="oe_row oe_spaced" style="padding-left:65px;">
-        <h4>Features:</h4>
-        <div>
-            <span style="color:green;"> &#9745; </span>Managing multi company.<br/>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-        <div class="oe_picture">
-            <h3 class="oe_slogan">Overview</h3>
-            <p class="oe_mt32 text-justify" style="text-align: center;">
-                This module enables hr multi company, hence hr manager can easily handle
-                multi company process separately. We can activate multi company feature in general settings as usual.
-                This will automatically add company field in every hr related records.
-            </p>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-        <h4 class="oe_slogan">Multi Company In Leaves</h4>
-        <div class="oe_span12">
-            <div class="oe_row_img oe_centered">
-                <img class="oe_picture oe_screenshot" src="multi_company.png">
-            </div>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-        <h4 class="oe_slogan">Multi Company In Attendance</h4>
-        <div class="oe_span12">
-            <div class="oe_row_img oe_centered">
-                <img class="oe_picture oe_screenshot" src="oh_attendance.png">
-            </div>
-        </div>
-    </div>
-</section>
-
-<div class="row section-content">
-    <div class="col-md-6 img-content">
-        <h3>Our Odoo Services</h3>
-    </div>
-    <div class="bc-span col-md-12">
-        <div class="inner-span">
-            <a target="_blank" href="https://www.openhrms.com">
-                <img class="img-border img-responsive thumbnail" src="cybro-service.png">
-            </a>
-        </div>
-    </div>
-</div>
-
-<section class="oe_container">
-    <h2 class="oe_slogan" style="margin-top:20px;" >Need Any Help?</h2>
-    <div class="oe_slogan" style="margin-top:10px !important;">
-        <div>
-            <a  class="btn btn-primary btn-lg mt8"
-            style="color: #FFFFFF !important;border-radius: 0;" href="https://www.cybrosys.com"><i
-            class="fa fa-envelope"></i> Email </a> <a
-            class="btn btn-primary btn-lg mt8" style="color: #FFFFFF !important;border-radius: 0;"
-            href="https://www.cybrosys.com/contact/"><i
-            class="fa fa-phone"></i> Contact Us </a> <a
-            class="btn btn-primary btn-lg mt8" style="color: #FFFFFF !important;border-radius: 0;"
-            href="https://www.cybrosys.com/odoo-customization-and-installation/"><i
-            class="fa fa-check-square"></i> Request Customization </a>
-        </div>
-        <br>
-        <img src="cybro_logo.png" style="width: 190px; margin-bottom: 20px;" class="center-block">
-    </div>
-</section>
diff --git a/hr_multi_company/static/description/multi_company.png b/hr_multi_company/static/description/multi_company.png
deleted file mode 100644
index 34ad6464b..000000000
Binary files a/hr_multi_company/static/description/multi_company.png and /dev/null differ
diff --git a/hr_multi_company/static/description/oh_attendance.png b/hr_multi_company/static/description/oh_attendance.png
deleted file mode 100644
index ef8539c53..000000000
Binary files a/hr_multi_company/static/description/oh_attendance.png and /dev/null differ
diff --git a/hr_multi_company/views/hr_company_view.xml b/hr_multi_company/views/hr_company_view.xml
deleted file mode 100644
index b4dde2cfe..000000000
--- a/hr_multi_company/views/hr_company_view.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" ?>
-<odoo>
-    <record model="ir.ui.view" id="hr_holidays_inherit_form_view1">
-        <field name="name">hr.holidays.form.view1</field>
-        <field name="model">hr.holidays</field>
-        <field name="inherit_id" ref="hr_holidays.edit_holiday_new"/>
-        <field name="arch" type="xml">
-            <field name="department_id" position="after">
-                <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/>
-            </field>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="hr_contract_inherit_form_view1">
-        <field name="name">hr.contract.form.view1</field>
-        <field name="model">hr.contract</field>
-        <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
-        <field name="arch" type="xml">
-            <field name="job_id" position="after">
-                <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/>
-            </field>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="hr_attendance_inherit_form_view1">
-        <field name="name">hr.attendance.form.view1</field>
-        <field name="model">hr.attendance</field>
-        <field name="inherit_id" ref="hr_attendance.hr_attendance_view_form"/>
-        <field name="arch" type="xml">
-            <field name="check_out" position="after">
-                <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/>
-            </field>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="hr_payslip_batch_inherit_form_view1">
-        <field name="name">hr.payslip.run.form.view1</field>
-        <field name="model">hr.payslip.run</field>
-        <field name="inherit_id" ref="hr_payroll.hr_payslip_run_form"/>
-        <field name="arch" type="xml">
-            <field name="credit_note" position="after">
-                <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/>
-            </field>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="hr_salary_category_inherit_form_view1">
-        <field name="name">hr.salary.rule.category.form.view1</field>
-        <field name="model">hr.salary.rule.category</field>
-        <field name="inherit_id" ref="hr_payroll.hr_salary_rule_category_form"/>
-        <field name="arch" type="xml">
-            <field name="code" position="after">
-                <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/>
-            </field>
-        </field>
-    </record>
-</odoo>
\ No newline at end of file
diff --git a/hr_multi_company/views/multi_company_view.xml b/hr_multi_company/views/multi_company_view.xml
deleted file mode 100644
index cd819e0e0..000000000
--- a/hr_multi_company/views/multi_company_view.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" ?>
-<odoo>
-    <record id="property_rule_department" model="ir.rule">
-        <field name="name">Department Create, Write, Unlink</field>
-        <field name="model_id" ref="hr.model_hr_department"/>
-        <field eval="True" name="global"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-    </record>
-
-    <record id="hr_salary_rules_company" model="ir.rule">
-        <field name="name">Salary rules of my Company</field>
-        <field name="model_id" ref="hr_payroll.model_hr_salary_rule"/>
-        <field eval="False" name="global"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-    </record>
-
-    <record id="hr_payroll_structure_company" model="ir.rule">
-        <field name="name">Salary structures of my Company</field>
-        <field name="model_id" ref="hr_payroll.model_hr_payroll_structure"/>
-        <field eval="False" name="global"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-    </record>
-
-    <record id="hr_payroll_batches_company" model="ir.rule">
-        <field name="name">Payslips batches of my Company</field>
-        <field name="model_id" ref="hr_payroll.model_hr_payslip"/>
-        <field eval="False" name="global"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-    </record>
-
-    <record id="hr_payroll_payslip_company" model="ir.rule">
-        <field name="name">Payslips of my Company</field>
-        <field name="model_id" ref="hr_payroll.model_hr_payslip_run"/>
-        <field eval="False" name="global"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-    </record>
-
-    <record id="hr_payroll_salary_category_company" model="ir.rule">
-        <field name="name">Salary Category of my Company</field>
-        <field name="model_id" ref="hr_payroll.model_hr_salary_rule_category"/>
-        <field eval="False" name="global"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-    </record>
-
-    <record id="hr_payroll_contribution_company" model="ir.rule">
-        <field name="name">Payslips Contribution of my Company</field>
-        <field name="model_id" ref="hr_payroll.model_hr_contribution_register"/>
-        <field eval="False" name="global"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-    </record>
-
-    <record id="hr_payroll_attendance_company" model="ir.rule">
-        <field name="name">Attendance of my Company</field>
-        <field name="model_id" ref="hr_attendance.model_hr_attendance"/>
-        <field eval="False" name="global"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-    </record>
-
-    <record id="hr_holidays_company" model="ir.rule">
-        <field name="name">Holidays of my Company</field>
-        <field name="model_id" ref="hr_holidays.model_hr_holidays"/>
-        <field eval="False" name="global"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-    </record>
-
-    <record id="hr_expense_company" model="ir.rule">
-        <field name="name">Expense of my Company</field>
-        <field name="model_id" ref="hr_expense.model_hr_expense"/>
-        <field eval="False" name="global"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-    </record>
-</odoo>
\ No newline at end of file
diff --git a/hr_reminder/__init__.py b/hr_reminder/__init__.py
deleted file mode 100644
index a84ea577e..000000000
--- a/hr_reminder/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Treesa Maria Jude  (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-
-from . import models
-from . import controllers
diff --git a/hr_reminder/__manifest__.py b/hr_reminder/__manifest__.py
deleted file mode 100644
index 8870ead65..000000000
--- a/hr_reminder/__manifest__.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of Open HRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Treesa Maria Jude (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-{
-    'name': 'Open HRMS Reminders Todo',
-    'version': '10.0.2.0.0',
-    'category': 'Extra Tools',
-    'summary': 'HR Reminder For OHRMS',
-    'author': 'Cybrosys Techno Solutions',
-    'company': 'Cybrosys Techno Solutions',
-    'website': "https://www.openhrms.com",
-    'depends': ['base', 'hr'],
-    'data': [
-        'security/ir.model.access.csv',
-        'security/hr_reminder_security.xml',
-        'views/hr_reminder_view.xml',
-        'views/reminder_template.xml',
-    ],
-    'qweb': [
-        'static/src/xml/reminder_topbar.xml', ],
-    'images': ['static/description/banner.jpg'],
-    'license': 'AGPL-3',
-    'installable': True,
-    'auto_install': False,
-    'application': False,
-}
diff --git a/hr_reminder/controllers/__init__.py b/hr_reminder/controllers/__init__.py
deleted file mode 100644
index 948e84ff6..000000000
--- a/hr_reminder/controllers/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Treesa Maria Jude  (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-
-from . import main
diff --git a/hr_reminder/controllers/main.py b/hr_reminder/controllers/main.py
deleted file mode 100644
index bfb960dee..000000000
--- a/hr_reminder/controllers/main.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Treesa Maria Jude  (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-
-from odoo import http
-from odoo.http import request
-
-
-class Reminders(http.Controller):
-
-    @http.route('/hr_reminder/all_reminder', type='json', auth="public")
-    def all_reminder(self):
-        reminder = []
-        for i in request.env['hr.reminder'].search([]):
-            if i.reminder_active:
-                reminder.append(i.name)
-        return reminder
-
-    @http.route('/hr_reminder/reminder_active', type='json', auth="public")
-    def reminder_active(self, **kwargs):
-        reminder_value = kwargs.get('reminder_name')
-        value = []
-
-        for i in request.env['hr.reminder'].search([('name', '=', reminder_value)]):
-            value.append(i.model_name.model)
-            value.append(i.model_field.name)
-            value.append(i.search_by)
-            value.append(i.date_set)
-            value.append(i.date_from)
-            value.append(i.date_to)
-            # value.append(i.exclude_year)
-        return value
diff --git a/hr_reminder/controllers/time_reminder.py b/hr_reminder/controllers/time_reminder.py
deleted file mode 100644
index 4dd40e492..000000000
--- a/hr_reminder/controllers/time_reminder.py
+++ /dev/null
@@ -1,69 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-import werkzeug
-
-from odoo.api import Environment
-import odoo.http as http
-
-from odoo.http import request
-from odoo import SUPERUSER_ID
-from odoo import registry as registry_get
-
-
-class CalendarController(http.Controller):
-
-    @http.route('/calendar/meeting/accept', type='http', auth="calendar")
-    def accept(self, db, token, action, id, **kwargs):
-        registry = registry_get(db)
-        with registry.cursor() as cr:
-            env = Environment(cr, SUPERUSER_ID, {})
-            attendee = env['calendar.attendee'].search([('access_token', '=', token), ('state', '!=', 'accepted')])
-            if attendee:
-                attendee.do_accept()
-        return self.view(db, token, action, id, view='form')
-
-    @http.route('/calendar/meeting/decline', type='http', auth="calendar")
-    def declined(self, db, token, action, id):
-        registry = registry_get(db)
-        with registry.cursor() as cr:
-            env = Environment(cr, SUPERUSER_ID, {})
-            attendee = env['calendar.attendee'].search([('access_token', '=', token), ('state', '!=', 'declined')])
-            if attendee:
-                attendee.do_decline()
-        return self.view(db, token, action, id, view='form')
-
-    @http.route('/calendar/meeting/view', type='http', auth="calendar")
-    def view(self, db, token, action, id, view='calendar'):
-        registry = registry_get(db)
-        with registry.cursor() as cr:
-            # Since we are in auth=none, create an env with SUPERUSER_ID
-            env = Environment(cr, SUPERUSER_ID, {})
-            attendee = env['calendar.attendee'].search([('access_token', '=', token)])
-            timezone = attendee.partner_id.tz
-            lang = attendee.partner_id.lang or 'en_US'
-            event = env['calendar.event'].with_context(tz=timezone, lang=lang).browse(int(id))
-
-            # If user is logged, redirect to form view of event
-            # otherwise, display the simplifyed web page with event informations
-            if request.session.uid:
-                return werkzeug.utils.redirect('/web?db=%s#id=%s&view_type=form&model=calendar.event' % (db, id))
-
-            # NOTE : we don't use request.render() since:
-            # - we need a template rendering which is not lazy, to render before cursor closing
-            # - we need to display the template in the language of the user (not possible with
-            #   request.render())
-            return env['ir.ui.view'].with_context(lang=lang).render_template(
-                'calendar.invitation_page_anonymous', {
-                    'event': event,
-                    'attendee': attendee,
-                })
-
-    # Function used, in RPC to check every 5 minutes, if notification to do for an event or not
-    @http.route('/calendar/notify', type='json', auth="user")
-    def notify(self):
-        return request.env['calendar.alarm_manager'].get_next_notif()
-
-    @http.route('/calendar/notify_ack', type='json', auth="user")
-    def notify_ack(self, type=''):
-        return request.env['res.partner']._set_calendar_last_notif_ack()
diff --git a/hr_reminder/models/__init__.py b/hr_reminder/models/__init__.py
deleted file mode 100644
index 88311d898..000000000
--- a/hr_reminder/models/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Treesa Maria Jude  (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-
-from . import hr_reminder
diff --git a/hr_reminder/models/hr_reminder.py b/hr_reminder/models/hr_reminder.py
deleted file mode 100644
index e9a6f38af..000000000
--- a/hr_reminder/models/hr_reminder.py
+++ /dev/null
@@ -1,77 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Treesa Maria Jude  (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from datetime import datetime
-from odoo import models, fields
-
-
-class HrPopupReminder(models.Model):
-    _name = 'hr.reminder'
-
-    name = fields.Char(string='Title', required=True)
-    model_name = fields.Many2one('ir.model', string="Model", required=True,  domain="[('model', 'like','hr')]")
-    model_field = fields.Many2one('ir.model.fields', string='Field',
-                                  domain="[('model_id', '=',model_name),('ttype', 'in', ['datetime','date'])]",
-                                  required=True)
-    search_by = fields.Selection([('today', 'Today'),
-                                  ('set_period', 'Set Period'),
-                                  ('set_date', 'Set Date'), ],
-                                 required=True, string="Search By")
-    days_before = fields.Integer(string='Reminder before')
-    active = fields.Boolean(string="Active",default=True)
-    # exclude_year = fields.Boolean(string="Consider day alone")
-    reminder_active = fields.Boolean(string="Reminder Active")
-    date_set = fields.Date(string='Select Date')
-    date_from = fields.Date(string="Start Date")
-    date_to = fields.Date(string="End Date")
-    expiry_date = fields.Date(string="Reminder Expiry Date")
-    company_id = fields.Many2one('res.company', string='Company', required=True,
-                                 default=lambda self: self.env.user.company_id)
-
-    def reminder_scheduler(self):
-        now = fields.Datetime.from_string(fields.Datetime.now())
-        today = fields.Date.today()
-        obj = self.env['hr.reminder'].search([])
-        for i in obj:
-            if i.search_by != "today":
-                if i.expiry_date and datetime.strptime(today, "%Y-%m-%d") == datetime.strptime(i.expiry_date, "%Y-%m-%d"):
-                    i.active = False
-                else:
-                        if i.search_by == "set_date":
-                            d1 = datetime.strptime(i.date_set, "%Y-%m-%d")
-                            d2 = datetime.strptime(today, "%Y-%m-%d")
-                            daydiff = abs((d2 - d1).days)
-                            if daydiff <= i.days_before:
-                                i.reminder_active = True
-                            else:
-                                i.reminder_active = False
-                        elif i.search_by == "set_period":
-                            d1 = datetime.strptime(i.date_from, "%Y-%m-%d")
-                            d2 = datetime.strptime(today, "%Y-%m-%d")
-                            daydiff = abs((d2 - d1).days)
-                            if daydiff <= i.days_before:
-                                i.reminder_active = True
-                            else:
-                                i.reminder_active = False
-            else:
-                i.reminder_active = True
-
diff --git a/hr_reminder/security/hr_reminder_security.xml b/hr_reminder/security/hr_reminder_security.xml
deleted file mode 100644
index 2650c4fa0..000000000
--- a/hr_reminder/security/hr_reminder_security.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" ?>
-<odoo>
-    <record id="property_rule_hr_shift" model="ir.rule">
-        <field name="name">Hr Reminder Company</field>
-        <field name="model_id" ref="model_hr_reminder"/>
-        <field eval="True" name="global"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-    </record>
-
-</odoo>
\ No newline at end of file
diff --git a/hr_reminder/security/ir.model.access.csv b/hr_reminder/security/ir.model.access.csv
deleted file mode 100644
index 46fc9f5d3..000000000
--- a/hr_reminder/security/ir.model.access.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-
-access_hr_reminder_officer,hr.reminder.officer,hr_reminder.model_hr_reminder,hr.group_hr_user,1,1,1,1
-access_hr_reminder_employee,hr.reminder.employee,hr_reminder.model_hr_reminder,hr.group_hr_manager,1,1,1,1
-access_hr_reminder_manager,hr.reminder.manager,hr_reminder.model_hr_reminder,base.group_user,0,0,0,0
diff --git a/hr_reminder/static/description/HRMS-BUTTON.png b/hr_reminder/static/description/HRMS-BUTTON.png
deleted file mode 100644
index 0f1b65bea..000000000
Binary files a/hr_reminder/static/description/HRMS-BUTTON.png and /dev/null differ
diff --git a/hr_reminder/static/description/Screenshot from 2018-03-30 18-31-42.png b/hr_reminder/static/description/Screenshot from 2018-03-30 18-31-42.png
deleted file mode 100644
index b052c15e5..000000000
Binary files a/hr_reminder/static/description/Screenshot from 2018-03-30 18-31-42.png and /dev/null differ
diff --git a/hr_reminder/static/description/banner.jpg b/hr_reminder/static/description/banner.jpg
deleted file mode 100644
index 7579d32ea..000000000
Binary files a/hr_reminder/static/description/banner.jpg and /dev/null differ
diff --git a/hr_reminder/static/description/cybro-service.png b/hr_reminder/static/description/cybro-service.png
deleted file mode 100644
index 252929a86..000000000
Binary files a/hr_reminder/static/description/cybro-service.png and /dev/null differ
diff --git a/hr_reminder/static/description/cybro_logo.png b/hr_reminder/static/description/cybro_logo.png
deleted file mode 100644
index bb309114c..000000000
Binary files a/hr_reminder/static/description/cybro_logo.png and /dev/null differ
diff --git a/hr_reminder/static/description/icon.png b/hr_reminder/static/description/icon.png
deleted file mode 100644
index cf84f5d5c..000000000
Binary files a/hr_reminder/static/description/icon.png and /dev/null differ
diff --git a/hr_reminder/static/description/index.html b/hr_reminder/static/description/index.html
deleted file mode 100644
index f6eb3d608..000000000
--- a/hr_reminder/static/description/index.html
+++ /dev/null
@@ -1,137 +0,0 @@
-<section class="oe_container bg-gray-lighter" xmlns="http://www.w3.org/1999/html">
-    <div class="oe_row">
-        <div class="oe_span">
-            <h2 class="oe_slogan">OpenHRMS</h2>
-            <h3 class="oe_slogan">Most advanced open source HR management software</h3>
-        </div>
-
-
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced oe_mt32">
-        <div class="oe_span">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <a href="https://www.openhrms.com/#request-demo">
-                    <img src="HRMS-BUTTON.png">
-                </a>
-             
-            </div>
-        </div>
-
-    </div>
-</section>
-
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-        <h2 class="oe_slogan">Reminders</h2>
-        <h4 class="oe_slogan">Cybrosys Technologies , www.cybrosys.com</h4>
-            <p class='oe_mt32'>
-Reminders is an effective module,helps to memorise all your important dates. We
-can set reminders to any model (eg: Sales,HR,Project etc..) and also their corresponding
-date fields to compare.This eases the company work load to memorize the special
-dates (eg: Expiration date,Deadline date,Assigned Date etc...).
-        </p>
-    </div>
-</section>
-
-<section class="oe_container ">
-    <div class="oe_row oe_padded">
-        <h2 class="oe_slogan">Set Your Reminders</h2>
-        <div class="oe_span12">
-            <p>
-                <h4>Settings>Pop-up Reminder>Reminder</h4>
-               <p>
- <p> Set your reminders for any model and the corresponding date field.
- Also this module allows different methods to search.</p>
-            </p>
-        </div>
-       <div class="oe_span13">
-            <div class="oe_demo oe_screenshot">
-                    <img src="reminder.png">
-            </div>
-        </div></div>
-</section>
-
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_padded">
-        <h2 class="oe_slogan">Search By</h2>
-        <div class="oe_span12">
-<p> We can use 3 methods to search:</p>
-        <ul>
-           <li style="list-style:none !important;"><span style="color:green;"> &#8594;</span>&nbsp;&nbsp; Today: Compares to the current date.</li>
-            <li style="list-style:none !important;"><span style="color:green;"> &#8594;</span>&nbsp;&nbsp; Set Date: Compares with the given date.</li>
-            <li style="list-style:none !important;"><span style="color:green;"> &#8594;</span>&nbsp;&nbsp; Set Period: Reminder is set between a time range(Start date - End date).</li>
-        </ul>
-            <br>
-        </div>
-        <div class="oe_span6">
-            <h3>Set Date</h3>
-            <img class="oe_picture oe_screenshot" src="set_date.png">
-            </div>
-        <div class="oe_span6 ">
-            <h3>Set Period</h3>
-            <img class="oe_picture oe_screenshot" src="set_period.png">
-        </div>
-    </div>
-</section>
-
-
-<section class="oe_container">
-    <div class="oe_row oe_padded">
-          <div class="oe_span12">
-        <h2 class="oe_slogan">Reminder Button</h2>
-        <h3 class="oe_slogan">Select the Reminder from the list of Reminders</h3>
-        </div>
-       <div class="oe_span13">
-            <div class="oe_demo oe_screenshot">
-                    <img src="popup.png">
-            </div>
-        </div></div>
-</section>
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_padded">
-          <div class="oe_span12">
-        <h2 class="oe_slogan">Related Result</h2>
-        </div>
-       <div class="oe_span13">
-            <div class="oe_demo oe_screenshot">
-                    <img src="result.png">
-            </div>
-        </div></div>
-</section>
-
-<div class="row section-content">
- <div class="col-md-6 img-content">
- <h3>Our Odoo Services</h3>
-
-
-             </div>    <div class="bc-span col-md-12"><div class="inner-span"><a target="_blank" href="https://www.openhrms.com"><img class="img-border img-responsive thumbnail" src="cybro-service.png"></a></div></div>
-
-</div>
-
-
-<section class="oe_container">
-		<h2 class="oe_slogan" style="margin-top:20px;" >Need Any Help?</h2>
-		<div class="oe_slogan" style="margin-top:10px !important;">
-            <div>
-				<a  class="btn btn-primary btn-lg mt8"
-				style="color: #FFFFFF !important;border-radius: 0;" href="http://www.cybrosys.com"><i
-				class="fa fa-envelope"></i> Email </a> <a
-				class="btn btn-primary btn-lg mt8" style="color: #FFFFFF !important;border-radius: 0;"
-				href="http://www.cybrosys.com/contact/"><i
-				class="fa fa-phone"></i> Contact Us </a> <a
-				class="btn btn-primary btn-lg mt8" style="color: #FFFFFF !important;border-radius: 0;"
-				href="http://www.cybrosys.com/odoo-customization-and-installation/"><i
-				class="fa fa-check-square"></i> Request Customization </a>
-	        </div>
-            <br>
-		    <img src="cybro_logo.png" style="width: 190px; margin-bottom: 20px;" class="center-block">
-		</div>
-</section>
-
-
diff --git a/hr_reminder/static/description/popup.png b/hr_reminder/static/description/popup.png
deleted file mode 100644
index 4ad643b56..000000000
Binary files a/hr_reminder/static/description/popup.png and /dev/null differ
diff --git a/hr_reminder/static/description/reminder.png b/hr_reminder/static/description/reminder.png
deleted file mode 100644
index 94d091207..000000000
Binary files a/hr_reminder/static/description/reminder.png and /dev/null differ
diff --git a/hr_reminder/static/description/result.png b/hr_reminder/static/description/result.png
deleted file mode 100644
index 3bf265c9d..000000000
Binary files a/hr_reminder/static/description/result.png and /dev/null differ
diff --git a/hr_reminder/static/description/set_date.png b/hr_reminder/static/description/set_date.png
deleted file mode 100644
index 44350466a..000000000
Binary files a/hr_reminder/static/description/set_date.png and /dev/null differ
diff --git a/hr_reminder/static/description/set_period.png b/hr_reminder/static/description/set_period.png
deleted file mode 100644
index ce468e0bc..000000000
Binary files a/hr_reminder/static/description/set_period.png and /dev/null differ
diff --git a/hr_reminder/static/src/css/notification.css b/hr_reminder/static/src/css/notification.css
deleted file mode 100644
index f40020454..000000000
--- a/hr_reminder/static/src/css/notification.css
+++ /dev/null
@@ -1,31 +0,0 @@
-
-.oe_webclient_notification_action t {
-  color: white;
-}
-.oe_webclient_notification_action p {
-  color: white;
-  margin-top: 1em;
-}
- .label {
-  display: inline-block;
-  color: black;
-  max-width: 100%;
-  margin-bottom: 5px;
-  font-weight: bold;
-}
-.reminder-dropdown {
-    .o-flex(0, 1, auto);
-    background: #FFFFFF;
-    max-height: 400px;
-    min-height: 50px;
-    overflow-y: auto;
-
-    @media (max-width: @screen-xs-max) {
-        max-height: none;
-    }
-
-.detail-client-address-country {
-   color: black;
- }
-
-
diff --git a/hr_reminder/static/src/js/reminder_topbar.js b/hr_reminder/static/src/js/reminder_topbar.js
deleted file mode 100644
index 28d5e9c83..000000000
--- a/hr_reminder/static/src/js/reminder_topbar.js
+++ /dev/null
@@ -1,82 +0,0 @@
-odoo.define('hr_reminder.reminder_topbar', function (require) {
-"use strict";
-
-var core = require('web.core');
-var SystrayMenu = require('web.SystrayMenu');
-var Widget = require('web.Widget');
-var QWeb = core.qweb;
-var ajax = require('web.ajax');
-
-var reminder_menu = Widget.extend({
-    template:'reminder_menu',
-
-    events: {
-        "click .dropdown-toggle": "on_click_reminder",
-        "click .detail-client-address-country": "reminder_active",
-    },
-
-
-    on_click_reminder: function (event) {
-        var self = this
-         ajax.jsonRpc("/hr_reminder/all_reminder", 'call',{}
-        ).then(function(all_reminder){
-        self.all_reminder = all_reminder
-        self.$('.o_mail_navbar_dropdown_top').html(QWeb.render('reminder_menu',{
-                values: self.all_reminder
-            }));
-        })
-        },
-
-
-    reminder_active: function(){
-        var self = this;
-        var value =$("#reminder_select").val();
-        ajax.jsonRpc("/hr_reminder/reminder_active", 'call',{'reminder_name':value}
-        ).then(function(reminder){
-            self.reminder = reminder
-             for (var i=0;i<1;i++){
-                    var model = self.reminder[i]
-                    var date = self.reminder[i+1]
-                    console.log("DDDDDDDDDDDDDDDDDDDDDDDDDDDDDd",date,new Date())
-                    if (self.reminder[i+2] == 'today'){
-
-                        return self.do_action({
-                             type: 'ir.actions.act_window',
-                            res_model: model,
-                            view_mode: 'tree',
-                            view_type: 'tree',
-                            domain: [[date, '=', new Date()]],
-                            views: [[false, 'tree']],
-                            target: 'new',})
-                        }
-
-                    else if (self.reminder[i+2] == 'set_date'){
-                        return self.do_action({
-                            type: 'ir.actions.act_window',
-                            res_model: model,
-                            view_mode: 'tree',
-                            view_type: 'tree',
-                            domain: [[date, '=', self.reminder[i+3]]],
-                            views: [[false, 'tree']],
-                            target: 'new',})
-                        }
-
-                    else if (self.reminder[i+2] == 'set_period'){
-                        return self.do_action({
-                            type: 'ir.actions.act_window',
-                            res_model: model,
-                            view_mode: 'tree',
-                            view_type: 'tree',
-                            domain: [[date, '<', self.reminder[i+5]],[date, '>', self.reminder[i+4]]],
-                            views: [[false, 'tree']],
-                            target: 'new',})
-                            }
-
-                        }
-
-             });
-        },
-});
-
-SystrayMenu.Items.push(reminder_menu);
-});
diff --git a/hr_reminder/static/src/xml/reminder_topbar.xml b/hr_reminder/static/src/xml/reminder_topbar.xml
deleted file mode 100644
index b61c42ab9..000000000
--- a/hr_reminder/static/src/xml/reminder_topbar.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates>
-    <t t-name="reminder_menu">
-
-        <li class="o_mail_navbar_item">
-
-            <a class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false" href="#" title="Reminders">
-                <i class="fa fa-bell"/> <span class="o_notification_counter"/></a>
-            <ul class="o_mail_navbar_dropdown dropdown-menu" role="menu">
-                <li class="o_mail_navbar_dropdown_top">
-                    <t t-if="values">
-                    <div>
-                       <span class='label'>Reminders</span>
-                        <select id="reminder_select" name="Reminder" class='detail-client-address-country'>
-
-                                <t t-if="values">
-                            <t t-foreach='values' t-as='val'>
-                                <option class="dropdown-options" t-att-value='val' >
-                                    <t t-esc='val'/>
-                                </option>
-                            </t></t>
-                        </select></div></t>
-                </li>
-
-            </ul>
-        </li>
-    </t>
-    </templates>
\ No newline at end of file
diff --git a/hr_reminder/views/hr_reminder_view.xml b/hr_reminder/views/hr_reminder_view.xml
deleted file mode 100644
index 5660a2945..000000000
--- a/hr_reminder/views/hr_reminder_view.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-
-        <record id="ir_cron_scheduler_reminder_action" model="ir.cron">
-            <field name="name">Reminder scheduler</field>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="interval_number">1</field>
-            <field name="interval_type">minutes</field>
-            <field name="numbercall">-1</field>
-            <field eval="False" name="doall"/>
-            <field eval="'hr.reminder'" name="model"/>
-            <field eval="'reminder_scheduler'" name="function"/>
-        </record>
-
-        <record model="ir.ui.view" id="hr_reminder_form_view">
-            <field name="name">hr.reminder.form.view</field>
-            <field name="model">hr.reminder</field>
-            <field name="arch" type="xml">
-                <form string="HR Reminder">
-                    <sheet>
-                   <div class="oe_title">
-                    <h1 class="o_row">
-                    <field name="name" placeholder="Reminder Title..." />
-                    </h1>
-                    </div>
-                     <group>
-                            <group>
-                                <field name="model_name" />
-                                <field name="search_by"/>
-                               <field name="date_from" attrs="{'invisible': [('search_by','not in','set_period')], 'required': [('search_by', '=', 'set_period')]}"/>
-                                <field name="date_set" attrs="{'invisible': [('search_by','not in','set_date')], 'required': [('search_by', '=', 'set_date')]}"/>
-                                <field name="date_to" attrs="{'invisible': [('search_by','not in','set_period')], 'required': [('search_by', '=', 'set_period')]}"/>
-                                <!--<field name="exclude_year" attrs="{'invisible': [('search_by','in','set_period')]}"/>-->
-                                <field name="company_id"/>
-                            </group>
-                            <group>
-                                <field name="model_field"/>
-                                <field name="days_before" attrs="{'invisible': [('search_by','=','today')]}"/>
-                                <field name="expiry_date" attrs="{'invisible': [('search_by','=','today')]}"/>
-                                <field name="active"/>
-                            </group>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="hr_reminder_tree_view">
-            <field name="name">hr.reminder.tree.view</field>
-            <field name="model">hr.reminder</field>
-            <field name="arch" type="xml">
-                <tree string="Pop-Up Reminder">
-                    <field name="name"/>
-                    <field name="model_name" />
-                     <field name="model_field"/>
-                     <field name="company_id"/>
-                </tree>
-            </field>
-        </record>
-
-         <record model="ir.actions.act_window" id="action_hr_reminder">
-            <field name="name">Reminders</field>
-            <field name="res_model">hr.reminder</field>
-            <field name="view_mode">tree,form</field>
-            <field name="help" type="html">
-                <p class="oe_view_nocontent_create">
-                Click here to create new reminder.
-              </p>
-            </field>
-        </record>
-
-         <menuitem name ="Hr Reminder" id="hr_reminder_menu" parent="hr.menu_hr_root" sequence="8"/>
-         <menuitem name ="Reminder" id="reminder_menu" parent="hr_reminder_menu" action="action_hr_reminder"/>
-</data>
-</openerp>
\ No newline at end of file
diff --git a/hr_reminder/views/reminder_template.xml b/hr_reminder/views/reminder_template.xml
deleted file mode 100644
index e7cf0e20a..000000000
--- a/hr_reminder/views/reminder_template.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <template id="assets_backend" name="mail assets" inherit_id="web.assets_backend">
-            <xpath expr="." position="inside">
-                 <link rel="stylesheet" href="/hr_reminder/static/src/css/notification.css"/>
-                <script type="text/javascript" src="/hr_reminder/static/src/js/reminder_topbar.js"></script>
-            </xpath>
-        </template>
-    </data>
-</openerp>
\ No newline at end of file
diff --git a/hr_reward_warning/README.md b/hr_reward_warning/README.md
deleted file mode 100644
index 6fc40f0f2..000000000
--- a/hr_reward_warning/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-OH Reward/Warning
----------------------
-Supporting Addon for Open HRMS, Managing Official Announcements
-
-Connect with experts
---------------------
-
-If you have any question/queries/additional works on OpenHRMS or this module, You can drop an email directly to Cybrosys.
-
-Contacts
---------
-info - info@cybrosys.com
-Jesni Banu - jesni@cybrosys.in
-
-Website:
-https://www.openhrms.com
-https://www.cybrosys.com
diff --git a/hr_reward_warning/__init__.py b/hr_reward_warning/__init__.py
deleted file mode 100644
index fa5f521c3..000000000
--- a/hr_reward_warning/__init__.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Jesni Banu (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from . import models
-
-
-
diff --git a/hr_reward_warning/__manifest__.py b/hr_reward_warning/__manifest__.py
deleted file mode 100644
index e9f8c63c9..000000000
--- a/hr_reward_warning/__manifest__.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Jesni Banu (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-{
-    'name': 'Open HRMS Official Announcements',
-    'version': '10.0.1.1.0',
-    'summary': """Managing Official Announcements""",
-    'description': 'This module helps you to manage hr official announcements',
-    'category': 'Generic Modules/Human Resources',
-    'author': 'Cybrosys Techno Solutions',
-    'company': 'Cybrosys Techno Solutions',
-    'website': "https://www.openhrms.com",
-    'depends': ['base', 'hr_payroll'],
-    'data': [
-        'security/ir.model.access.csv',
-        'security/reward_security.xml',
-        'views/hr_announcement_view.xml',
-    ],
-    'demo': [],
-    'images': ['static/description/banner.jpg'],
-    'license': 'AGPL-3',
-    'installable': True,
-    'auto_install': False,
-    'application': False,
-}
diff --git a/hr_reward_warning/doc/RELEASE_NOTES.md b/hr_reward_warning/doc/RELEASE_NOTES.md
deleted file mode 100644
index 8de2a9fb0..000000000
--- a/hr_reward_warning/doc/RELEASE_NOTES.md
+++ /dev/null
@@ -1,11 +0,0 @@
-## Module <hr_reward_warning>
-
-#### 07.04.2018
-#### Version 10.0.1.1.0
-##### CHG
-- Index updated
-
-#### 30.03.2018
-#### Version 10.0.1.0.0
-##### ADD
-- Initial commit for Open HRMS Project
diff --git a/hr_reward_warning/models/__init__.py b/hr_reward_warning/models/__init__.py
deleted file mode 100644
index 7d8916fd0..000000000
--- a/hr_reward_warning/models/__init__.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Jesni Banu (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from . import hr_warning
-from . import hr_employee
-
-
diff --git a/hr_reward_warning/models/hr_employee.py b/hr_reward_warning/models/hr_employee.py
deleted file mode 100644
index 1574a2916..000000000
--- a/hr_reward_warning/models/hr_employee.py
+++ /dev/null
@@ -1,67 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Jesni Banu (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from odoo import models, fields, api, _
-
-
-class HrAnnouncements(models.Model):
-    _inherit = 'hr.employee'
-
-    @api.multi
-    def _announcement_count(self):
-        for obj in self:
-            announcement_ids = self.env['hr.announcement'].sudo().search([('state', 'in', ('approved', 'done'))])
-            obj.announcement_count = len(announcement_ids)
-
-    @api.multi
-    def announcement_view(self):
-        for obj in self:
-            ann_obj = self.env['hr.announcement'].sudo().search([('state', 'in', ('approved', 'done'))])
-            ann_ids = []
-            for each in ann_obj:
-                ann_ids.append(each.id)
-            view_id = self.env.ref('hr_reward_warning.view_hr_announcement_form').id
-            if ann_ids:
-                if len(ann_ids) > 1:
-                    value = {
-                        'domain': str([('id', 'in', ann_ids)]),
-                        'view_type': 'form',
-                        'view_mode': 'tree,form',
-                        'res_model': 'hr.announcement',
-                        'view_id': False,
-                        'type': 'ir.actions.act_window',
-                        'name': _('Announcements'),
-                        'res_id': ann_ids
-                    }
-                else:
-                    value = {
-                        'view_type': 'form',
-                        'view_mode': 'form',
-                        'res_model': 'hr.announcement',
-                        'view_id': view_id,
-                        'type': 'ir.actions.act_window',
-                        'name': _('Announcements'),
-                        'res_id': ann_ids and ann_ids[0]
-                    }
-                return value
-
-    announcement_count = fields.Integer(compute='_announcement_count', string='# Announcements')
\ No newline at end of file
diff --git a/hr_reward_warning/models/hr_warning.py b/hr_reward_warning/models/hr_warning.py
deleted file mode 100644
index 5b377fd6f..000000000
--- a/hr_reward_warning/models/hr_warning.py
+++ /dev/null
@@ -1,65 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Jesni Banu (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from datetime import datetime
-from odoo import models, fields, api, _
-
-
-class HrAnnouncementTable(models.Model):
-    _name = 'hr.announcement'
-    _description = 'HR Announcement'
-    _inherit = ['mail.thread', 'ir.needaction_mixin']
-
-    name = fields.Char(string='Code No:')
-    announcement_reason = fields.Text(string='Title', states={'draft': [('readonly', False)]}, required=True, readonly=True)
-    state = fields.Selection([('draft', 'Draft'), ('to_approve', 'Waiting For Approval'),
-                              ('approved', 'Approved'),
-                              ('done', 'Done'), ('rejected', 'Refused')],
-                             string='Status',  default='draft',
-                             track_visibility='always')
-    requested_date = fields.Date(string='Requested Date', default=datetime.now().strftime('%Y-%m-%d'))
-    attachment_id = fields.Many2many('ir.attachment', 'doc_warning_rel', 'doc_id', 'attach_id4',
-                                     string="Attachment", help='You can attach the copy of your Letter')
-    company_id = fields.Many2one('res.company', string='Company',
-                                 default=lambda self: self.env.user.company_id, readonly=True,)
-    announcement = fields.Html(string='Letter', states={'draft': [('readonly', False)]}, readonly=True)
-
-    @api.multi
-    def reject(self):
-        self.state = 'rejected'
-
-    @api.multi
-    def approve(self):
-        self.state = 'approved'
-
-    @api.multi
-    def set_to_done(self):
-        self.state = 'done'
-
-    @api.multi
-    def sent(self):
-        self.state = 'to_approve'
-
-    @api.model
-    def create(self, vals):
-        vals['name'] = self.env['ir.sequence'].next_by_code('hr.announcement')
-        return super(HrAnnouncementTable, self).create(vals)
diff --git a/hr_reward_warning/security/ir.model.access.csv b/hr_reward_warning/security/ir.model.access.csv
deleted file mode 100644
index 49d676c97..000000000
--- a/hr_reward_warning/security/ir.model.access.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_employee_reward_admin","hr.employee.reward","model_hr_announcement","hr.group_hr_manager",1,1,1,1
-"access_hr_employee_reward_user","hr.employee.reward.user","model_hr_announcement","hr.group_hr_user",1,1,1,1
-"access_hr_employee_reward_employee","hr.employee.reward.employee","model_hr_announcement","base.group_user",1,0,0,0
diff --git a/hr_reward_warning/security/reward_security.xml b/hr_reward_warning/security/reward_security.xml
deleted file mode 100644
index c8f6db1f4..000000000
--- a/hr_reward_warning/security/reward_security.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" ?>
-<odoo>
-    <record id="property_rule_announcement" model="ir.rule">
-        <field name="name">Announcement Multi Company</field>
-        <field name="model_id" ref="model_hr_announcement"/>
-        <field eval="True" name="global"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-    </record>
-</odoo>
diff --git a/hr_reward_warning/static/description/HRMS-BUTTON.png b/hr_reward_warning/static/description/HRMS-BUTTON.png
deleted file mode 100644
index 0f1b65bea..000000000
Binary files a/hr_reward_warning/static/description/HRMS-BUTTON.png and /dev/null differ
diff --git a/hr_reward_warning/static/description/banner.jpg b/hr_reward_warning/static/description/banner.jpg
deleted file mode 100644
index 61924dabc..000000000
Binary files a/hr_reward_warning/static/description/banner.jpg and /dev/null differ
diff --git a/hr_reward_warning/static/description/cybro-service.png b/hr_reward_warning/static/description/cybro-service.png
deleted file mode 100644
index 252929a86..000000000
Binary files a/hr_reward_warning/static/description/cybro-service.png and /dev/null differ
diff --git a/hr_reward_warning/static/description/cybro_logo.png b/hr_reward_warning/static/description/cybro_logo.png
deleted file mode 100644
index bb309114c..000000000
Binary files a/hr_reward_warning/static/description/cybro_logo.png and /dev/null differ
diff --git a/hr_reward_warning/static/description/hr_reward.png b/hr_reward_warning/static/description/hr_reward.png
deleted file mode 100644
index 184ee961e..000000000
Binary files a/hr_reward_warning/static/description/hr_reward.png and /dev/null differ
diff --git a/hr_reward_warning/static/description/icon.png b/hr_reward_warning/static/description/icon.png
deleted file mode 100644
index 81e5258c8..000000000
Binary files a/hr_reward_warning/static/description/icon.png and /dev/null differ
diff --git a/hr_reward_warning/static/description/index.html b/hr_reward_warning/static/description/index.html
deleted file mode 100644
index 200f408da..000000000
--- a/hr_reward_warning/static/description/index.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<section class="oe_container">
-    <div class="oe_row">
-        <h2 class="oe_slogan"><a href="https://www.openhrms.com">Open HRMS</a></h2>
-        <h3 class="oe_slogan">Most advanced open source HR management software</h3>
-    </div>
-</section>
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced oe_mt32">
-        <div class="oe_span">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <a href="https://www.openhrms.com/#request-demo">
-                    <img src="HRMS-BUTTON.png">
-                </a>
-                <div class="oe_demo_footer oe_centeralign">Online Demo</div>
-            </div>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-        <h2 class="oe_slogan">Open HRMS Official Announcements</h2>
-        <h3 class="oe_slogan">Manages Official Announcements</h3>
-        <h4 class="oe_slogan"><a href="https://www.cybrosys.com">Cybrosys Technologies</a> </h4>
-    </div>
-    <div class="oe_row oe_spaced" style="padding-left:65px;">
-        <h4>Features:</h4>
-        <div>
-            <span style="color:green;"> &#9745; </span> Managing Official Announcements.<br/>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-        <div class="oe_picture">
-            <h3 class="oe_slogan">Overview</h3>
-            <p class="oe_mt32 text-justify" style="text-align: center;">
-                This module helps you to manage official announcements.
-            </p>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-        <div class="oe_span12">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <img style="border:8px solid white;" src="hr_reward.png">
-            </div>
-        </div>
-    </div>
-</section>
-
-<div class="row section-content">
-    <div class="col-md-6 img-content">
-        <h3>Our Odoo Services</h3>
-    </div>
-    <div class="bc-span col-md-12">
-        <div class="inner-span">
-            <a target="_blank" href="https://www.openhrms.com">
-                <img class="img-border img-responsive thumbnail" src="cybro-service.png">
-            </a>
-        </div>
-    </div>
-</div>
-
-<section class="oe_container">
-    <h2 class="oe_slogan" style="margin-top:20px;" >Need Any Help?</h2>
-    <div class="oe_slogan" style="margin-top:10px !important;">
-        <div>
-            <a  class="btn btn-primary btn-lg mt8"
-            style="color: #FFFFFF !important;border-radius: 0;" href="https://www.cybrosys.com"><i
-            class="fa fa-envelope"></i> Email </a> <a
-            class="btn btn-primary btn-lg mt8" style="color: #FFFFFF !important;border-radius: 0;"
-            href="https://www.cybrosys.com/contact/"><i
-            class="fa fa-phone"></i> Contact Us </a> <a
-            class="btn btn-primary btn-lg mt8" style="color: #FFFFFF !important;border-radius: 0;"
-            href="https://www.cybrosys.com/odoo-customization-and-installation/"><i
-            class="fa fa-check-square"></i> Request Customization </a>
-        </div>
-        <br>
-        <img src="cybro_logo.png" style="width: 190px; margin-bottom: 20px;" class="center-block">
-    </div>
-</section>
-
diff --git a/hr_reward_warning/views/hr_announcement_view.xml b/hr_reward_warning/views/hr_announcement_view.xml
deleted file mode 100644
index a3b1e2416..000000000
--- a/hr_reward_warning/views/hr_announcement_view.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-
-        <record id="announcement_seq" model="ir.sequence">
-            <field name="name">Announcement</field>
-            <field name="code">hr.announcement</field>
-            <field name="prefix">GA</field>
-            <field eval="4" name="padding" />
-        </record>
-
-        <record id="view_hr_announcement_form" model="ir.ui.view">
-            <field name="name">hr.announcement.form</field>
-            <field name="model">hr.announcement</field>
-            <field name="arch" type="xml">
-                <form string="Announcements">
-                    <header>
-                        <button string="Send For Approval"  type="object" name="sent" groups="hr.group_hr_user"
-                                attrs="{'invisible': [('state','not in',('draft'))]}"/>
-                        <button string="Approve"  groups="hr.group_hr_manager" type="object" name="approve"
-                                attrs="{'invisible': [('state','not in',('to_approve'))]}"/>
-                        <button  string="Refuse" class="btn-primary" groups="hr.group_hr_manager" type="object"
-                                name="reject" states="to_approve"/>
-                        <button string="Set to Done" type="object" name="set_to_done" groups="hr.group_hr_user"
-                                states="approved"/>
-                        <field name="state" widget="statusbar" statusbar_visible="draft,to_approve,approved,done"/>
-                    </header>
-                    <sheet>
-                        <h1>
-                            <label for="name"/>
-                            <div>
-                                <field name="name" class="oe_inline" readonly="1"/>
-                            </div>
-                        </h1>
-                        <group>
-                            <label for="announcement_reason"/>
-                            <div>
-                                <field name="announcement_reason"/>
-                            </div>
-                        </group>
-                        <group>
-                            <group>
-                                <field name="attachment_id" widget="many2many_binary" class="oe_inline"/>
-                            </group>
-                            <group>
-                                <field name="requested_date" readonly="1"/>
-                                <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/>
-                            </group>
-                        </group>
-                        <notebook>
-                            <page name="announcement" string="Letter">
-                                <field name="announcement"/>
-                            </page>
-                        </notebook>
-                    </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="view_hr_announcement_tree" model="ir.ui.view">
-            <field name="name">hr.announcement.tree</field>
-            <field name="model">hr.announcement</field>
-            <field name="arch" type="xml">
-                <tree decoration-info="state == 'draft'" colors="grey:state == 'rejected';green:state == 'approved';red:state == 'to_approve';">
-                    <field name="name"/>
-                    <field name="announcement_reason"/>
-                    <field name="state"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="view_hr_announcement_search" model="ir.ui.view">
-            <field name="name">hr.announcement.search</field>
-            <field name="model">hr.announcement</field>
-            <field name="arch" type="xml">
-                <search string="Announcements">
-                    <field name="name"/>
-                    <field name="announcement_reason"/>
-                    <field name="state"/>
-                    <separator/>
-                    <filter name="approved_rewards" string="Approved Letters" domain="[('state', '=', 'approved')]"/>
-                    <filter name="general_announcements" string="General Announcements" domain="[]"/>
-                    <group expand="0" string="Group By">
-                        <filter string="Status" domain="[]" context="{'group_by':'state'}"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
-        <record id="action_hr_announcement" model="ir.actions.act_window">
-            <field name="name">Announcements</field>
-            <field name="res_model">hr.announcement</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="search_view_id" ref="view_hr_announcement_search"/>
-            <field name="help" type="html">
-                <p class="oe_view_nocontent_create">
-                    Click to Create a New Record.
-                </p>
-            </field>
-        </record>
-
-        <menuitem id="hr_announcement"
-                  name="Official Announcements"
-                  groups="hr.group_hr_user,hr.group_hr_manager"
-                  parent="hr.menu_hr_root"
-                  sequence="15"/>
-        <menuitem id="hr_announcement_sub_menu"
-                  name="Announcements"
-                  action="action_hr_announcement"
-                  parent="hr_announcement"
-                  groups="hr.group_hr_user,hr.group_hr_manager"
-                  sequence="1"/>
-
-        <record model="ir.ui.view" id="announcement_inherit_form_view">
-            <field name="name">hr.employee.form.inherit.view</field>
-            <field name="model">hr.employee</field>
-            <field name="inherit_id" ref="hr.view_employee_form"/>
-            <field name="arch" type="xml">
-                <div class="oe_button_box" position="inside">
-                    <button class="oe_stat_button" name="announcement_view" type="object" icon="fa-bullhorn">
-                        <field string="Announcements" name="announcement_count" widget="statinfo"/>
-                    </button>
-                </div>
-            </field>
-        </record>
-    </data>
-</odoo>
\ No newline at end of file
diff --git a/hr_vacation_mngmt/RELEASE_NOTES.md b/hr_vacation_mngmt/RELEASE_NOTES.md
deleted file mode 100644
index 1a18ce542..000000000
--- a/hr_vacation_mngmt/RELEASE_NOTES.md
+++ /dev/null
@@ -1,6 +0,0 @@
-## Module <ohrms_core>
-
-#### 30.03.2018
-#### Version 10.0.1.0.0
-##### ADD
-- Initial commit for OpenHrms Project
diff --git a/hr_vacation_mngmt/__init__.py b/hr_vacation_mngmt/__init__.py
deleted file mode 100644
index c74433564..000000000
--- a/hr_vacation_mngmt/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHrms Project <https://www.openhrms.co.uk>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Aswani PC (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from . import models
-from . import wizard
diff --git a/hr_vacation_mngmt/__manifest__.py b/hr_vacation_mngmt/__manifest__.py
deleted file mode 100644
index f8f375c16..000000000
--- a/hr_vacation_mngmt/__manifest__.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of Open Hrms Project <https://www.openhrms.co.uk>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Aswani PC (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-{
-    'name': "Open HRMS Vacation Management",
-    'version': '10.0.1.0.0',
-    'summary': """Manage Employee Vacation""",
-    'description': """HR Vacation management""",
-    'author': 'Cybrosys Techno Solutions',
-    'company': 'Cybrosys Techno Solutions',
-    'website': 'https://www.openhrms.com',
-    'category': 'Generic Modules/Human Resources',
-    'depends': ['hr_leave_request_aliasing', 'project', 'hr_payroll', 'account'],
-    'data': [
-        'security/hr_vacation_security.xml',
-        'security/ir.model.access.csv',
-        'data/hr_payslip_data.xml',
-        'views/hr_reminder.xml',
-        'data/hr_vacation_data.xml',
-        'wizard/reassign_task.xml',
-        'views/hr_employee_ticket.xml',
-        'views/hr_vacation.xml',
-        'views/hr_payslip.xml',
-    ],
-    'images': ['static/description/banner.jpg'],
-    'license': 'AGPL-3',
-    'installable': True,
-    'auto_install': False,
-    'application': False,
-}
diff --git a/hr_vacation_mngmt/data/hr_payslip_data.xml b/hr_vacation_mngmt/data/hr_payslip_data.xml
deleted file mode 100644
index 68d534755..000000000
--- a/hr_vacation_mngmt/data/hr_payslip_data.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<odoo>
-    <data>
-        <record id="hr_leave_salary_register" model="hr.contribution.register">
-            <field name="name">Leave Salary</field>
-            <field name="partner_id" eval="False"/>
-        </record>
-        <!-- Salary Rules -->
-
-        <record id="hr_salary_rule_leave_salary_basic" model="hr.salary.rule">
-            <field name="name">Leave Salary</field>
-            <field name="code">LS</field>
-            <field name="sequence" eval="90"/>
-            <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="register_id" ref="hr_leave_salary_register"/>
-            <field name="condition_select">none</field>
-            <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = categories.BASIC</field>
-        </record>
-
-        <record id="hr_salary_rule_leave_salary_gross" model="hr.salary.rule">
-            <field name="name">Leave Salary</field>
-            <field name="code">LS</field>
-            <field name="sequence" eval="90"/>
-            <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="register_id" ref="hr_leave_salary_register"/>
-            <field name="condition_select">none</field>
-            <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = categories.BASIC + categories.ALW</field>
-        </record>
-    </data>
-</odoo>
\ No newline at end of file
diff --git a/hr_vacation_mngmt/data/hr_vacation_data.xml b/hr_vacation_mngmt/data/hr_vacation_data.xml
deleted file mode 100644
index e30e4d710..000000000
--- a/hr_vacation_mngmt/data/hr_vacation_data.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <record id="ir_cron_ticket_status_update" model="ir.cron">
-            <field name="name">Flight ticket status update</field>
-            <field name="interval_number">1</field>
-            <field name="interval_type">days</field>
-            <field name="numbercall">-1</field>
-            <field name="doall" eval="False"/>
-            <field name="model" eval="'hr.flight.ticket'"/>
-            <field name="function" eval="'run_update_ticket_status'"/>
-            <field name="args">()</field>
-        </record>
-
-        <record id="leaves_approved" model="ir.filters">
-            <field name="name">Approved Leaves</field>
-            <field name="model_id">hr.holidays</field>
-            <field name="domain">[('state', '=', 'validate')]</field>
-            <field name="user_id" eval="False"/>
-        </record>
-
-        <record id="hr_email_leave_reminder" model="ir.actions.server">
-            <field name="name">HR Leave Reminder</field>
-            <field name="model_id" ref="hr_holidays.model_hr_holidays"/>
-            <field name="condition">False</field>
-            <field name="type">ir.actions.server</field>
-            <field name="state">code</field>
-            <field name="code">
-mail_template = env.ref('hr_vacation_mngmt.email_template_hr_leave_reminder_mail')
-holiday_managers = env.ref('hr_holidays.group_hr_holidays_manager').users
-for manager in holiday_managers:
-    template = mail_template.sudo().with_context(
-    email_to = manager.email,
-    )
-    template.send_mail(record.id, force_send=True)
-            </field>
-        </record>
-
-        <record id="rule_hr_leave_reminder_email" model="base.action.rule">
-            <field name="name">HR Leave Reminder</field>
-            <field name="model_id" ref="hr_holidays.model_hr_holidays"/>
-            <field name="sequence">1</field>
-            <field name="kind">on_time</field>
-            <field name="filter_id" ref="leaves_approved"/>
-            <field name="trg_date_id" ref="hr_holidays.field_hr_holidays_date_from"/>
-            <field name="trg_date_range">-5</field>
-            <field name="trg_date_range_type">day</field>
-            <field name="server_action_ids" eval="[(6, 0, [ref('hr_email_leave_reminder')])]"/>
-        </record>
-
-        <record id="air_lines_partner" model="res.partner">
-            <field name="name">Airlines</field>
-            <field name="supplier">True</field>
-        </record>
-    </data>
-</odoo>
\ No newline at end of file
diff --git a/hr_vacation_mngmt/models/__init__.py b/hr_vacation_mngmt/models/__init__.py
deleted file mode 100644
index 827a12580..000000000
--- a/hr_vacation_mngmt/models/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from . import hr_vacation
-from . import hr_payslip
-from . import hr_employee_ticket
diff --git a/hr_vacation_mngmt/models/hr_employee_ticket.py b/hr_vacation_mngmt/models/hr_employee_ticket.py
deleted file mode 100644
index 18007ff65..000000000
--- a/hr_vacation_mngmt/models/hr_employee_ticket.py
+++ /dev/null
@@ -1,120 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from datetime import datetime
-from odoo import models, fields, api, _
-from odoo.exceptions import UserError, ValidationError
-
-
-class HrFlightTicket(models.Model):
-    _name = 'hr.flight.ticket'
-
-    name = fields.Char()
-    employee_id = fields.Many2one('hr.employee', string='Employee', required=True)
-    ticket_type = fields.Selection([('one', 'One Way'), ('round', 'Round Trip')], string='Ticket Type', default='round')
-    depart_from = fields.Char(string='Departure', required=True)
-    destination = fields.Char(string='Destination', required=True)
-    date_start = fields.Date(string='Start Date', required=True)
-    date_return = fields.Date(string='Return Date')
-    ticket_class = fields.Selection([('economy', 'Economy'),
-                                     ('premium_economy', 'Premium Economy'),
-                                     ('business', 'Business'),
-                                     ('first_class', 'First Class')], string='Class')
-    ticket_fare = fields.Float(string='Ticket Fare')
-    flight_details = fields.Text(string='Flight Details')
-    return_flight_details = fields.Text(string='Return Flight Details')
-    state = fields.Selection([('booked', 'Booked'), ('confirmed', 'Confirmed'), ('started', 'Started'),
-                              ('completed', 'Completed'), ('canceled', 'Canceled')], string='Status', default='booked')
-    invoice_id = fields.Many2one('account.invoice', string='Invoice')
-    leave_id = fields.Many2one('hr.holidays', string='Leave')
-    company_id = fields.Many2one('res.company', 'Company', default=lambda self: self.env.user.company_id)
-
-    @api.multi
-    def name_get(self):
-        res = []
-        for ticket in self:
-            res.append((ticket.id, _("Flight ticket for %s on %s to %s") % (
-                ticket.employee_id.name, ticket.date_start, ticket.destination)))
-        return res
-
-    @api.constrains('date_start', 'date_return')
-    def check_valid_date(self):
-        if self.filtered(lambda c: c.date_return and c.date_start > c.date_return):
-            raise ValidationError(_('Flight travelling start date must be less than flight return date.'))
-
-    def book_ticket(self):
-        return {'type': 'ir.actions.act_window_close'}
-
-    def confirm_ticket(self):
-        if self.ticket_fare <= 0:
-            raise UserError(_('Please add ticket fare.'))
-        inv_obj = self.env['account.invoice'].sudo()
-        expense_account = self.env['ir.values'].get_default('hr.flight.ticket', 'expense_account')
-        if not expense_account:
-            raise UserError(_('Please select expense account for the flight tickets.'))
-        domain = [
-            ('type', '=', 'purchase'),
-            ('company_id', '=', self.company_id.id),
-        ]
-        journal_id = self.env['account.journal'].search(domain, limit=1)
-        partner = self.env.ref('hr_vacation_mngmt.air_lines_partner')
-        if not partner.property_payment_term_id:
-            date_due = fields.Date.context_today(self)
-        else:
-            pterm = partner.property_payment_term_id
-            pterm_list = \
-                pterm.with_context(currency_id=self.env.user.company_id.id).compute(
-                    value=1, date_ref=fields.Date.context_today(self))[0]
-            date_due = max(line[0] for line in pterm_list)
-        inv_data = {
-            'name': '',
-            'origin': 'Flight Ticket',
-            'type': 'in_invoice',
-            'journal_id': journal_id.id,
-            'payment_term_id': partner.property_payment_term_id.id,
-            'date_due': date_due,
-            'reference': False,
-            'partner_id': partner.id,
-            'account_id': partner.property_account_payable_id.id,
-            'invoice_line_ids': [(0, 0, {
-                'name': 'Flight Ticket',
-                'price_unit': self.ticket_fare,
-                'quantity': 1.0,
-                'account_id': expense_account,
-            })],
-        }
-        inv_id = inv_obj.create(inv_data)
-        inv_id.action_invoice_open()
-        self.write({'state': 'confirmed', 'invoice_id': inv_id.id})
-
-    def cancel_ticket(self):
-        if self.state == 'booked':
-            self.write({'state': 'canceled'})
-        elif self.state == 'confirmed':
-            if self.invoice_id and self.invoice_id.state == 'paid':
-                self.write({'state': 'canceled'})
-            if self.invoice_id and self.invoice_id.state == 'open':
-                self.invoice_id.action_invoice_cancel()
-                self.write({'state': 'canceled'})
-
-    @api.model
-    def run_update_ticket_status(self):
-        run_out_tickets = self.search([('state', 'in', ['confirmed', 'started']),
-                                       ('date_return', '<=', datetime.now())])
-        confirmed_tickets = self.search([('state', '=', 'confirmed'), ('date_start', '<=', datetime.now()),
-                                         ('date_return', '>', datetime.now())])
-        for ticket in run_out_tickets:
-            ticket.write({'state': 'completed'})
-        for ticket in confirmed_tickets:
-            ticket.write({'state': 'started'})
-
-    @api.multi
-    def action_view_invoice(self):
-        return {
-            'name': _('Flight Ticket Invoice'),
-            'view_mode': 'form',
-            'view_id': self.env.ref('account.invoice_supplier_form').id,
-            'res_model': 'account.invoice',
-            'context': "{'type':'in_invoice'}",
-            'type': 'ir.actions.act_window',
-            'res_id': self.invoice_id.id,
-        }
diff --git a/hr_vacation_mngmt/models/hr_payslip.py b/hr_vacation_mngmt/models/hr_payslip.py
deleted file mode 100644
index 1f8cdfdee..000000000
--- a/hr_vacation_mngmt/models/hr_payslip.py
+++ /dev/null
@@ -1,185 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from odoo import models, fields, api, _
-
-
-class HrPayslip(models.Model):
-    _inherit = 'hr.payslip'
-
-    leave_salary = fields.Boolean(string='Leave Salary')
-
-    @api.model
-    def get_payslip_lines(self, contract_ids, payslip_id):
-        def _sum_salary_rule_category(localdict, category, amount):
-            if category.parent_id:
-                localdict = _sum_salary_rule_category(localdict, category.parent_id, amount)
-            if category.code in localdict['categories'].dict:
-                amount += localdict['categories'].dict[category.code]
-            localdict['categories'].dict[category.code] = amount
-            return localdict
-
-        class BrowsableObject(object):
-            def __init__(self, employee_id, dict, env):
-                self.employee_id = employee_id
-                self.dict = dict
-                self.env = env
-
-            def __getattr__(self, attr):
-                return attr in self.dict and self.dict.__getitem__(attr) or 0.0
-
-        class InputLine(BrowsableObject):
-            """a class that will be used into the python code, mainly for usability purposes"""
-            def sum(self, code, from_date, to_date=None):
-                if to_date is None:
-                    to_date = fields.Date.today()
-                self.env.cr.execute("""
-                    SELECT sum(amount) as sum
-                    FROM hr_payslip as hp, hr_payslip_input as pi
-                    WHERE hp.employee_id = %s AND hp.state = 'done'
-                    AND hp.date_from >= %s AND hp.date_to <= %s AND hp.id = pi.payslip_id AND pi.code = %s""",
-                    (self.employee_id, from_date, to_date, code))
-                return self.env.cr.fetchone()[0] or 0.0
-
-        class WorkedDays(BrowsableObject):
-            """a class that will be used into the python code, mainly for usability purposes"""
-            def _sum(self, code, from_date, to_date=None):
-                if to_date is None:
-                    to_date = fields.Date.today()
-                self.env.cr.execute("""
-                    SELECT sum(number_of_days) as number_of_days, sum(number_of_hours) as number_of_hours
-                    FROM hr_payslip as hp, hr_payslip_worked_days as pi
-                    WHERE hp.employee_id = %s AND hp.state = 'done'
-                    AND hp.date_from >= %s AND hp.date_to <= %s AND hp.id = pi.payslip_id AND pi.code = %s""",
-                    (self.employee_id, from_date, to_date, code))
-                return self.env.cr.fetchone()
-
-            def sum(self, code, from_date, to_date=None):
-                res = self._sum(code, from_date, to_date)
-                return res and res[0] or 0.0
-
-            def sum_hours(self, code, from_date, to_date=None):
-                res = self._sum(code, from_date, to_date)
-                return res and res[1] or 0.0
-
-        class Payslips(BrowsableObject):
-            """a class that will be used into the python code, mainly for usability purposes"""
-
-            def sum(self, code, from_date, to_date=None):
-                if to_date is None:
-                    to_date = fields.Date.today()
-                self.env.cr.execute("""SELECT sum(case when hp.credit_note = False then (pl.total) else (-pl.total) end)
-                            FROM hr_payslip as hp, hr_payslip_line as pl
-                            WHERE hp.employee_id = %s AND hp.state = 'done'
-                            AND hp.date_from >= %s AND hp.date_to <= %s AND hp.id = pl.slip_id AND pl.code = %s""",
-                            (self.employee_id, from_date, to_date, code))
-                res = self.env.cr.fetchone()
-                return res and res[0] or 0.0
-
-        #we keep a dict with the result because a value can be overwritten by another rule with the same code
-        result_dict = {}
-        rules_dict = {}
-        worked_days_dict = {}
-        inputs_dict = {}
-        blacklist = []
-        payslip = self.env['hr.payslip'].browse(payslip_id)
-        for worked_days_line in payslip.worked_days_line_ids:
-            worked_days_dict[worked_days_line.code] = worked_days_line
-        for input_line in payslip.input_line_ids:
-            inputs_dict[input_line.code] = input_line
-
-        categories = BrowsableObject(payslip.employee_id.id, {}, self.env)
-        inputs = InputLine(payslip.employee_id.id, inputs_dict, self.env)
-        worked_days = WorkedDays(payslip.employee_id.id, worked_days_dict, self.env)
-        payslips = Payslips(payslip.employee_id.id, payslip, self.env)
-        rules = BrowsableObject(payslip.employee_id.id, rules_dict, self.env)
-
-        baselocaldict = {'categories': categories, 'rules': rules, 'payslip': payslips, 'worked_days': worked_days, 'inputs': inputs}
-        #get the ids of the structures on the contracts and their parent id as well
-        contracts = self.env['hr.contract'].browse(contract_ids)
-        structure_ids = contracts.get_all_structures()
-        #get the rules of the structure and thier children
-        rule_ids = self.env['hr.payroll.structure'].browse(structure_ids).get_all_rules()
-        # leave salary computation
-        if payslip.leave_salary:
-            leave_sal_basic = self.env.ref('hr_vacation_mngmt.hr_salary_rule_leave_salary_basic')
-            leave_sal_gross = self.env.ref('hr_vacation_mngmt.hr_salary_rule_leave_salary_gross')
-            default_leave_salary = self.env['ir.config_parameter'].sudo().get_param('default_leave_salary')
-            if default_leave_salary == '0':
-                leave_salary = leave_sal_basic
-            elif default_leave_salary == '1':
-                leave_salary = leave_sal_gross
-            else:
-                leave_salary = leave_sal_basic
-            rule_ids.append((leave_salary.id, leave_salary.sequence))
-        # run the rules by sequence
-        sorted_rule_ids = [id for id, sequence in sorted(rule_ids, key=lambda x:x[1])]
-        sorted_rules = self.env['hr.salary.rule'].browse(sorted_rule_ids)
-
-        for contract in contracts:
-            employee = contract.employee_id
-            localdict = dict(baselocaldict, employee=employee, contract=contract)
-            for rule in sorted_rules:
-                key = rule.code + '-' + str(contract.id)
-                localdict['result'] = None
-                localdict['result_qty'] = 1.0
-                localdict['result_rate'] = 100
-                #check if the rule can be applied
-                if rule.satisfy_condition(localdict) and rule.id not in blacklist:
-                    #compute the amount of the rule
-                    amount, qty, rate = rule.compute_rule(localdict)
-                    #check if there is already a rule computed with that code
-                    previous_amount = rule.code in localdict and localdict[rule.code] or 0.0
-                    #set/overwrite the amount computed for this rule in the localdict
-                    tot_rule = amount * qty * rate / 100.0
-                    localdict[rule.code] = tot_rule
-                    rules_dict[rule.code] = rule
-                    #sum the amount for its salary category
-                    localdict = _sum_salary_rule_category(localdict, rule.category_id, tot_rule - previous_amount)
-                    #create/overwrite the rule in the temporary results
-                    result_dict[key] = {
-                        'salary_rule_id': rule.id,
-                        'contract_id': contract.id,
-                        'name': rule.name,
-                        'code': rule.code,
-                        'category_id': rule.category_id.id,
-                        'sequence': rule.sequence,
-                        'appears_on_payslip': rule.appears_on_payslip,
-                        'condition_select': rule.condition_select,
-                        'condition_python': rule.condition_python,
-                        'condition_range': rule.condition_range,
-                        'condition_range_min': rule.condition_range_min,
-                        'condition_range_max': rule.condition_range_max,
-                        'amount_select': rule.amount_select,
-                        'amount_fix': rule.amount_fix,
-                        'amount_python_compute': rule.amount_python_compute,
-                        'amount_percentage': rule.amount_percentage,
-                        'amount_percentage_base': rule.amount_percentage_base,
-                        'register_id': rule.register_id.id,
-                        'amount': amount,
-                        'employee_id': contract.employee_id.id,
-                        'quantity': qty,
-                        'rate': rate,
-                    }
-                else:
-                    #blacklist this rule and its children
-                    blacklist += [id for id, seq in rule._recursive_search_of_rules()]
-
-        return [value for code, value in result_dict.items()]
-
-
-class HrPayrollConfigSettings(models.TransientModel):
-    _inherit = 'hr.payroll.config.settings'
-
-    default_leave_salary = fields.Selection([('0', 'Basic'), ('1', 'Gross')], string='Leave Salary')
-
-    @api.model
-    def get_default_leave_salary(self, fields):
-        default_leave_salary = self.env['ir.config_parameter'].sudo().get_param('default_leave_salary')
-        return {
-            'default_leave_salary': default_leave_salary
-        }
-
-    @api.multi
-    def set_default_leave_salary(self):
-        config = self.env['ir.config_parameter'].sudo()
-        config.set_param('default_leave_salary', self.default_leave_salary)
diff --git a/hr_vacation_mngmt/models/hr_vacation.py b/hr_vacation_mngmt/models/hr_vacation.py
deleted file mode 100644
index a85f52353..000000000
--- a/hr_vacation_mngmt/models/hr_vacation.py
+++ /dev/null
@@ -1,151 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from datetime import datetime, timedelta, date
-from odoo import models, fields, api, _
-from odoo.exceptions import UserError
-
-
-class HrLeaveRequest(models.Model):
-    _inherit = 'hr.holidays'
-
-    remaining_leaves = fields.Float(string='Remaining Legal Leaves', related='employee_id.remaining_leaves')
-    overlapping_leaves = fields.Many2many('hr.holidays', compute='get_overlapping_leaves', string='Overlapping Leaves')
-    pending_tasks = fields.One2many('pending.task', 'leave_id', string='Pending Tasks')
-    holiday_managers = fields.Many2many('res.users', compute='get_hr_holiday_managers')
-    flight_ticket = fields.One2many('hr.flight.ticket', 'leave_id', string='Flight Ticket')
-
-    @api.one
-    def get_overlapping_leaves(self):
-        if self.type == 'remove' and self.date_from and self.date_to:
-            overlap_leaves = []
-            from_date = datetime.strptime(self.date_from, '%Y-%m-%d %H:%M:%S').date()
-            to_date = datetime.strptime(self.date_to, '%Y-%m-%d %H:%M:%S').date()
-            r = (to_date + timedelta(days=1) - from_date).days
-            leave_dates = [str(from_date + timedelta(days=i)) for i in range(r)]
-            leaves = self.env['hr.holidays'].search([('state', '=', 'validate'), ('type', '=', 'remove'),
-                                                     ('department_id', '=', self.department_id.id)])
-            other_leaves = leaves - self
-            for leave in other_leaves:
-                frm_dte = datetime.strptime(leave.date_from, '%Y-%m-%d %H:%M:%S').date()
-                to_dte = datetime.strptime(leave.date_to, '%Y-%m-%d %H:%M:%S').date()
-                r = (to_dte + timedelta(days=1) - frm_dte).days
-                leave_dtes = [str(frm_dte + timedelta(days=i)) for i in range(r)]
-                if set(leave_dtes).intersection(set(leave_dates)):
-                    overlap_leaves.append(leave.id)
-            self.update({'overlapping_leaves': [(6, 0, overlap_leaves)]})
-
-    @api.multi
-    def action_approve(self):
-        # if double_validation: this method is the first approval approval
-        # if not double_validation: this method calls action_validate() below
-        if not self.env.user.has_group('hr_holidays.group_hr_holidays_user'):
-            raise UserError(_('Only an HR Officer or Manager can approve leave requests.'))
-
-        manager = self.env['hr.employee'].search([('user_id', '=', self.env.uid)], limit=1)
-        for holiday in self:
-            if holiday.state != 'confirm':
-                raise UserError(_('Leave request must be confirmed ("To Approve") in order to approve it.'))
-
-            if holiday.pending_tasks:
-                if holiday.user_id:
-                    ctx = dict(self.env.context or {})
-                    ctx.update({
-                        'default_leave_req_id': self.id,
-                    })
-                    return {
-                        'name': _('Re-Assign Task'),
-                        'type': 'ir.actions.act_window',
-                        'view_type': 'form',
-                        'view_mode': 'form',
-                        'res_model': 'task.reassign',
-                        'target': 'new',
-                        'context': ctx,
-                    }
-                else:
-                    raise UserError(_('Please configure user for the employee %s') % (holiday.employee_id.name,))
-            else:
-                if holiday.double_validation:
-                    return holiday.write({'state': 'validate1', 'manager_id': manager.id if manager else False})
-                else:
-                    holiday.action_validate()
-
-    def book_ticket(self):
-        if not self.env.user.has_group('hr_holidays.group_hr_holidays_user'):
-            raise UserError(_('Only an HR Officer or Manager can book flight tickets.'))
-        ctx = dict(self.env.context or {})
-        ctx.update({
-            'default_employee_id': self.employee_id.id,
-            'default_leave_id': self.id,
-        })
-        return {
-            'name': _('Book Flight Ticket'),
-            'type': 'ir.actions.act_window',
-            'view_type': 'form',
-            'view_mode': 'form',
-            'view_id': self.env.ref('hr_vacation_mngmt.view_hr_book_flight_ticket_form').id,
-            'res_model': 'hr.flight.ticket',
-            'target': 'new',
-            'context': ctx,
-        }
-
-    @api.one
-    def get_hr_holiday_managers(self):
-        self.holiday_managers = self.env.ref('hr_holidays.group_hr_holidays_manager').users
-
-    def view_flight_ticket(self):
-        return {
-            'name': _('Flight Ticket'),
-            'type': 'ir.actions.act_window',
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'hr.flight.ticket',
-            'target': 'current',
-            'res_id': self.flight_ticket[0].id,
-        }
-
-
-class PendingTask(models.Model):
-    _name = 'pending.task'
-
-    name = fields.Char(string='Task', required=True)
-    leave_id = fields.Many2one('hr.holidays', string='Leave Request')
-    dept_id = fields.Many2one('hr.department', string='Department', related='leave_id.department_id')
-    project_id = fields.Many2one('project.project', string='Project', required=True)
-    description = fields.Text(string='Description')
-    assigned_to = fields.Many2one('hr.employee', string='Assigned to',
-                                  domain="[('department_id', '=', dept_id)]")
-    unavailable_employee = fields.Many2many('hr.employee', string='Unavailable Employees',
-                                            compute='get_unavailable_employee')
-
-    @api.one
-    def get_unavailable_employee(self):
-        unavail_emp = []
-        for leave in self.leave_id.overlapping_leaves:
-            unavail_emp.append(leave.employee_id.id)
-        self.update({'unavailable_employee': unavail_emp})
-
-
-class HrVacationConfigSettings(models.TransientModel):
-    _inherit = 'hr.leave.config.settings'
-
-    leave_reminder = fields.Boolean(string='Leave Reminder Email', help="Send leave remainder emails to hr managers")
-    reminder_day_before = fields.Integer(string='Reminder Day Before')
-    default_expense_account = fields.Many2one('account.account', string='Travel Expense Account')
-
-    @api.model
-    def get_default_leave_details(self, fields):
-        leave_reminder = self.env.ref('hr_vacation_mngmt.hr_email_leave_reminder').condition
-        reminder_day_before = self.env.ref('hr_vacation_mngmt.rule_hr_leave_reminder_email').trg_date_range
-        default_expense_account = self.env['ir.values'].get_default('hr.flight.ticket', 'expense_account')
-        return {
-            'leave_reminder': leave_reminder,
-            'reminder_day_before': reminder_day_before,
-            'default_expense_account': default_expense_account,
-        }
-
-    @api.multi
-    def set_default_leave_details(self):
-        for record in self:
-            self.env.ref('hr_vacation_mngmt.hr_email_leave_reminder').write({'condition': record.leave_reminder})
-            self.env.ref('hr_vacation_mngmt.rule_hr_leave_reminder_email').write({'trg_date_range': record.reminder_day_before})
-            self.env['ir.values'].sudo().set_default('hr.flight.ticket', 'expense_account', self.default_expense_account.id)
diff --git a/hr_vacation_mngmt/security/hr_vacation_security.xml b/hr_vacation_mngmt/security/hr_vacation_security.xml
deleted file mode 100644
index a7bba429f..000000000
--- a/hr_vacation_mngmt/security/hr_vacation_security.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data noupdate="1">
-        <record id="property_rule_hr_flight_ticket" model="ir.rule">
-            <field name="name">Hr Flight Ticket Multi Company</field>
-            <field name="model_id" ref="model_hr_flight_ticket"/>
-            <field eval="True" name="global"/>
-            <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-        </record>
-    </data>
-</odoo>
\ No newline at end of file
diff --git a/hr_vacation_mngmt/security/ir.model.access.csv b/hr_vacation_mngmt/security/ir.model.access.csv
deleted file mode 100644
index 74531a7eb..000000000
--- a/hr_vacation_mngmt/security/ir.model.access.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_hr_flight_ticket_user,hr.flight.ticket.user,model_hr_flight_ticket,hr_holidays.group_hr_holidays_user,1,1,1,1
-access_hr_flight_ticket_employee,hr.flight.ticket.employee,model_hr_flight_ticket,base.group_user,1,1,1,1
-access_pending_task_user,pending.task.user,model_pending_task,hr_holidays.group_hr_holidays_user,1,1,1,1
-access_pending_task_employee,pending.task.employee,model_pending_task,base.group_user,1,1,1,1
-access_account_invoice,account.invoice.hr_manager,account.model_account_invoice,hr_holidays.group_hr_holidays_manager,1,0,0,0
-access_account_invoice_tax,account.invoice.tax.hr_manager,account.model_account_invoice_tax,hr_holidays.group_hr_holidays_manager,1,0,0,0
-access_account_move_line,account.move.line.hr_manager,account.model_account_move_line,hr_holidays.group_hr_holidays_manager,1,0,0,0
\ No newline at end of file
diff --git a/hr_vacation_mngmt/static/description/HRMS-BUTTON.png b/hr_vacation_mngmt/static/description/HRMS-BUTTON.png
deleted file mode 100644
index 0f1b65bea..000000000
Binary files a/hr_vacation_mngmt/static/description/HRMS-BUTTON.png and /dev/null differ
diff --git a/hr_vacation_mngmt/static/description/banner.jpg b/hr_vacation_mngmt/static/description/banner.jpg
deleted file mode 100644
index beb870c2b..000000000
Binary files a/hr_vacation_mngmt/static/description/banner.jpg and /dev/null differ
diff --git a/hr_vacation_mngmt/static/description/cybro-service.png b/hr_vacation_mngmt/static/description/cybro-service.png
deleted file mode 100644
index 252929a86..000000000
Binary files a/hr_vacation_mngmt/static/description/cybro-service.png and /dev/null differ
diff --git a/hr_vacation_mngmt/static/description/cybro_logo.png b/hr_vacation_mngmt/static/description/cybro_logo.png
deleted file mode 100644
index bb309114c..000000000
Binary files a/hr_vacation_mngmt/static/description/cybro_logo.png and /dev/null differ
diff --git a/hr_vacation_mngmt/static/description/icon.png b/hr_vacation_mngmt/static/description/icon.png
deleted file mode 100644
index cf3082e3d..000000000
Binary files a/hr_vacation_mngmt/static/description/icon.png and /dev/null differ
diff --git a/hr_vacation_mngmt/static/description/index.html b/hr_vacation_mngmt/static/description/index.html
deleted file mode 100644
index 1f098554d..000000000
--- a/hr_vacation_mngmt/static/description/index.html
+++ /dev/null
@@ -1,210 +0,0 @@
-<section class="oe_container ">
-    <div class="oe_row">
-        <h2 class="oe_slogan">Open HRMS</h2>
-        <h3 class="oe_slogan">Most advanced open source HR management software</h3>
-    </div>
-</section>
-<section class="oe_container">
-    <div class="oe_row oe_spaced oe_mt32">
-        <div class="oe_span">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <a href="https://www.openhrms.com/#request-demo">
-                    <img src="HRMS-BUTTON.png">
-                </a>
-            </div>
-        </div>
-    </div>
-</section>
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-        <h2 class="oe_slogan">Open HRMS Vacation Management</h2>
-        <h3 class="oe_slogan">Manage Employee Vacation</h3>
-        <h4 class="oe_slogan"><a href="https://www.cybrosys.com">Cybrosys Technologies</a></h4>
-    </div>
-    <div class="oe_row oe_spaced" style="padding-left:65px;">
-        <h4>Features:</h4>
-        <div>
-            <span style="color:green;"> &#9745; </span>Remaining legal leaves in leave request to approval.<br/>
-            <span style="color:green;"> &#9745; </span>Overlapping leaves.<br/>
-            <span style="color:green;"> &#9745; </span>Leave notification.<br/>
-            <span style="color:green;"> &#9745; </span>Leave salary.<br/>
-            <span style="color:green;"> &#9745; </span>Pending task update and re-assign task.<br/>
-            <span style="color:green;"> &#9745; </span>Flight ticket booking.<br/>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-        <div class="" style="text-align: center;">
-            <div class="oe_picture">
-                <h3 class="oe_slogan">Overview</h3>
-                <p class="oe_mt32">
-                    This module extend Odoo default HR Holiday Management with extra features adaptable for managing employees vacation..
-                </p>
-            </div>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-        <div style="text-align: center">
-            <p><h4 class="oe_slogan">Remaining & Overlapping Leaves</h4><p>
-        </div>
-        <div style="text-align: center">
-            <a href="https://www.cybrosys.com">
-                <div class="oe_demo oe_picture oe_screenshot">
-                    <img style="border:10px solid white;" src="ohrms_vacation_01.png">
-                </div>
-            </a>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-        <div style="text-align: center">
-            <p><h4 class="oe_slogan">Pending Tasks Update & Task Re-assign</h4><p>
-
-        </div>
-        <div style="text-align: center">
-            <p class="oe_mt32">
-                Employees can able to update their pending tasks on leave request
-            </p>
-            <a href="https://www.cybrosys.com">
-                <div class="oe_demo oe_picture oe_screenshot">
-                    <img style="border:10px solid white;" src="ohrms_vacation_02.png">
-                </div>
-            </a>
-        </div>
-
-        <div style="text-align: center">
-            <p class="oe_mt32">
-                On leave request approval it opens a wizard to re-assign tasks to available employees.
-            </p>
-            <a href="https://www.cybrosys.com">
-                <div class="oe_demo oe_picture oe_screenshot">
-                    <img style="border:10px solid white;" src="ohrms_vacation_03.png">
-                </div>
-            </a>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-        <div style="text-align: center">
-            <p><h4 class="oe_slogan">Flight Ticket Booking</h4><p>
-        </div>
-        <div style="text-align: center">
-            <p class="oe_mt32">
-                HR managers can able to book the flight ticket for the employee.
-            </p>
-            <a href="https://www.cybrosys.com">
-                <div class="oe_demo oe_picture oe_screenshot">
-                    <img style="border:10px solid white;" src="ohrms_vacation_04.png">
-                </div>
-            </a>
-        </div>
-        <div style="text-align: center">
-            <a href="https://www.cybrosys.com">
-                <div class="oe_demo oe_picture oe_screenshot">
-                    <img style="border:10px solid white;" src="ohrms_vacation_05.png">
-                </div>
-            </a>
-        </div>
-        <div style="text-align: center">
-            <a href="https://www.cybrosys.com">
-                <div class="oe_demo oe_picture oe_screenshot">
-                    <img style="border:10px solid white;" src="ohrms_vacation_06.png">
-                </div>
-            </a>
-        </div>
-        <div style="text-align: center">
-            <a href="https://www.cybrosys.com">
-                <div class="oe_demo oe_picture oe_screenshot">
-                    <img style="border:10px solid white;" src="ohrms_vacation_07.png">
-                </div>
-            </a>
-        </div>
-        <div style="text-align: center">
-            <p class="oe_mt32">
-                On confirming the flight ticket generate corresponding supplier invoice.
-            </p>
-            <a href="https://www.cybrosys.com">
-                <div class="oe_demo oe_picture oe_screenshot">
-                    <img style="border:10px solid white;" src="ohrms_vacation_08.png">
-                </div>
-            </a>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-        <div style="text-align: center">
-            <p><h4 class="oe_slogan">Leave Salary</h4><p>
-        </div>
-        <div style="text-align: center">
-            <a href="https://www.cybrosys.com">
-                <div class="oe_demo oe_picture oe_screenshot">
-                    <img style="border:10px solid white;" src="ohrms_vacation_09.png">
-                </div>
-            </a>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-        <div style="text-align: center">
-            <p><h4 class="oe_slogan">Configurations</h4><p>
-        </div>
-        <div style="text-align: center">
-            <a href="https://www.cybrosys.com">
-                <div class="oe_demo oe_picture oe_screenshot">
-                    <img style="border:10px solid white;" src="ohrms_vacation_10.png">
-                </div>
-            </a>
-        </div>
-        <div style="text-align: center">
-            <a href="https://www.cybrosys.com">
-                <div class="oe_demo oe_picture oe_screenshot">
-                    <img style="border:10px solid white;" src="ohrms_vacation_11.png">
-                </div>
-            </a>
-        </div>
-    </div>
-</section>
-
-<div class="row section-content">
-    <div class="col-md-6 img-content">
-        <h3>Our Odoo Services</h3>
-    </div>
-    <div class="bc-span col-md-12"><div class="inner-span">
-        <a target="_blank" href="https://www.openhrms.com"><img class="img-border img-responsive thumbnail" src="cybro-service.png"></a>
-    </div></div>
-</div>
-
-</div>
-
-<section class="oe_container oe_dark">
-    <h2 class="oe_slogan" style="margin-top:20px;" >Need Any Help?</h2>
-    <div class="oe_slogan" style="margin-top:10px !important;">
-        <div>
-            <a  class="btn btn-primary btn-lg mt8"
-            style="color: #FFFFFF !important;border-radius: 0;" href="https://www.cybrosys.com"><i
-            class="fa fa-envelope"></i> Email </a> <a
-            class="btn btn-primary btn-lg mt8" style="color: #FFFFFF !important;border-radius: 0;"
-            href="https://www.cybrosys.com/contact/"><i
-            class="fa fa-phone"></i> Contact Us </a> <a
-            class="btn btn-primary btn-lg mt8" style="color: #FFFFFF !important;border-radius: 0;"
-            href="https://www.cybrosys.com/odoo-customization-and-installation/"><i
-            class="fa fa-check-square"></i> Request Customization </a>
-        </div>
-        <br>
-        <img src="cybro_logo.png" style="width: 190px; margin-bottom: 20px;" class="center-block">
-    </div>
-</section>
-
diff --git a/hr_vacation_mngmt/static/description/ohrms_vacation_01.png b/hr_vacation_mngmt/static/description/ohrms_vacation_01.png
deleted file mode 100644
index e0c3b2065..000000000
Binary files a/hr_vacation_mngmt/static/description/ohrms_vacation_01.png and /dev/null differ
diff --git a/hr_vacation_mngmt/static/description/ohrms_vacation_02.png b/hr_vacation_mngmt/static/description/ohrms_vacation_02.png
deleted file mode 100644
index f5fd72e74..000000000
Binary files a/hr_vacation_mngmt/static/description/ohrms_vacation_02.png and /dev/null differ
diff --git a/hr_vacation_mngmt/static/description/ohrms_vacation_03.png b/hr_vacation_mngmt/static/description/ohrms_vacation_03.png
deleted file mode 100644
index b70b7530c..000000000
Binary files a/hr_vacation_mngmt/static/description/ohrms_vacation_03.png and /dev/null differ
diff --git a/hr_vacation_mngmt/static/description/ohrms_vacation_04.png b/hr_vacation_mngmt/static/description/ohrms_vacation_04.png
deleted file mode 100644
index ee4a82ced..000000000
Binary files a/hr_vacation_mngmt/static/description/ohrms_vacation_04.png and /dev/null differ
diff --git a/hr_vacation_mngmt/static/description/ohrms_vacation_05.png b/hr_vacation_mngmt/static/description/ohrms_vacation_05.png
deleted file mode 100644
index 74ece7ff9..000000000
Binary files a/hr_vacation_mngmt/static/description/ohrms_vacation_05.png and /dev/null differ
diff --git a/hr_vacation_mngmt/static/description/ohrms_vacation_06.png b/hr_vacation_mngmt/static/description/ohrms_vacation_06.png
deleted file mode 100644
index 96660682b..000000000
Binary files a/hr_vacation_mngmt/static/description/ohrms_vacation_06.png and /dev/null differ
diff --git a/hr_vacation_mngmt/static/description/ohrms_vacation_07.png b/hr_vacation_mngmt/static/description/ohrms_vacation_07.png
deleted file mode 100644
index b43c12347..000000000
Binary files a/hr_vacation_mngmt/static/description/ohrms_vacation_07.png and /dev/null differ
diff --git a/hr_vacation_mngmt/static/description/ohrms_vacation_08.png b/hr_vacation_mngmt/static/description/ohrms_vacation_08.png
deleted file mode 100644
index c190c4950..000000000
Binary files a/hr_vacation_mngmt/static/description/ohrms_vacation_08.png and /dev/null differ
diff --git a/hr_vacation_mngmt/static/description/ohrms_vacation_09.png b/hr_vacation_mngmt/static/description/ohrms_vacation_09.png
deleted file mode 100644
index 84221ab4b..000000000
Binary files a/hr_vacation_mngmt/static/description/ohrms_vacation_09.png and /dev/null differ
diff --git a/hr_vacation_mngmt/static/description/ohrms_vacation_10.png b/hr_vacation_mngmt/static/description/ohrms_vacation_10.png
deleted file mode 100644
index 29079dca1..000000000
Binary files a/hr_vacation_mngmt/static/description/ohrms_vacation_10.png and /dev/null differ
diff --git a/hr_vacation_mngmt/static/description/ohrms_vacation_11.png b/hr_vacation_mngmt/static/description/ohrms_vacation_11.png
deleted file mode 100644
index ad6004e62..000000000
Binary files a/hr_vacation_mngmt/static/description/ohrms_vacation_11.png and /dev/null differ
diff --git a/hr_vacation_mngmt/views/hr_employee_ticket.xml b/hr_vacation_mngmt/views/hr_employee_ticket.xml
deleted file mode 100644
index b845df735..000000000
--- a/hr_vacation_mngmt/views/hr_employee_ticket.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <record id="view_hr_flight_ticket_form" model="ir.ui.view">
-            <field name="name">hr.flight.ticket.form</field>
-            <field name="model">hr.flight.ticket</field>
-            <field name="priority" eval="0"/>
-            <field name="arch" type="xml">
-                <form string="Flight Ticket" create="0">
-                    <header>
-                        <button name="confirm_ticket" states="booked" string="Confirm" type="object" class="oe_highlight"/>
-                        <button name="cancel_ticket" string="Cancel" type="object" states="booked,confirmed"/>
-                        <field name="state" widget="statusbar"
-                               statusbar_visible="booked,confirmed,started,completed"/>
-                    </header>
-                    <sheet>
-                    <div class="oe_button_box" name="button_box">
-                        <button name="action_view_invoice"
-                            string="Invoice"
-                            type="object"
-                            class="oe_stat_button"
-                            icon="fa-pencil-square-o"
-                            attrs="{'invisible':[('invoice_id','=', False)]}">
-                        </button>
-                        <field name="invoice_id" invisible="1"/>
-                    </div>
-                    <div class="oe_title">
-                        <h1><field name="display_name"/></h1>
-                    </div>
-                    <group>
-                        <group>
-                            <field name="employee_id" attrs="{'readonly': [('state','in',('confirmed','started','completed'))]}"/>
-                            <field name="depart_from" attrs="{'readonly': [('state','in',('confirmed','started','completed'))]}"/>
-                            <field name="date_start" attrs="{'readonly': [('state','in',('confirmed','started','completed'))]}"/>
-                            <field name="ticket_class" attrs="{'readonly': [('state','in',('confirmed','started','completed'))]}"/>
-                            <field name="flight_details" attrs="{'readonly': [('state','=','completed')]}"/>
-                            <field name="company_id" invisible="1"/>
-                        </group>
-                        <group>
-                            <field name="ticket_type" attrs="{'readonly': [('state','in',('confirmed','started','completed'))]}"/>
-                            <field name="destination" attrs="{'readonly': [('state','in',('confirmed','started','completed'))]}"/>
-                            <field name="date_return" attrs="{'readonly': [('state','in',('confirmed','started','completed'))]}"/>
-                            <field name="ticket_fare" attrs="{'readonly': [('state','in',('confirmed','started','completed'))]}"/>
-                            <field name="leave_id" invisible="1"/>
-                            <field name="return_flight_details"
-                                   attrs="{'readonly': [('state','=','completed')],
-                                   'invisible':[('ticket_type', '=', 'one')]}"/>
-                        </group>
-                    </group>
-                    </sheet>
-               </form>
-            </field>
-        </record>
-
-        <record id="view_hr_flight_ticket_tree" model="ir.ui.view">
-            <field name="name">hr.flight.ticket.form</field>
-            <field name="model">hr.flight.ticket</field>
-            <field name="priority" eval="1"/>
-            <field name="arch" type="xml">
-                <tree string="Flight Ticket" create="0">
-                    <field name="employee_id"/>
-                    <field name="date_start"/>
-                    <field name="date_return"/>
-                    <field name="ticket_type"/>
-                    <field name="state"/>
-               </tree>
-            </field>
-        </record>
-
-        <record id="view_hr_book_flight_ticket_form" model="ir.ui.view">
-            <field name="name">hr.flight.ticket.form</field>
-            <field name="model">hr.flight.ticket</field>
-            <field name="priority" eval="2"/>
-            <field name="arch" type="xml">
-                <form string="Flight Ticket" create="0">
-                    <div class="oe_title">
-                        <h1><field name="name" readonly="1"/></h1>
-                    </div>
-                    <group>
-                        <group>
-                            <field name="employee_id" readonly="1"/>
-                            <field name="depart_from"/>
-                            <field name="date_start"/>
-                            <field name="ticket_class"/>
-                        </group>
-                        <group>
-                            <field name="ticket_type"/>
-                            <field name="destination"/>
-                            <field name="date_return"/>
-                            <field name="leave_id" invisible="1"/>
-                        </group>
-                    </group>
-                    <footer>
-                        <button name="book_ticket" type="object" string="Book Ticket" class="btn-primary"/>
-                        <button string="Cancel" class="btn-default" special="cancel"/>
-                    </footer>
-               </form>
-            </field>
-        </record>
-
-        <record id="action_hr_flight_tickets" model="ir.actions.act_window">
-            <field name="name">Flight Tickets</field>
-            <field name="res_model">hr.flight.ticket</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_type">form</field>
-            <field name="help" type="html">
-            <p class="oe_view_nocontent_create">
-            There is no previously booked flight ticket details available.
-            </p>
-            </field>
-        </record>
-
-        <menuitem
-            id="menu_hr_flight_tickets"
-            name="Flight Tickets"
-            parent="hr_holidays.menu_hr_holidays_root"
-            action="action_hr_flight_tickets"
-            groups="hr_holidays.group_hr_holidays_manager"
-            sequence="5"/>
-    </data>
-</odoo>
\ No newline at end of file
diff --git a/hr_vacation_mngmt/views/hr_payslip.xml b/hr_vacation_mngmt/views/hr_payslip.xml
deleted file mode 100644
index 3a458b5dd..000000000
--- a/hr_vacation_mngmt/views/hr_payslip.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <record model="ir.ui.view" id="view_hr_payslip_leave_salary_form">
-            <field name="name">hr.payslip.form</field>
-            <field name="model">hr.payslip</field>
-            <field name="inherit_id" ref="hr_payroll.view_hr_payslip_form"/>
-            <field name="arch" type="xml">
-                <field name="credit_note" position="after">
-                    <field name="leave_salary" attrs="{'readonly': [('state','=', 'done')]}"/>
-                </field>
-            </field>
-        </record>
-
-        <record id="view_hr_payroll_leave_sal" model="ir.ui.view">
-            <field name="name">Configure Payroll</field>
-            <field name="model">hr.payroll.config.settings</field>
-            <field name="inherit_id" ref="hr_payroll.view_hr_payroll_configuration"/>
-            <field name="arch" type="xml">
-                <xpath expr="//group" position="inside">
-                    <field name="default_leave_salary" widget="radio"/>
-                </xpath>
-            </field>
-        </record>
-    </data>
-</odoo>
\ No newline at end of file
diff --git a/hr_vacation_mngmt/views/hr_reminder.xml b/hr_vacation_mngmt/views/hr_reminder.xml
deleted file mode 100644
index eeb7614e2..000000000
--- a/hr_vacation_mngmt/views/hr_reminder.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <record id="email_template_hr_leave_reminder_mail" model="mail.template">
-            <field name="name">Leave : Reminder</field>
-            <field name="model_id" ref="hr_holidays.model_hr_holidays"/>
-            <field name="auto_delete" eval="True"/>
-            <field name="email_from">${object.employee_id.company_id.email}</field>
-            <field name="subject">Reminder: ${object.display_name}</field>
-            <field name="body_html"><![CDATA[
-<p>Hello ,</p>
-<p>The employee <strong>${object.employee_id.name}</strong> has taken <strong>${object.no_of_days_temp}</strong> days leave starting from <strong>${object.date_from}</strong> to <strong>${object.date_to}</strong>.</p>
-
-<p>Kindly do the needful.</p>
-
-</p><p>Thank you!</p>
-]]></field>
-        </record>
-    </data>
-</odoo>
\ No newline at end of file
diff --git a/hr_vacation_mngmt/views/hr_vacation.xml b/hr_vacation_mngmt/views/hr_vacation.xml
deleted file mode 100644
index 6aa01cff0..000000000
--- a/hr_vacation_mngmt/views/hr_vacation.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <record id="hr_vacation_form_view" model="ir.ui.view">
-            <field name="name">Leave Request</field>
-            <field name="model">hr.holidays</field>
-            <field name="inherit_id" ref="hr_holidays.edit_holiday_new"/>
-            <field name="arch" type="xml">
-                <xpath expr="//div[@class='oe_title']" position="before">
-                    <div class="oe_button_box" name="button_box">
-                        <button type="object" icon="fa-pencil-square-o" name="view_flight_ticket"
-                                string="Flight Ticket" class="oe_stat_button"
-                                attrs="{'invisible': [('flight_ticket','=', [])]}"
-                                groups="hr_holidays.group_hr_holidays_manager">
-                        </button>
-                    </div>
-                </xpath>
-                <button name="action_draft" position="after">
-                    <button string="Book Flight Ticket" name="book_ticket" type="object"
-                            groups="hr_holidays.group_hr_holidays_manager" class="oe_highlight"
-                            attrs="{'invisible': ['|', '|', ('type','=','add'),('state','!=','validate'), ('flight_ticket','!=',[])]}"/>
-                </button>
-                <field name="employee_id" position="after">
-                    <field name="remaining_leaves" attrs="{'invisible': [('state','in',('validate', 'refuse'))]}"
-                           readonly="1" groups="hr_holidays.group_hr_holidays_user,hr_holidays.group_hr_holidays_manager"/>
-                    <field name="flight_ticket" invisible="1"/>
-                </field>
-                <xpath expr="//sheet" position="inside">
-                    <notebook attrs="{'invisible': [('type','=','add')], 'readonly': [('state','in',('validate', 'refuse'))]}">
-                        <page string="Pending Works">
-                            <field name="pending_tasks" widget="one2many_list" attrs="{'readonly': [('state','in',('validate', 'validate1','refuse'))]}">
-                                <tree editable="bottom">
-                                    <field name="name"/>
-                                    <field name="project_id"/>
-                                    <field name="description"/>
-                                    <field name="leave_id" invisible="1"/>
-                                    <field name="dept_id" invisible="1"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="Overlapping Leaves"
-                              attrs="{'invisible': ['|',('state','in',('validate', 'refuse')),('overlapping_leaves','=',[])]}"
-                              groups="hr_holidays.group_hr_holidays_manager,hr_holidays.group_hr_holidays_user">
-                            <field name="overlapping_leaves"/>
-                        </page>
-                    </notebook>
-                </xpath>
-            </field>
-        </record>
-
-        <record id="view_pending_task" model="ir.ui.view">
-            <field name="name">pending.task.form</field>
-            <field name="model">pending.task</field>
-            <field name="arch" type="xml">
-                <form string="Pending Tasks">
-                    <group>
-                        <group>
-                            <field name="name"/>
-                            <field name="leave_id"/>
-                            <field name="project_id"/>
-                        </group>
-                        <group>
-                            <field name="dept_id"/>
-                            <field name="assigned_to" groups="hr_holidays.group_hr_holidays_manager,hr_holidays.group_hr_holidays_user"/>
-                            <field name="unavailable_employee" widget="many2many_tags"
-                                   groups="hr_holidays.group_hr_holidays_manager,hr_holidays.group_hr_holidays_user"/>
-                        </group>
-                        <group colspan="4">
-                            <field name="description"/>
-                        </group>
-                    </group>
-               </form>
-            </field>
-        </record>
-
-        <record id="view_hr_vacation_configuration" model="ir.ui.view">
-            <field name="name">Configure Leave</field>
-            <field name="model">hr.leave.config.settings</field>
-            <field name="inherit_id" ref="hr_leave_request_aliasing.view_hr_leave_configuration"/>
-            <field name="arch" type="xml">
-                <xpath expr="//group[@name='config_alias']" position="inside">
-                    <field name="leave_reminder"/>
-                    <field name="reminder_day_before"/>
-                    <field name="default_expense_account"/>
-                </xpath>
-            </field>
-        </record>
-    </data>
-</odoo>
\ No newline at end of file
diff --git a/hr_vacation_mngmt/wizard/__init__.py b/hr_vacation_mngmt/wizard/__init__.py
deleted file mode 100644
index 14c06bcd4..000000000
--- a/hr_vacation_mngmt/wizard/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from . import reassign_task
diff --git a/hr_vacation_mngmt/wizard/reassign_task.py b/hr_vacation_mngmt/wizard/reassign_task.py
deleted file mode 100644
index f3f70e003..000000000
--- a/hr_vacation_mngmt/wizard/reassign_task.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from odoo import models, fields, api, _
-from odoo.exceptions import UserError
-
-
-class ReAssignTask(models.TransientModel):
-    _name = 'task.reassign'
-
-    pending_tasks = fields.One2many('pending.task', related='leave_req_id.pending_tasks', string='Pending Tasks')
-    leave_req_id = fields.Many2one('hr.holidays', string='Leave Request')
-
-    @api.multi
-    def action_approve(self):
-        task_pending = False
-        e_unavail = False
-        emp_unavail = []
-        for task in self.pending_tasks:
-            if not task.assigned_to:
-                task_pending = True
-        if task_pending:
-            raise UserError(_('Please assign pending task to employees.'))
-        else:
-            for task in self.pending_tasks:
-                if task.assigned_to in task.unavailable_employee:
-                    emp_unavail.append(task.assigned_to.name)
-                    e_unavail = True
-            emp_unavail = set(emp_unavail)
-            emp_unavail_count = len(emp_unavail)
-            if e_unavail:
-                if emp_unavail_count == 1:
-                    raise UserError(_('Selected employee %s is not available') % (', '.join(emp_unavail),))
-                else:
-                    raise UserError(_('Selected employees %s are not available') % (', '.join(emp_unavail),))
-
-            else:
-                manager = self.env['hr.employee'].search([('user_id', '=', self.env.uid)], limit=1)
-                holiday = self.leave_req_id
-                tasks = self.env['project.task']
-                for task in self.pending_tasks:
-                    if not task.assigned_to.user_id:
-                        raise UserError(_('Please configure user for the employee %s') % (task.assigned_to.name,))
-                    vals = {
-                        'name': task.name,
-                        'user_id': task.assigned_to.user_id.id,
-                        'project_id': task.project_id.id,
-                        'description': task.description,
-                    }
-                    tasks.sudo().create(vals)
-                if holiday.double_validation:
-                    return holiday.write({'state': 'validate1', 'manager_id': manager.id if manager else False})
-                else:
-                    holiday.action_validate()
-
-    @api.multi
-    def cancel(self):
-        for task in self.pending_tasks:
-            task.update({'assigned_to': False})
-        return {'type': 'ir.actions.act_window_close'}
diff --git a/hr_vacation_mngmt/wizard/reassign_task.xml b/hr_vacation_mngmt/wizard/reassign_task.xml
deleted file mode 100644
index 8625127c5..000000000
--- a/hr_vacation_mngmt/wizard/reassign_task.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <record id="reassign_task_form" model="ir.ui.view">
-            <field name="name">Re-Assign Task</field>
-            <field name="model">task.reassign</field>
-            <field name="arch" type="xml">
-                <form>
-                    <h3>Confirm leave request and reassign pending works of the employee.</h3>
-                    <group>
-                        <field name="leave_req_id" invisible="1"/>
-                        <field name="pending_tasks" widget="one2many_list">
-                            <tree create="0" delete="0" editable="bottom">
-                                <field name="name" readonly="1"/>
-                                <field name="project_id" readonly="1"/>
-                                <field name="assigned_to"/>
-                                <field name="leave_id" invisible="1"/>
-                                <field name="dept_id" invisible="1"/>
-                                <field name="unavailable_employee" invisible="1"/>
-                            </tree>
-                        </field>
-                    </group>
-                    <footer>
-                        <button string="Confirm" name="action_approve" type="object" class="btn-primary"/>
-                        <button string="Cancel" type="object" name="cancel" class="oe_link"/>
-                    </footer>
-                </form>
-            </field>
-        </record>
-    </data>
-</odoo>
\ No newline at end of file
diff --git a/oh_appraisal/README.rst b/oh_appraisal/README.rst
deleted file mode 100644
index 5c119f2c2..000000000
--- a/oh_appraisal/README.rst
+++ /dev/null
@@ -1,43 +0,0 @@
-OHRMS Employee Appraisal v10
-============================
-
-Roll out appraisal plans and get the best of your workforce
-
-Depends
-=======
-[hr] addon Odoo
-
-Tech
-====
-* [Python] - Models
-* [XML] - Odoo views
-
-Installation
-============
-- www.odoo.com/documentation/10.0/setup/install.html
-- Install our custom addon
-
-License
-=======
-GNU AFFERO GENERAL PUBLIC LICENSE, Version 3 (AGPLv3)
-(http://www.gnu.org/licenses/agpl.html)
-
-Bug Tracker
-===========
-Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported.
-
-Credits
-=======
-* Cybrosys Techno Solutions <https://www.cybrosys.com>
-
-Author
-------
-
-Developer: Saritha Sahadevan, saritha@cybrosys.in
-
-Maintainer
-----------
-
-This module is maintained by Cybrosys Technologies.
-
-For support and more information, please visit https://www.cybrosys.com.
diff --git a/oh_appraisal/RELEASE_NOTES.md b/oh_appraisal/RELEASE_NOTES.md
deleted file mode 100644
index fb68f61a8..000000000
--- a/oh_appraisal/RELEASE_NOTES.md
+++ /dev/null
@@ -1,6 +0,0 @@
-## Module oh_appraisal
-
-#### 30.03.2018
-#### Version 10.0.1.0.0
-##### ADD
-- Initial commit for OpenHrms Project
diff --git a/oh_appraisal/__init__.py b/oh_appraisal/__init__.py
deleted file mode 100644
index 7cacd9c23..000000000
--- a/oh_appraisal/__init__.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHrms Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Saritha Sahadevan (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from . import models
diff --git a/oh_appraisal/__manifest__.py b/oh_appraisal/__manifest__.py
deleted file mode 100644
index e5f629ce0..000000000
--- a/oh_appraisal/__manifest__.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of Open Hrms Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Saritha Sahadevan (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-{
-    'name': "Open HRMS Employee Appraisal",
-    'version': '10.0.1.2.0',
-    'summary': """Roll out appraisal plans and get the best of your workforce""",
-    'description': """Roll out appraisal plans and get the best of your workforce""",
-    'category': 'Human Resources',
-    'author': 'Cybrosys Techno Solutions',
-    'company': 'Cybrosys Techno Solutions',
-    'maintainer': 'Cybrosys Techno Solutions',
-    'website': "https://www.openhrms.com",
-    'depends': ['hr', 'survey'],
-    'data': [
-        'security/ir.model.access.csv',
-        'security/hr_appraisal_security.xml',
-        'views/hr_appraisal_survey_views.xml',
-        'views/hr_appraisal_form_view.xml',
-        'data/hr_appraisal_stages.xml'
-    ],
-    'images': ["static/description/banner.jpg"],
-    'license': "AGPL-3",
-    'installable': True,
-    'application': False,
-}
diff --git a/oh_appraisal/data/hr_appraisal_stages.xml b/oh_appraisal/data/hr_appraisal_stages.xml
deleted file mode 100644
index c5a986e30..000000000
--- a/oh_appraisal/data/hr_appraisal_stages.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <record id="hr_appraisal_start" model="hr.appraisal.stages">
-            <field name="name">To Start</field>
-            <field name="sequence">1</field>
-        </record>
-
-        <record id="hr_appraisal_sent" model="hr.appraisal.stages">
-            <field name="name">Sent Mail</field>
-            <field name="sequence">2</field>
-        </record>
-
-        <record id="hr_appraisal_done" model="hr.appraisal.stages">
-            <field name="name">Done</field>
-            <field name="sequence">3</field>
-        </record>
-
-        <record id="hr_appraisal_cancel" model="hr.appraisal.stages">
-            <field name="name">Cancel</field>
-            <field name="sequence">4</field>
-        </record>
-    </data>
-</odoo>
diff --git a/oh_appraisal/models/__init__.py b/oh_appraisal/models/__init__.py
deleted file mode 100644
index 9f5c4f07f..000000000
--- a/oh_appraisal/models/__init__.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHrms Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Saritha Sahadevan (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from . import hr_appraisal_survey, hr_appraisal_form
diff --git a/oh_appraisal/models/hr_appraisal_form.py b/oh_appraisal/models/hr_appraisal_form.py
deleted file mode 100644
index 23d10fbc1..000000000
--- a/oh_appraisal/models/hr_appraisal_form.py
+++ /dev/null
@@ -1,192 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHrms Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Saritha Sahadevan (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from odoo import models, fields, api, SUPERUSER_ID
-
-
-class HrAppraisalForm(models.Model):
-    _name = 'hr.appraisal'
-    _inherit = 'mail.thread'
-    _rec_name = 'emp_id'
-    _description = 'Appraisal'
-
-    @api.model
-    def _read_group_stage_ids(self, categories, domain, order):
-        """ Read all the stages and display it in the kanban view, even if it is empty."""
-        category_ids = categories._search([], order=order, access_rights_uid=SUPERUSER_ID)
-        return categories.browse(category_ids)
-
-    def _default_stage_id(self):
-        """Setting default stage"""
-        rec = self.env['hr.appraisal.stages'].search([], limit=1, order='sequence ASC')
-        return rec.id if rec else None
-
-    emp_id = fields.Many2one('hr.employee', string="Employee", required=True)
-    appraisal_deadline = fields.Date(string="Appraisal Deadline", required=True)
-    final_interview = fields.Date(string="Final Interview")
-    company_id = fields.Many2one('res.company', string='Company', default=lambda self: self.env.user.company_id)
-    hr_manager = fields.Boolean(string="Manager", default=False)
-    hr_emp = fields.Boolean(string="Employee", default=False)
-    hr_colloborator = fields.Boolean(string="Collaborators", default=False)
-    hr_colleague = fields.Boolean(string="Colleague", default=False)
-    hr_manager_id = fields.Many2many('hr.employee', 'manager_appraisal_rel', string="Select Appraisal Reviewer")
-    hr_colleague_id = fields.Many2many('hr.employee', 'colleagues_appraisal_rel',
-                                       string="Select Appraisal Reviewer")
-    hr_colloborator_id = fields.Many2many('hr.employee', 'colloborators_appraisal_rel',
-                                          string="Select Appraisal Reviewer")
-    manager_survey_id = fields.Many2one('survey.survey', string="Select Opinion Form")
-    emp_survey_id = fields.Many2one('survey.survey', string="Select Appraisal Form")
-    colloborator_survey_id = fields.Many2one('survey.survey', string="Select Opinion Form")
-    colleague_survey_id = fields.Many2one('survey.survey', string="Select Opinion Form")
-    response_id = fields.Many2one('survey.user_input', "Response", ondelete="set null", oldname="response")
-    final_evaluation = fields.Text(string="Final Evaluation")
-    app_period_from = fields.Date("From", required=True, readonly=True, default=fields.Datetime.now())
-    tot_comp_survey = fields.Integer(string="Count Answers", compute="_compute_completed_survey")
-    tot_sent_survey = fields.Integer(string="Count Sent Questions")
-    created_by = fields.Many2one('res.users', string="Created By", default=lambda self: self.env.uid)
-    state = fields.Many2one('hr.appraisal.stages', string='Stage', track_visibility='onchange', index=True,
-                            default=lambda self: self._default_stage_id(),
-                            group_expand='_read_group_stage_ids')
-    # for coloring the kanban box
-    color = fields.Integer(string="Color Index")
-    check_sent = fields.Boolean(string="Check Sent Mail", default=False, copy=False)
-    check_draft = fields.Boolean(string="Check Draft", default=True, copy=False)
-    check_cancel = fields.Boolean(string="Check Cancel", default=False, copy=False)
-    check_done = fields.Boolean(string="Check Done", default=False, copy=False)
-
-    @api.multi
-    def action_done(self):
-        rec = self.env['hr.appraisal.stages'].search([('sequence', '=', 3)])
-        self.state = rec.id
-        self.check_done = True
-        self.check_draft = False
-
-    @api.multi
-    def action_set_draft(self):
-        rec = self.env['hr.appraisal.stages'].search([('sequence', '=', 1)])
-        self.state = rec.id
-        self.check_draft = True
-        self.check_sent = False
-
-    @api.multi
-    def action_cancel(self):
-        rec = self.env['hr.appraisal.stages'].search([('sequence', '=', 4)])
-        self.state = rec.id
-        self.check_cancel = True
-        self.check_draft = False
-
-    @api.multi
-    def fetch_appraisal_reviewer(self):
-        appraisal_reviewers = []
-        if self.hr_manager and self.hr_manager_id and self.manager_survey_id:
-            appraisal_reviewers.append((self.hr_manager_id, self.manager_survey_id))
-        if self.hr_emp and self.emp_survey_id:
-            appraisal_reviewers.append((self.emp_id, self.emp_survey_id))
-        if self.hr_colloborator and self.hr_colloborator_id and self.colloborator_survey_id:
-            appraisal_reviewers.append((self.hr_colloborator_id, self.colloborator_survey_id))
-        if self.hr_colleague and self.hr_colleague_id and self.colleague_survey_id:
-            appraisal_reviewers.append((self.hr_colleague_id, self.colleague_survey_id))
-        return appraisal_reviewers
-
-    @api.multi
-    def action_start_appraisal(self):
-        """ This function will start the appraisal by sending emails to the corresponding employees
-            specified in the appraisal"""
-        send_count = 0
-        appraisal_reviewers_list = self.fetch_appraisal_reviewer()
-        for appraisal_reviewers, survey_id in appraisal_reviewers_list:
-            for reviewers in appraisal_reviewers:
-                url = survey_id.public_url
-                response = self.env['survey.user_input'].create(
-                    {'survey_id': survey_id.id, 'partner_id': reviewers.user_id.partner_id.id,
-                     'appraisal_id': self.ids[0],  'deadline': self.appraisal_deadline, 'email': reviewers.user_id.email})
-                token = response.token
-                if token:
-                    url = url + '/' + token
-                    mail_content = "Dear " + reviewers.name + "," + "<br>Please fill out the following survey " \
-                                   "related to " + self.emp_id.name + "<br>Click here to access the survey.<br>" + \
-                                   str(url) + "<br>Post your response for the appraisal till : " + str(self.appraisal_deadline)
-                    values = {'model': 'hr.appraisal',
-                              'res_id': self.ids[0],
-                              'subject': survey_id.title,
-                              'body_html': mail_content,
-                              'parent_id': None,
-                              'email_from': self.env.user.email or None,
-                              'auto_delete': True,
-                             }
-                    values['email_to'] = reviewers.work_email
-                    result = self.env['mail.mail'].create(values).send()
-                    if result is True:
-                        send_count += 1
-                        self.write({'tot_sent_survey': send_count})
-                        rec = self.env['hr.appraisal.stages'].search([('sequence', '=', 2)])
-                        self.state = rec.id
-                        self.check_sent = True
-                        self.check_draft = False
-
-        if self.hr_emp and self.emp_survey_id:
-            self.ensure_one()
-            if not self.response_id:
-                response = self.env['survey.user_input'].create(
-                    {'survey_id': self.emp_survey_id.id, 'partner_id': self.emp_id.user_id.partner_id.id,
-                     'appraisal_id': self.ids[0], 'deadline': self.appraisal_deadline, 'email': reviewers.user_id.email})
-                self.response_id = response.id
-            else:
-                response = self.response_id
-            return self.emp_survey_id.with_context(survey_token=response.token).action_start_survey()
-
-    @api.multi
-    def action_get_answers(self):
-        """ This function will return all the answers posted related to this appraisal."""
-
-        tree_res = self.env['ir.model.data'].get_object_reference('survey', 'survey_user_input_tree')
-        tree_id = tree_res and tree_res[1] or False
-        form_res = self.env['ir.model.data'].get_object_reference('survey', 'survey_user_input_form')
-        form_id = form_res and form_res[1] or False
-        return {
-            'model': 'ir.actions.act_window',
-            'name': 'Answers',
-            'type': 'ir.actions.act_window',
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'survey.user_input',
-            'views': [(tree_id, 'tree'), (form_id, 'form')],
-            'domain': [('state', '=', 'done'), ('appraisal_id', '=', self.ids[0])],
-
-        }
-
-    @api.one
-    def _compute_completed_survey(self):
-
-        answers = self.env['survey.user_input'].search([('state', '=', 'done'), ('appraisal_id', '=', self.ids[0])])
-        self.tot_comp_survey = len(answers)
-
-
-class AppraisalStages(models.Model):
-    _name = 'hr.appraisal.stages'
-    _description = 'Appraisal Stages'
-
-    name = fields.Char(string="Name")
-    sequence = fields.Integer(string="Sequence")
-    fold = fields.Boolean(string='Folded in Appraisal Pipeline',
-                          help='This stage is folded in the kanban view when '
-                               'there are no records in that stage to display.')
diff --git a/oh_appraisal/models/hr_appraisal_survey.py b/oh_appraisal/models/hr_appraisal_survey.py
deleted file mode 100644
index a5a4adb74..000000000
--- a/oh_appraisal/models/hr_appraisal_survey.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHrms Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Saritha Sahadevan (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from odoo import models, fields
-
-
-class SurveyInput(models.Model):
-    _inherit = 'survey.user_input'
-
-    appraisal_id = fields.Many2one('hr.appraisal', string="Appriasal id")
diff --git a/oh_appraisal/security/hr_appraisal_security.xml b/oh_appraisal/security/hr_appraisal_security.xml
deleted file mode 100644
index 5f2121589..000000000
--- a/oh_appraisal/security/hr_appraisal_security.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" ?>
-<odoo>
-    <record id="property_rule_hr_appraisal" model="ir.rule">
-        <field name="name">Hr Appraisal Multi Company</field>
-        <field name="model_id" ref="model_hr_appraisal"/>
-        <field eval="True" name="global"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-    </record>
-
-    <record model="ir.module.category" id="module_category_hr_appraisal">
-        <field name="name">Appraisal</field>
-        <field name="description">Helps to evaluate employees...</field>
-        <field name="sequence">3</field>
-    </record>
-
-    <record id="group_appraisal_employee" model="res.groups">
-        <field name="name">Employee</field>
-        <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
-        <field name="category_id" ref="oh_appraisal.module_category_hr_appraisal"/>
-    </record>
-
-    <record id="group_appraisal_manager" model="res.groups">
-        <field name="name">Manager</field>
-        <field name="category_id" ref="oh_appraisal.module_category_hr_appraisal"/>
-        <field name="implied_ids" eval="[(4, ref('group_appraisal_employee'))]"/>
-        <field name="users" eval="[(4, ref('base.user_root'))]"/>
-    </record>
-
-    <record id="hr_appraisal_rule" model="ir.rule">
-        <field name="name">Appraisal Forms</field>
-        <field name="domain_force">[('created_by','=',user.id)]</field>
-        <field name="global" eval="True"/>
-        <field name="model_id" ref="oh_appraisal.model_hr_appraisal"/>
-        <field name="groups" eval="[(4,ref('oh_appraisal.group_appraisal_employee'))]"/>
-        <field name="perm_write" eval="True"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_create" eval="True"/>
-        <field name="perm_unlink" eval="True"/>
-    </record>
-
-    <record id="hr_appraisal_manager_rule" model="ir.rule">
-        <field name="name">Appraisal Forms</field>
-        <field name="global" eval="True"/>
-        <field name="model_id" ref="oh_appraisal.model_hr_appraisal"/>
-        <field name="groups" eval="[(4,ref('oh_appraisal.group_appraisal_manager'))]"/>
-        <field name="perm_write" eval="True"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_create" eval="True"/>
-        <field name="perm_unlink" eval="True"/>
-    </record>
-
-    <record id="survey.survey_input_users_access" model="ir.rule">
-        <field name="domain_force">[('partner_id', '=', user.partner_id.id)]</field>
-    </record>
-
-</odoo>
diff --git a/oh_appraisal/security/ir.model.access.csv b/oh_appraisal/security/ir.model.access.csv
deleted file mode 100644
index 1b64fc76c..000000000
--- a/oh_appraisal/security/ir.model.access.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_hr_appraisal_hr_appraisal,oh_appraisal.hr_appraisal,model_hr_appraisal,,1,1,1,1
-access_hr_appraisal_hr_appraisal1,oh_appraisal.hr_appraisal_stages,model_hr_appraisal_stages,,1,1,1,1
diff --git a/oh_appraisal/static/description/HRMS-BUTTON.png b/oh_appraisal/static/description/HRMS-BUTTON.png
deleted file mode 100644
index 0f1b65bea..000000000
Binary files a/oh_appraisal/static/description/HRMS-BUTTON.png and /dev/null differ
diff --git a/oh_appraisal/static/description/appraisal.png b/oh_appraisal/static/description/appraisal.png
deleted file mode 100644
index 7a7f0a995..000000000
Binary files a/oh_appraisal/static/description/appraisal.png and /dev/null differ
diff --git a/oh_appraisal/static/description/banner.jpg b/oh_appraisal/static/description/banner.jpg
deleted file mode 100644
index 0823d44d3..000000000
Binary files a/oh_appraisal/static/description/banner.jpg and /dev/null differ
diff --git a/oh_appraisal/static/description/cybro-service.png b/oh_appraisal/static/description/cybro-service.png
deleted file mode 100644
index 252929a86..000000000
Binary files a/oh_appraisal/static/description/cybro-service.png and /dev/null differ
diff --git a/oh_appraisal/static/description/cybro_logo.png b/oh_appraisal/static/description/cybro_logo.png
deleted file mode 100644
index bb309114c..000000000
Binary files a/oh_appraisal/static/description/cybro_logo.png and /dev/null differ
diff --git a/oh_appraisal/static/description/email.png b/oh_appraisal/static/description/email.png
deleted file mode 100644
index ba236b416..000000000
Binary files a/oh_appraisal/static/description/email.png and /dev/null differ
diff --git a/oh_appraisal/static/description/icon.png b/oh_appraisal/static/description/icon.png
deleted file mode 100644
index b4f716e94..000000000
Binary files a/oh_appraisal/static/description/icon.png and /dev/null differ
diff --git a/oh_appraisal/static/description/index.html b/oh_appraisal/static/description/index.html
deleted file mode 100644
index 36028ee8d..000000000
--- a/oh_appraisal/static/description/index.html
+++ /dev/null
@@ -1,145 +0,0 @@
-<section class="oe_container ">
-    <div class="oe_row">
-            <h2 class="oe_slogan">OpenHRMS</h2>
-            <h3 class="oe_slogan">Most advanced open source HR management software</h3>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced oe_mt32">
-        <div class="oe_span">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <a href="https://www.openhrms.com/#request-demo">
-                    <img src="HRMS-BUTTON.png">
-                </a>
-            </div>
-        </div>
-
-    </div>
-</section>
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-        <div class="oe_span12">
-            <h2 class="oe_slogan">Employee Appraisal</h2>
-            <h3 class="oe_slogan">Roll out appraisal plans and get the best of your workforce.</h3>
-            <h3 class="oe_slogan"><a href="https://www.cybrosys.com">Cybrosys Technologies</a> </h3>
-        </div>
-        <div class="oe_row oe_spaced">
-            <h4><p style="margin-left: 42px;">Major Features:</p></h4>
-            <ul>
-                <li style="list-style:none !important;"><span style="color:green;"> &#9733;</span>&nbsp;&nbsp;Create appraisal plans using interviews, questionnaires and feedback forms.</li>
-                <li style="list-style:none !important;"><span style="color:green;"> &#9733;</span>&nbsp;&nbsp; Multiple appraisal methods like self-appraisal, colleague evaluation</li>
-            </ul>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-        <div class="oe_picture">
-            <h3 class="oe_slogan">Overview</h3>
-                <p class="oe_mt32">
-                    Employee appraisal module is a component of Open HRMS suit,
-                    it helps you to utilize the best of your human resource pool.
-                    Implement appraisal strategies to keep the motivational and performance level
-                    of your employees high. Appraisal module allows you to create Top Down or Bottom-up
-                    evaluation plans and give timely feedbacks and complements for accomplishments.
-
-                </p>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-        <p>Appraisal Menu</p>
-        <div class="oe_span6">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <img src="appraisal.png">
-            </div>
-        </div>
-        <div class="oe_span6">
-            <p>
-                Create a form for evaluating employee.Option to create Top Down or Bottom-up evaluation plans.
-            </p>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-        <p>Email Notification</p>
-         <div class="oe_span6">
-            <p>
-               Email notification is sent to the corresponding employee including the link to participate in the survey
-
-            </p>
-        </div>
-        <div class="oe_span6">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <img src="email.png">
-            </div>
-        </div>
-    </div>
-</section>
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-        <p>View Answers</p>
-        <div class="oe_span6">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <img src="view_answers.png">
-            </div>
-        </div>
-         <div class="oe_span6">
-            <p>You can view all the answers here </p>
-
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-        <p>Settings Menu</p>
-        <div class="oe_span6">
-            <p>Set access rights for the employees.</p>
-        </div>
-        <div class="oe_span6">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <img src="settings.png">
-            </div>
-        </div>
-    </div>
-</section>
-
-<div class="row section-content">
-    <div class="col-md-6 img-content">
-        <h3>Our Odoo Services</h3>
-    </div>
-    <div class="bc-span col-md-12">
-        <div class="inner-span">
-            <a target="_blank" href="https://www.openhrms.com">
-                <img class="img-border img-responsive thumbnail" src="cybro-service.png">
-            </a>
-        </div>
-    </div>
-</div>
-
-<section class="oe_container oe_dark">
-    <h2 class="oe_slogan" style="margin-top:20px;" >Need Any Help?</h2>
-    <div class="oe_slogan" style="margin-top:10px !important;">
-        <div>
-            <a  class="btn btn-primary btn-lg mt8"
-            style="color: #FFFFFF !important;border-radius: 0;" href="https://www.cybrosys.com"><i
-            class="fa fa-envelope"></i> Email </a> <a
-            class="btn btn-primary btn-lg mt8" style="color: #FFFFFF !important;border-radius: 0;"
-            href="https://www.cybrosys.com/contact/"><i
-            class="fa fa-phone"></i> Contact Us </a> <a
-            class="btn btn-primary btn-lg mt8" style="color: #FFFFFF !important;border-radius: 0;"
-            href="https://www.cybrosys.com/odoo-customization-and-installation/"><i
-            class="fa fa-check-square"></i> Request Customization </a>
-        </div>
-        <br>
-        <img src="cybro_logo.png" style="width: 190px; margin-bottom: 20px;" class="center-block">
-    </div>
-</section>
diff --git a/oh_appraisal/static/description/settings.png b/oh_appraisal/static/description/settings.png
deleted file mode 100644
index 694ccabe1..000000000
Binary files a/oh_appraisal/static/description/settings.png and /dev/null differ
diff --git a/oh_appraisal/static/description/view_answers.png b/oh_appraisal/static/description/view_answers.png
deleted file mode 100644
index bed8d5e1a..000000000
Binary files a/oh_appraisal/static/description/view_answers.png and /dev/null differ
diff --git a/oh_appraisal/views/hr_appraisal_form_view.xml b/oh_appraisal/views/hr_appraisal_form_view.xml
deleted file mode 100644
index f207e56c9..000000000
--- a/oh_appraisal/views/hr_appraisal_form_view.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <record id="hr_appraisal_form_view" model="ir.ui.view">
-            <field name="name">hr.appraisal.form</field>
-            <field name="model">hr.appraisal</field>
-            <field name="priority">1</field>
-            <field name="arch" type="xml">
-                <form>
-                    <header>
-                        <button name="action_start_appraisal" string="Start Appraisal And Send Forms"
-                                class="oe_highlight" type="object"
-                                attrs="{'invisible': ['|','|',('check_sent','=', True),('check_done','=', True),
-                                ('check_cancel','=', True)]}"
-                                />
-                        <button name="action_done" string="Done"
-                                class="oe_highlight" type="object"
-                                attrs="{'invisible': ['|','|',('check_done','=', True),('check_draft','=', True),
-                                 ('check_cancel','=', True)]}"
-                                />
-                        <button name="action_set_draft" string="Set To Draft"
-                                class="oe_highlight" type="object"
-                                attrs="{'invisible': ['|','|',('check_draft','=', True), ('check_done','=', True),
-                                ('check_cancel','=', True)]}"
-                                />
-                        <button name="action_cancel" string="Cancel"
-                                class="oe_highlight" type="object"
-                                attrs="{'invisible': ['|','|',('check_draft','=', True),('check_done','=', True),
-                                 ('check_cancel', '=', True)]}"/>
-                        <field name="state" widget="statusbar"/>
-                    </header>
-                    <sheet>
-                        <div class="oe_button_box" name="button_box">
-                            <button name="action_get_answers"
-                                type="object"
-                                class="oe_stat_button"
-                                icon="fa-pencil-square-o">
-                                <field string="Answers" name="tot_comp_survey" widget="statinfo"/>
-                            </button>
-                        </div>
-                        <label for="emp_id"/>
-                        <h1>
-                            <field name="emp_id" class="oe_inline" placeholder="Employee's Name"
-                                   attrs="{'readonly':[('check_draft','!=',True)]}"/>
-                        </h1>
-                        <group>
-                            <group>
-                                <field name="appraisal_deadline" attrs="{'readonly':[('check_draft','!=', True)]}"/>
-                                <field name="response_id" invisible="1"/>
-                                <field name="app_period_from" invisible="1"/>
-                                <field name="created_by" invisible="1"/>
-                            </group>
-                            <group>
-                                <field name="final_interview" attrs="{'invisible':[('check_done','!=',True)]}"/>
-                                <field name="tot_sent_survey" invisible="1"/>
-                                <field name="check_draft" invisible="1"/>
-                                <field name="check_sent" invisible="1"/>
-                                <field name="check_done" invisible="1"/>
-                                <field name="check_cancel" invisible="1"/>
-                            </group>
-                        </group>
-                        <notebook>
-                            <page string="Final Evaluation" attrs="{'invisible':[('check_done','!=',True)]}">
-                                <field name="final_evaluation" nolabel="1" attrs="{'invisible':[('check_done','!=',True)]}"/>
-                            </page>
-                            <page string="Plan">
-                                <group col="4">
-                                    <field name="hr_manager"/>
-                                    <field name="hr_manager_id" widget="many2many_tags"
-                                           placeholder="Select Appraisal Reviewer" nolabel="1"
-                                           attrs="{'invisible': [('hr_manager','=', False)], 'readonly':[('check_draft','!=', True)]}"/>
-                                    <field name="manager_survey_id"
-                                           placeholder="Appraisal Form" nolabel="1"
-                                           attrs="{'invisible': [('hr_manager','=', False)], 'readonly':[('check_draft','!=', True)]}"/>
-                                    <field name="hr_emp" attrs="{'readonly':[('check_draft','!=', True)]}"/>
-                                    <seperator/>
-                                    <field name="emp_survey_id"
-                                           placeholder="Appraisal Form" nolabel="1"
-                                           attrs="{'invisible': [('hr_emp','=', False)],
-                                           'readonly':[('check_draft','!=', True)]}"/>
-                                    <field name="hr_colloborator" attrs="{'readonly':[('check_draft','!=', True)]}"/>
-                                    <field name="hr_colloborator_id"  widget="many2many_tags"
-                                           placeholder="Select Appraisal Reviewer" nolabel="1"
-                                           attrs="{'invisible': [('hr_colloborator','=', False)],
-                                           'readonly':[('check_draft','!=', True)]}"/>
-                                    <field name="colloborator_survey_id"
-                                           placeholder="Appraisal Form" nolabel="1"
-                                           attrs="{'invisible': [('hr_colloborator','=', False)],
-                                           'readonly':[('check_draft','!=',True)]}"/>
-                                    <field name="hr_colleague" attrs="{'readonly':[('check_draft','!=', True)],
-                                           'readonly':[('check_draft','!=', True)]}"/>
-                                    <field name="hr_colleague_id"  widget="many2many_tags"
-                                           placeholder="Select Appraisal Reviewer" nolabel="1"
-                                           attrs="{'invisible': [('hr_colleague','=', False)],
-                                           'readonly':[('check_draft','!=', True)]}"/>
-                                    <field name="colleague_survey_id"
-                                           placeholder="Appraisal Form" nolabel="1"
-                                           attrs="{'invisible': [('hr_colleague','=', False)],
-                                           'readonly':[('check_draft','!=', True)]}"/>
-                                </group>
-                            </page>
-                        </notebook>
-                    </sheet>
-                    <div class="oe_chatter">
-                        <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
-                        <field name="message_ids" widget="mail_thread"/>
-                    </div>
-                </form>
-            </field>
-        </record>
-    </data>
-
-    <record model="ir.ui.view" id="hr_appraisal_tree_view">
-        <field name="name">hr.appraisal.tree</field>
-        <field name="model">hr.appraisal</field>
-        <field name="arch" type="xml">
-            <tree>
-                <field name="emp_id"/>
-                <field name="app_period_from"/>
-                <field name="appraisal_deadline"/>
-                <field name="company_id" invisible="1"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="hr_appraisal_kanban" model="ir.ui.view">
-        <field name="name">hr.appraisal.kanban</field>
-        <field name="model">hr.appraisal</field>
-        <field name="arch" type="xml">
-            <kanban default_group_by="state" quick_create="false">
-            <field name="color"/>
-            <field name="state"/>
-            <templates>
-                <t t-name="kanban-box">
-                    <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
-                        <div class="o_dropdown_kanban dropdown">
-                            <a class="dropdown-toggle btn" data-toggle="dropdown" href="#" >
-                                <span class="fa fa-bars fa-lg"/>
-                            </a>
-                            <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
-                                <t t-if="widget.editable"><li><a type="edit">Edit</a></li></t>
-                                <t t-if="widget.deletable"><li><a type="delete">Delete</a></li></t>
-                                <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
-                            </ul>
-                        </div>
-                        <div class="oe_kanban_content">
-                            <div><strong><field name="emp_id"/></strong></div>
-                            <t t-if="record.appraisal_deadline.raw_value and record.appraisal_deadline.raw_value &lt; (new Date())" t-set="red">oe_kanban_text_red</t>
-                                Deadline: <span t-attf-class="#{red}"><i><field name="appraisal_deadline"/></i></span>
-                            <br/>
-                            <div class="text-muted">
-                                Sent Questions: <span><i><field name="tot_sent_survey"/></i></span>
-                            </div>
-                            <div class="text-muted">
-                                Answers: <span><i><field name="tot_comp_survey"/></i></span>
-                            </div>
-                            <div>
-                                <t t-if="record.final_interview.raw_value and record.final_interview.raw_value &lt; (new Date())" t-set="red">oe_kanban_text_red</t>
-                                Final Interview:<span t-attf-class="#{red}"><i><field name="final_interview"/></i></span>
-                            </div>
-                            <div class="oe_clear"></div>
-                        </div>
-                    </div>
-                </t>
-            </templates>
-            </kanban>
-        </field>
-    </record>
-
-    <record id="hr_appraisal_action_form" model="ir.actions.act_window">
-        <field name="name">Appraisal</field>
-        <field name="res_model">hr.appraisal</field>
-        <field name='view_type'>form</field>
-        <field name="view_id" ref="hr_appraisal_kanban"/>
-        <field name='view_mode'>kanban,tree,form</field>
-    </record>
-
-    <menuitem name="Appraisal" id="menu_hr_appraisal_root" parent="hr.menu_hr_root" groups="oh_appraisal.group_appraisal_manager,oh_appraisal.group_appraisal_employee"/>
-    <menuitem name="Appraisal" id="menu_hr_appraisal" parent="menu_hr_appraisal_root"  action="hr_appraisal_action_form" groups="oh_appraisal.group_appraisal_manager,oh_appraisal.group_appraisal_employee"/>
-    <menuitem name="Answers" id="menu_hr_appraisal_answers" parent="menu_hr_appraisal_root" action="survey.action_survey_user_input" groups="oh_appraisal.group_appraisal_employee"/>
-</odoo>
\ No newline at end of file
diff --git a/oh_appraisal/views/hr_appraisal_survey_views.xml b/oh_appraisal/views/hr_appraisal_survey_views.xml
deleted file mode 100644
index 495a3e1c4..000000000
--- a/oh_appraisal/views/hr_appraisal_survey_views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <record model="ir.ui.view" id="hr_appraisal_survey_inherited">
-            <field name="name">hr_appraisal list</field>
-            <field name="model">survey.user_input</field>
-            <field name="priority">1</field>
-            <field name="inherit_id" ref="survey.survey_user_input_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//field[@name='email']" position="after">
-                     <field name="appraisal_id"/>
-                </xpath>
-            </field>
-        </record>
-    </data>
-</odoo>
\ No newline at end of file
diff --git a/oh_employee_check_list/README.md b/oh_employee_check_list/README.md
deleted file mode 100644
index b543570fc..000000000
--- a/oh_employee_check_list/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-OH Employee Checklist
----------------------
-Supporting Addon for Open HRMS, Manages Employee's Entry & Exit Process
-
-Overview
---------
-A well functioning human resource department will lay down a number procedure and process before an employee during joining/resigning time. It may be submission/Return of a certificate or attending a conference etc.
-A person has to undergo all these checklist items before being admitted/resigned. The module simplifies the process by providing you a checklist to mark the proceedings. It will also display the PercentPie of the checklist items completed.
-
-Connect with experts
---------------------
-
-If you have any question/queries/additional works on OpenHRMS or this module, You can drop an email directly to Cybrosys.
-
-Contacts
---------
-info - info@cybrosys.com
-Nilmar Shereef - shereef@cybrosys.in
-
-Website:
-https://www.openhrms.com
-https://www.cybrosys.com
diff --git a/oh_employee_check_list/__init__.py b/oh_employee_check_list/__init__.py
deleted file mode 100644
index 16dcf27c6..000000000
--- a/oh_employee_check_list/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Nilmar Shereef (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from . import models
-
diff --git a/oh_employee_check_list/__manifest__.py b/oh_employee_check_list/__manifest__.py
deleted file mode 100644
index 7f5f850a6..000000000
--- a/oh_employee_check_list/__manifest__.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of Open HRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Nilmar Shereef (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-{
-    'name': 'Open HRMS Employee Checklist',
-    'version': '10.0.1.0.0',
-    'summary': """Manages Employee's Entry & Exit Process""",
-    'description': """This module is a part of OH project, used to remembering the employee's entry and exit progress.""",
-    'category': 'Generic Modules/Human Resources',
-    'author': 'Cybrosys Techno Solutions',
-    'company': 'Cybrosys Techno Solutions',
-    'website': "https://www.openhrms.com",
-    'depends': ['base', 'oh_employee_documents_expiry'],
-    'data': [
-        'security/ir.model.access.csv',
-        'views/employee_form_inherit_view.xml',
-        'views/settings_view.xml',
-        'views/checklist_view.xml',
-    ],
-    'demo': [],
-    'images': ['static/description/banner.jpg'],
-    'license': 'AGPL-3',
-    'installable': True,
-    'auto_install': False,
-    'application': False,
-}
diff --git a/oh_employee_check_list/doc/RELEASE_NOTES.md b/oh_employee_check_list/doc/RELEASE_NOTES.md
deleted file mode 100644
index 7608da48e..000000000
--- a/oh_employee_check_list/doc/RELEASE_NOTES.md
+++ /dev/null
@@ -1,6 +0,0 @@
-## Module 'oh_employee_check_list'
-
-#### 30.03.2018
-#### Version 10.0.1.0.0
-##### ADD
-- Initial commit for OpenHrms Project
diff --git a/oh_employee_check_list/models/__init__.py b/oh_employee_check_list/models/__init__.py
deleted file mode 100644
index 2c68740da..000000000
--- a/oh_employee_check_list/models/__init__.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Nilmar Shereef (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from . import employee_master_inherit
-from . import settings
-
-
diff --git a/oh_employee_check_list/models/employee_master_inherit.py b/oh_employee_check_list/models/employee_master_inherit.py
deleted file mode 100644
index 88d0f0cd0..000000000
--- a/oh_employee_check_list/models/employee_master_inherit.py
+++ /dev/null
@@ -1,86 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Nilmar Shereef (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from odoo import models, fields, api
-
-
-class EmployeeMasterInherit(models.Model):
-    _inherit = 'hr.employee'
-
-    @api.depends('exit_checklist')
-    def exit_progress(self):
-        for each in self:
-            total_len = self.env['employee.checklist'].search_count([('document_type', '=', 'exit')])
-            entry_len = len(each.exit_checklist)
-            if total_len != 0:
-                each.exit_progress = (entry_len * 100) / total_len
-
-    @api.depends('entry_checklist')
-    def entry_progress(self):
-        for each in self:
-            total_len = self.env['employee.checklist'].search_count([('document_type', '=', 'entry')])
-            entry_len = len(each.entry_checklist)
-            if total_len != 0:
-                each.entry_progress = (entry_len*100) / total_len
-
-    entry_checklist = fields.Many2many('employee.checklist', 'entry_obj', 'check_hr_rel', 'hr_check_rel',
-                                       string='Entry Process',
-                                       domain=[('document_type', '=', 'entry')])
-    exit_checklist = fields.Many2many('employee.checklist', 'exit_obj', 'exit_hr_rel', 'hr_exit_rel',
-                                      string='Exit Process',
-                                      domain=[('document_type', '=', 'exit')])
-    entry_progress = fields.Float(compute=entry_progress, string='Entry Progress', store=True, default=0.0)
-    exit_progress = fields.Float(compute=exit_progress, string='Exit Progress', store=True, default=0.0)
-    maximum_rate = fields.Integer(default=100)
-    check_list_enable = fields.Boolean(invisible=True, copy=False)
-
-
-class EmployeeDocumentInherit(models.Model):
-    _inherit = 'hr.employee.document'
-
-    @api.model
-    def create(self, vals):
-        result = super(EmployeeDocumentInherit, self).create(vals)
-        if result.document_name.document_type == 'entry':
-            result.employee_ref.write({'entry_checklist': [(4, result.document_name.id)]})
-        if result.document_name.document_type == 'exit':
-            result.employee_ref.write({'exit_checklist': [(4, result.document_name.id)]})
-        return result
-
-    @api.multi
-    def unlink(self):
-        for result in self:
-            if result.document_name.document_type == 'entry':
-                result.employee_ref.write({'entry_checklist': [(5, result.document_name.id)]})
-            if result.document_name.document_type == 'exit':
-                result.employee_ref.write({'exit_checklist': [(5, result.document_name.id)]})
-        res = super(EmployeeDocumentInherit, self).unlink()
-        return res
-
-
-class EmployeeChecklistInherit(models.Model):
-    _inherit = 'employee.checklist'
-
-    entry_obj = fields.Many2many('hr.employee', 'entry_checklist', 'hr_check_rel', 'check_hr_rel',
-                                 invisible=1)
-    exit_obj = fields.Many2many('hr.employee', 'exit_checklist', 'hr_exit_rel', 'exit_hr_rel',
-                                invisible=1)
diff --git a/oh_employee_check_list/models/settings.py b/oh_employee_check_list/models/settings.py
deleted file mode 100644
index 308fca549..000000000
--- a/oh_employee_check_list/models/settings.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Nilmar Shereef (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from odoo import models, fields, api
-
-
-class MenuThemes(models.Model):
-    _name = 'hr.settings'
-    _inherit = 'res.config.settings'
-
-    enable_checklist = fields.Boolean(string='Enable Checklist Progress in Kanban?')
-
-    @api.multi
-    def set_enable_checklist(self):
-        ir_values = self.env['ir.values']
-        enable_checklist = self.enable_checklist
-        ir_values.set_default('hr.settings', 'enable_checklist', enable_checklist)
-        emp_obj = self.env['hr.employee'].sudo().search([])
-        for each in emp_obj:
-            each.write({'check_list_enable': enable_checklist})
-
diff --git a/oh_employee_check_list/security/ir.model.access.csv b/oh_employee_check_list/security/ir.model.access.csv
deleted file mode 100644
index 05f0cf020..000000000
--- a/oh_employee_check_list/security/ir.model.access.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink
-access_hr.settings_manager,hr.settings.manager,model_hr_settings,hr.group_hr_manager,1,1,1,1
diff --git a/oh_employee_check_list/static/description/HRMS-BUTTON.png b/oh_employee_check_list/static/description/HRMS-BUTTON.png
deleted file mode 100644
index 0f1b65bea..000000000
Binary files a/oh_employee_check_list/static/description/HRMS-BUTTON.png and /dev/null differ
diff --git a/oh_employee_check_list/static/description/banner.jpg b/oh_employee_check_list/static/description/banner.jpg
deleted file mode 100644
index d55e63353..000000000
Binary files a/oh_employee_check_list/static/description/banner.jpg and /dev/null differ
diff --git a/oh_employee_check_list/static/description/cybro-service.png b/oh_employee_check_list/static/description/cybro-service.png
deleted file mode 100644
index 0a648278c..000000000
Binary files a/oh_employee_check_list/static/description/cybro-service.png and /dev/null differ
diff --git a/oh_employee_check_list/static/description/cybro_logo.png b/oh_employee_check_list/static/description/cybro_logo.png
deleted file mode 100644
index bb309114c..000000000
Binary files a/oh_employee_check_list/static/description/cybro_logo.png and /dev/null differ
diff --git a/oh_employee_check_list/static/description/icon.png b/oh_employee_check_list/static/description/icon.png
deleted file mode 100644
index 0885ca68e..000000000
Binary files a/oh_employee_check_list/static/description/icon.png and /dev/null differ
diff --git a/oh_employee_check_list/static/description/index.html b/oh_employee_check_list/static/description/index.html
deleted file mode 100644
index 0f808430e..000000000
--- a/oh_employee_check_list/static/description/index.html
+++ /dev/null
@@ -1,166 +0,0 @@
-<section class="oe_container">
-    <div class="oe_row">
-        <h2 class="oe_slogan">OpenHRMS</h2>
-        <h3 class="oe_slogan">Most advanced open source HR management software</h3>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced oe_mt32">
-        <div class="oe_span">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <a href="https://www.openhrms.com/#request-demo">
-                    <img src="HRMS-BUTTON.png">
-                </a>
-                <div class="oe_demo_footer oe_centeralign">Online Demo</div>
-            </div>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-        <h2 class="oe_slogan">OHRMS Employee Exit/Entry Checklist</h2>
-        <h3 class="oe_slogan">Manages Employees Entry & Exit Process</h3>
-        <h4 class="oe_slogan"><a href="https://www.cybrosys.com">Cybrosys Technologies</a> </h4>
-    </div>
-    <div class="oe_row oe_spaced" style="padding-left:65px;">
-        <h4>Features:</h4>
-        <div>
-            <span style="color:green;"> &#9745; </span> Managing entry/exit process.<br/>
-            <span style="color:green;"> &#9745; </span> Automatic process on document attachments.<br/>
-            <span style="color:green;"> &#9745; </span> Option to enable Gauge widget for employee kanban.<br/>
-            <span style="color:green;"> &#9745; </span> Entry/Exit Percentpie in employee form view.<br/>
-            <span style="color:green;"> &#9745; </span> Entry Progressbar in employee tree view.<br/>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-        <div class="oe_picture">
-            <h3 class="oe_slogan">Overview</h3>
-            <p class="oe_mt32 text-justify" style="text-align: center;">
-A well functioning human resource department will lay down a number procedure and process before an employee during joining/resigning time. It may be submission/Return of a certificate or attending a conference etc.
-A person has to undergo all these checklist items before being admitted/resigned. The module simplifies the process by providing you a checklist to mark the proceedings. It will also display the PercentPie of the checklist items completed.
-
-            </p>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-        <div style="text-align: center">
-            <p>
-                <h4>Entry/Exit Checklist</h4>
-            <p>
-        </div>
-        <div style="text-align: center">
-            <a href="https://www.cybrosys.com">
-                <div class="oe_demo oe_picture oe_screenshot">
-                    <img style="border:10px solid white;" src="oh_entry_checklist.png">
-                </div>
-            </a>
-        </div>
-        <div style="text-align: center">
-            <a href="https://www.cybrosys.com">
-                <div class="oe_demo oe_picture oe_screenshot">
-                    <img style="border:10px solid white;" src="oh_exit_chceklist.png">
-                </div>
-            </a>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-        <div style="text-align: center">
-            <p>
-                <h4>Employee From View With PercentPie</h4>
-            </p>
-        </div>
-        <div class="" style="text-align: center">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <img style="border:10px solid white;" src="oh_employee_form.png">
-            </div>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-        <div style="text-align: center">
-            <p>
-                <h4>Employee Tree View With Progressbar</h4>
-            </p>
-        </div>
-        <div class="" style="text-align: center">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <img style="border:10px solid white;" src="oh_tree_view.png">
-            </div>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-        <div style="text-align: center">
-            <p>
-                <h4>Employee Kanban View with Gauge</h4>
-            </p>
-        </div>
-        <div class="" style="text-align: center">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <img style="border:10px solid white;" src="oh_kanban_view.png">
-            </div>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-        <div style="text-align: center">
-            <p>
-                <h4>Configuration</h4>
-            </p>
-        </div>
-        <div class="" style="text-align: center">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <img style="border:10px solid white;" src="oh_kanban_Settings.png">
-            </div>
-        </div>
-    </div>
-</section>
-
-<div class="row section-content">
-    <div class="col-md-6 img-content">
-        <h3>Our Odoo Services</h3>
-    </div>
-    <div class="bc-span col-md-12">
-        <div class="inner-span">
-            <a target="_blank" href="https://www.openhrms.com">
-                <img class="img-border img-responsive thumbnail" src="cybro-service.png">
-            </a>
-        </div>
-    </div>
-</div>
-
-<section class="oe_container">
-    <h2 class="oe_slogan" style="margin-top:20px;" >Need Any Help?</h2>
-    <div class="oe_slogan" style="margin-top:10px !important;">
-        <div>
-            <a  class="btn btn-primary btn-lg mt8"
-            style="color: #FFFFFF !important;border-radius: 0;" href="https://www.cybrosys.com"><i
-            class="fa fa-envelope"></i> Email </a> <a
-            class="btn btn-primary btn-lg mt8" style="color: #FFFFFF !important;border-radius: 0;"
-            href="https://www.cybrosys.com/contact/"><i
-            class="fa fa-phone"></i> Contact Us </a> <a
-            class="btn btn-primary btn-lg mt8" style="color: #FFFFFF !important;border-radius: 0;"
-            href="https://www.cybrosys.com/odoo-customization-and-installation/"><i
-            class="fa fa-check-square"></i> Request Customization </a>
-        </div>
-        <br>
-        <img src="cybro_logo.png" style="width: 190px; margin-bottom: 20px;" class="center-block">
-    </div>
-</section>
diff --git a/oh_employee_check_list/static/description/oh_employee_form.png b/oh_employee_check_list/static/description/oh_employee_form.png
deleted file mode 100644
index d2e9b8e6e..000000000
Binary files a/oh_employee_check_list/static/description/oh_employee_form.png and /dev/null differ
diff --git a/oh_employee_check_list/static/description/oh_entry_checklist.png b/oh_employee_check_list/static/description/oh_entry_checklist.png
deleted file mode 100644
index 63f49d419..000000000
Binary files a/oh_employee_check_list/static/description/oh_entry_checklist.png and /dev/null differ
diff --git a/oh_employee_check_list/static/description/oh_exit_chceklist.png b/oh_employee_check_list/static/description/oh_exit_chceklist.png
deleted file mode 100644
index c971cacc9..000000000
Binary files a/oh_employee_check_list/static/description/oh_exit_chceklist.png and /dev/null differ
diff --git a/oh_employee_check_list/static/description/oh_kanban_Settings.png b/oh_employee_check_list/static/description/oh_kanban_Settings.png
deleted file mode 100644
index 4eb07c0e1..000000000
Binary files a/oh_employee_check_list/static/description/oh_kanban_Settings.png and /dev/null differ
diff --git a/oh_employee_check_list/static/description/oh_kanban_view.png b/oh_employee_check_list/static/description/oh_kanban_view.png
deleted file mode 100644
index 55db3068c..000000000
Binary files a/oh_employee_check_list/static/description/oh_kanban_view.png and /dev/null differ
diff --git a/oh_employee_check_list/static/description/oh_tree_view.png b/oh_employee_check_list/static/description/oh_tree_view.png
deleted file mode 100644
index 4910100e7..000000000
Binary files a/oh_employee_check_list/static/description/oh_tree_view.png and /dev/null differ
diff --git a/oh_employee_check_list/views/checklist_view.xml b/oh_employee_check_list/views/checklist_view.xml
deleted file mode 100644
index 42e0b1111..000000000
--- a/oh_employee_check_list/views/checklist_view.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <record id="action_entry_checklist" model="ir.actions.act_window">
-        <field name="name">Entry Checklist</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">employee.checklist</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('document_type', '=', 'entry')]</field>
-        <field name="context">{"default_document_type":'entry'}</field>
-        <field name="help" type="html">
-            <p class="oe_view_nocontent_create">
-                Click to create a New Entry Checklist
-            </p>
-        </field>
-    </record>
-
-    <record id="action_exit_checklist" model="ir.actions.act_window">
-        <field name="name">Exit Checklist</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">employee.checklist</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('document_type', '=', 'exit')]</field>
-        <field name="context">{"default_document_type":'exit'}</field>
-        <field name="help" type="html">
-            <p class="oe_view_nocontent_create">
-                Click to create a New Exit Checklist
-            </p>
-        </field>
-    </record>
-
-    <menuitem id="employee_entry_checklist_menu" name="Entry Checklist" parent="checklist_settings" sequence="3"
-              action="action_entry_checklist"/>
-    <menuitem id="employee_exit_checklist_menu" name="Exit Checklist" parent="checklist_settings" sequence="4"
-              action="action_exit_checklist"/>
-</odoo>
\ No newline at end of file
diff --git a/oh_employee_check_list/views/employee_form_inherit_view.xml b/oh_employee_check_list/views/employee_form_inherit_view.xml
deleted file mode 100644
index 45df184e2..000000000
--- a/oh_employee_check_list/views/employee_form_inherit_view.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <record model="ir.ui.view" id="hr_employee_inherit_form_view">
-        <field name="name">hr.employee.form.view</field>
-        <field name="model">hr.employee</field>
-        <field name="inherit_id" ref="hr.view_employee_form"/>
-        <field name="arch" type="xml">
-            <field name="category_ids" position="after">
-                <div>
-                    <field name="entry_progress" widget="percentpie"/>
-                    <field name="exit_progress" widget="percentpie" class="oe_inline"/>
-                </div>
-            </field>
-            <page name="hr_settings" position="after">
-                <page name="checklist" string="Checklist" groups="hr.group_hr_manager">
-                    <group>
-                        <group name="entry_checklist" string="Entry Checklist">
-                            <field name="entry_checklist" widget="many2many_checkboxes"/>
-                            <field name="check_list_enable" invisible="1"/>
-                        </group>
-                        <group name="exit_checklist" string="Exit Checklist">
-                            <field name="exit_checklist" widget="many2many_checkboxes"/>
-                        </group>
-                    </group>
-                </page>
-            </page>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="hr_employee_inherit_tree_view">
-        <field name="name">hr.employee.tree.view</field>
-        <field name="model">hr.employee</field>
-        <field name="inherit_id" ref="hr.view_employee_tree"/>
-        <field name="arch" type="xml">
-            <field name="message_needaction" position="after">
-                <field name="entry_progress" widget="progressbar"/>
-            </field>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="hr_employee_inherit_kanban_view">
-        <field name="name">hr.employee.kanban.view</field>
-        <field name="model">hr.employee</field>
-        <field name="inherit_id" ref="hr.hr_kanban_view_employees"/>
-        <field name="arch" type="xml">
-            <xpath expr="//templates" position="before">
-                <field name="entry_progress"/>
-                <field name="maximum_rate"/>
-                <field name="check_list_enable" invisible="1"/>
-            </xpath>
-
-            <xpath expr="//ul/li[6]" position="after">
-                <li t-if="record.check_list_enable.raw_value==1">
-                    <field name="entry_progress" widget="gauge" style="width:120px;height:90px;cursor:pointer;"
-                           options="{'max_field': 'maximum_rate'}">
-                                   Entry Progress
-                    </field>
-                </li>
-            </xpath>
-        </field>
-    </record>
-</odoo>
\ No newline at end of file
diff --git a/oh_employee_check_list/views/settings_view.xml b/oh_employee_check_list/views/settings_view.xml
deleted file mode 100644
index c1417aecf..000000000
--- a/oh_employee_check_list/views/settings_view.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <record id="form_hr_settings" model="ir.ui.view">
-            <field name="name">hr.settings.form</field>
-            <field name="model">hr.settings</field>
-            <field name="arch" type="xml">
-                 <form string="Hr Settings" class="oe_form_configuration">
-                    <header>
-                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" type="object" name="cancel" class="oe_link"/>
-                    </header>
-                    <separator string="Entry Checklist"/>
-                     <group>
-                         <field name="enable_checklist"/>
-                    </group>
-                 </form>
-            </field>
-        </record>
-
-        <record id="action_hr_settings" model="ir.actions.act_window">
-            <field name="name">Hr Settings</field>
-            <field name="res_model">hr.settings</field>
-            <field name="view_mode">form</field>
-            <field name="target">inline</field>
-        </record>
-
-        <menuitem id="checklist_settings" parent="hr.menu_human_resources_configuration"
-                  groups="hr.group_hr_manager"
-                  sequence="10" name="Checklist Config"/>
-
-        <menuitem action="action_hr_settings" id="menu_settings" parent="checklist_settings"
-                  groups="hr.group_hr_manager"
-                  sequence="1" name="Settings"/>
-    </data>
-</odoo>
\ No newline at end of file
diff --git a/oh_employee_documents_expiry/README.md b/oh_employee_documents_expiry/README.md
deleted file mode 100644
index ee8775b0a..000000000
--- a/oh_employee_documents_expiry/README.md
+++ /dev/null
@@ -1,26 +0,0 @@
-OH Employee Documents
----------------------
-Supporting Addon for Open HRMS, Manages Employee Related Documents
-
-Overview
---------
-Each and every detail associated with an employee is useful for any organization for better Human resource management.
-So the employee documents with such necessary information must be saved and used accordingly.
-'Employee Documents' is a useful tool that can help you to store and manage the employee related
-documents like certificates, appraisal reports, passport, license etc.
-The application also allows you to set an alert message on reaching the expiration/any other
-related dates of a document (like an expiration of passport)
-
-Connect with experts
---------------------
-
-If you have any question/queries/additional works on OpenHRMS or this module, You can drop an email directly to Cybrosys.
-
-Contacts
---------
-info - info@cybrosys.com
-Nilmar Shereef - shereef@cybrosys.in
-
-Website:
-https://www.openhrms.com
-https://www.cybrosys.com
diff --git a/oh_employee_documents_expiry/RELEASE_NOTES.md b/oh_employee_documents_expiry/RELEASE_NOTES.md
deleted file mode 100644
index 8f06bb30d..000000000
--- a/oh_employee_documents_expiry/RELEASE_NOTES.md
+++ /dev/null
@@ -1,6 +0,0 @@
-## Module 'oh_employee_documents_expiry'
-
-#### 30.03.2018
-#### Version 10.0.1.0.0
-##### ADD
-- Initial commit for OpenHrms Project
diff --git a/oh_employee_documents_expiry/__init__.py b/oh_employee_documents_expiry/__init__.py
deleted file mode 100644
index 16dcf27c6..000000000
--- a/oh_employee_documents_expiry/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Nilmar Shereef (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from . import models
-
diff --git a/oh_employee_documents_expiry/__manifest__.py b/oh_employee_documents_expiry/__manifest__.py
deleted file mode 100644
index ae256c0dd..000000000
--- a/oh_employee_documents_expiry/__manifest__.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of Open HRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Nilmar Shereef (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-{
-    'name': 'Open HRMS Employee Documents',
-    'version': '10.0.1.0',
-    'summary': """Manages Employee Documents With Expiry Notifications.""",
-    'description': """OH Addon: Manages Employee Related Documents with Expiry Notifications.""",
-    'category': 'Generic Modules/Human Resources',
-    'author': 'Cybrosys Techno Solutions',
-    'company': 'Cybrosys Techno Solutions',
-    'maintainer': 'Cybrosys Techno Solutions',
-    'website': "https://www.openhrms.com",
-    'depends': ['base', 'hr'],
-    'data': [
-        'security/ir.model.access.csv',
-        'views/employee_check_list_view.xml',
-        'views/employee_document_view.xml',
-    ],
-    'demo': ['data/data.xml'],
-    'images': ['static/description/banner.jpg'],
-    'license': 'AGPL-3',
-    'installable': True,
-    'auto_install': False,
-    'application': False,
-}
diff --git a/oh_employee_documents_expiry/data/data.xml b/oh_employee_documents_expiry/data/data.xml
deleted file mode 100644
index ef0581a14..000000000
--- a/oh_employee_documents_expiry/data/data.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <record id="entry_document1" model="employee.checklist">
-        <field name="name">Education Certificate</field>
-        <field name="document_type">entry</field>
-    </record>
-    <record id="entry_document2" model="employee.checklist">
-        <field name="name">Salary Certificate</field>
-        <field name="document_type">entry</field>
-    </record>
-    <record id="entry_document3" model="employee.checklist">
-        <field name="name">Experience Certificate</field>
-        <field name="document_type">entry</field>
-    </record>
-    <record id="exit_document1" model="employee.checklist">
-        <field name="name">Experience Certificate</field>
-        <field name="document_type">exit</field>
-    </record>
-    <record id="exit_document2" model="employee.checklist">
-        <field name="name">Salary Certificate</field>
-        <field name="document_type">exit</field>
-    </record>
-</odoo>
\ No newline at end of file
diff --git a/oh_employee_documents_expiry/models/__init__.py b/oh_employee_documents_expiry/models/__init__.py
deleted file mode 100644
index 6030a78af..000000000
--- a/oh_employee_documents_expiry/models/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Nilmar Shereef (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from . import employee_documents
-from . import employee_entry_exit_check_list
-
diff --git a/oh_employee_documents_expiry/models/employee_documents.py b/oh_employee_documents_expiry/models/employee_documents.py
deleted file mode 100644
index ca31dca27..000000000
--- a/oh_employee_documents_expiry/models/employee_documents.py
+++ /dev/null
@@ -1,104 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Nilmar Shereef (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from datetime import datetime, date, timedelta
-from odoo import models, fields, api, _
-from odoo.exceptions import Warning
-
-
-class HrEmployeeDocument(models.Model):
-    _name = 'hr.employee.document'
-    _description = 'HR Employee Documents'
-
-    def mail_reminder(self):
-        now = datetime.now() + timedelta(days=1)
-        date_now = now.date()
-        match = self.search([])
-        for i in match:
-            if i.expiry_date:
-                exp_date = fields.Date.from_string(i.expiry_date) - timedelta(days=7)
-                if date_now >= exp_date:
-                    mail_content = "  Hello  " + i.employee_ref.name + ",<br>Your Document " + i.name + "is going to expire on " + \
-                                   str(i.expiry_date) + ". Please renew it before expiry date"
-                    main_content = {
-                        'subject': _('Document-%s Expired On %s') % (i.name, i.expiry_date),
-                        'author_id': self.env.user.partner_id.id,
-                        'body_html': mail_content,
-                        'email_to': i.employee_ref.work_email,
-                    }
-                    self.env['mail.mail'].create(main_content).send()
-
-    @api.constrains('expiry_date')
-    def check_expr_date(self):
-        for each in self:
-            if each.expiry_date:
-                exp_date = fields.Date.from_string(each.expiry_date)
-                if exp_date < date.today():
-                    raise Warning('Your Document Is Expired.')
-
-    name = fields.Char(string='Document Number', required=True, copy=False)
-    document_name = fields.Many2one('employee.checklist', string='Document', required=True)
-    description = fields.Text(string='Description', copy=False)
-    expiry_date = fields.Date(string='Expiry Date', copy=False)
-    employee_ref = fields.Many2one('hr.employee', invisible=1, copy=False)
-    doc_attachment_id = fields.Many2many('ir.attachment', 'doc_attach_rel', 'doc_id', 'attach_id3', string="Attachment",
-                                         help='You can attach the copy of your document', copy=False)
-    issue_date = fields.Date(string='Issue Date', default=fields.datetime.now(), copy=False)
-
-
-class HrEmployee(models.Model):
-    _inherit = 'hr.employee'
-
-    @api.multi
-    def _document_count(self):
-        for each in self:
-            document_ids = self.env['hr.employee.document'].sudo().search([('employee_ref', '=', each.id)])
-            each.document_count = len(document_ids)
-
-    @api.multi
-    def document_view(self):
-        self.ensure_one()
-        domain = [
-            ('employee_ref', '=', self.id)]
-        return {
-            'name': _('Documents'),
-            'domain': domain,
-            'res_model': 'hr.employee.document',
-            'type': 'ir.actions.act_window',
-            'view_id': False,
-            'view_mode': 'tree,form',
-            'view_type': 'form',
-            'help': _('''<p class="oe_view_nocontent_create">
-                           Click to Create for New Documents
-                        </p>'''),
-            'limit': 80,
-            'context': "{'default_employee_ref': '%s'}" % self.id
-        }
-
-    document_count = fields.Integer(compute='_document_count', string='# Documents')
-
-
-class HrEmployeeAttachment(models.Model):
-    _inherit = 'ir.attachment'
-
-    doc_attach_rel = fields.Many2many('hr.employee.document', 'doc_attachment_id', 'attach_id3', 'doc_id',
-                                      string="Attachment", invisible=1)
diff --git a/oh_employee_documents_expiry/models/employee_entry_exit_check_list.py b/oh_employee_documents_expiry/models/employee_entry_exit_check_list.py
deleted file mode 100644
index 691916db2..000000000
--- a/oh_employee_documents_expiry/models/employee_entry_exit_check_list.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Nilmar Shereef (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from odoo import models, fields, api
-
-
-class EmployeeEntryDocuments(models.Model):
-    _name = 'employee.checklist'
-    _inherit = ['mail.thread', 'ir.needaction_mixin']
-    _description = "Employee Documents"
-
-    @api.multi
-    def name_get(self):
-        result = []
-        for each in self:
-            if each.document_type == 'entry':
-                name = each.name + '_en'
-            elif each.document_type == 'exit':
-                name = each.name + '_ex'
-            elif each.document_type == 'other':
-                name = each.name + '_ot'
-            result.append((each.id, name))
-        return result
-
-    name = fields.Char(string='Name', copy=False, required=1)
-    document_type = fields.Selection([('entry', 'Entry Process'),
-                                      ('exit', 'Exit Process'),
-                                      ('other', 'Other')], string='Checklist Type', readonly=1, required=1)
-
-
diff --git a/oh_employee_documents_expiry/security/ir.model.access.csv b/oh_employee_documents_expiry/security/ir.model.access.csv
deleted file mode 100644
index 145868907..000000000
--- a/oh_employee_documents_expiry/security/ir.model.access.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink
-access_hr_employee_checklist_user,employee.checklist.user,model_employee_checklist,hr.group_hr_user,1,1,1,1
-access_hr_employee_checklist_emp,employee.checklist.emp,model_employee_checklist,base.group_user,1,0,0,0
-"access_hr_employee_document_employee","hr.employee.document_employee","model_hr_employee_document","base.group_user",1,0,0,0
-"access_hr_employee_document_manager","hr.employee.document_manager","model_hr_employee_document","hr.group_hr_manager",1,1,1,1
-"access_hr_employee_document_user","hr.employee.document_user","model_hr_employee_document","hr.group_hr_user",1,1,1,0
-
diff --git a/oh_employee_documents_expiry/static/description/HRMS-BUTTON.png b/oh_employee_documents_expiry/static/description/HRMS-BUTTON.png
deleted file mode 100644
index 0f1b65bea..000000000
Binary files a/oh_employee_documents_expiry/static/description/HRMS-BUTTON.png and /dev/null differ
diff --git a/oh_employee_documents_expiry/static/description/banner.jpg b/oh_employee_documents_expiry/static/description/banner.jpg
deleted file mode 100644
index b9b6de033..000000000
Binary files a/oh_employee_documents_expiry/static/description/banner.jpg and /dev/null differ
diff --git a/oh_employee_documents_expiry/static/description/cybro-service.png b/oh_employee_documents_expiry/static/description/cybro-service.png
deleted file mode 100644
index 252929a86..000000000
Binary files a/oh_employee_documents_expiry/static/description/cybro-service.png and /dev/null differ
diff --git a/oh_employee_documents_expiry/static/description/cybro_logo.png b/oh_employee_documents_expiry/static/description/cybro_logo.png
deleted file mode 100644
index bb309114c..000000000
Binary files a/oh_employee_documents_expiry/static/description/cybro_logo.png and /dev/null differ
diff --git a/oh_employee_documents_expiry/static/description/document_form.png b/oh_employee_documents_expiry/static/description/document_form.png
deleted file mode 100644
index 5c570a339..000000000
Binary files a/oh_employee_documents_expiry/static/description/document_form.png and /dev/null differ
diff --git a/oh_employee_documents_expiry/static/description/email.png b/oh_employee_documents_expiry/static/description/email.png
deleted file mode 100644
index 90b70be6c..000000000
Binary files a/oh_employee_documents_expiry/static/description/email.png and /dev/null differ
diff --git a/oh_employee_documents_expiry/static/description/icon.png b/oh_employee_documents_expiry/static/description/icon.png
deleted file mode 100644
index 0bfe48f4d..000000000
Binary files a/oh_employee_documents_expiry/static/description/icon.png and /dev/null differ
diff --git a/oh_employee_documents_expiry/static/description/index.html b/oh_employee_documents_expiry/static/description/index.html
deleted file mode 100644
index 8e77b0df3..000000000
--- a/oh_employee_documents_expiry/static/description/index.html
+++ /dev/null
@@ -1,128 +0,0 @@
-<section class="oe_container bg-gray-lighter" xmlns="http://www.w3.org/1999/html">
-    <div class="oe_row">
-        <div class="oe_span">
-            <h2 class="oe_slogan">Open HRMS</h2>
-            <h3 class="oe_slogan">Most advanced open source HR management software</h3>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced oe_mt32">
-        <div class="oe_span">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <a href="https://www.openhrms.com/#request-demo">
-                    <img src="HRMS-BUTTON.png">
-                </a>
-            </div>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-        <h2 class="oe_slogan">OHRMS Employee Documents</h2>
-        <h3 class="oe_slogan">Manages Employee Related Documents</h3>
-        <h4 class="oe_slogan"><a href="https://www.cybrosys.com">Cybrosys Technologies</a> </h4>
-    </div>
-    <div class="oe_row oe_spaced" style="padding-left:65px;">
-        <h4>Features:</h4>
-        <div>
-            <span style="color:green;"> &#9745; </span> Managing Documents of Employees.<br/>
-            <span style="color:green;"> &#9745; </span> Documents Types.<br/>
-            <span style="color:green;"> &#9745; </span> Expiry Date for Documents.<br/>
-            <span style="color:green;"> &#9745; </span> Validation for Expiry Date.<br/>
-            <span style="color:green;"> &#9745; </span> Mail Notification Based on Expiry Date.<br/>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-        <div class="oe_picture">
-            <h3 class="oe_slogan">Overview</h3>
-            <p class="oe_mt32" style="text-align: justify;">
-Each and every detail associated with an employee is useful for any organization for better Human resource management.
-                So the employee documents with such necessary information must be saved and used accordingly.
-                'Employee Documents' is a useful tool that can help you to store and manage the employee related
-                documents like certificates, appraisal reports, passport, license etc.
-The application also allows you to set an alert message on reaching the expiration/any other
-                related dates of a document (like an expiration of passport)
-            </p>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-        <div style="text-align: center">
-            <p>
-                <h4>Documents Super Button</h4>
-            <p>
-        </div>
-        <div style="text-align: center">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <img style="border:10px solid white;height: 400px;" src="oh_employee_fom.png">
-            </div>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-        <h3 class="oe_slogan">Documents Form</h3>
-        <div style="text-align: center">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <img style="border:10px solid white;height: 400px;" src="oh_document_form.png">
-            </div>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-        <h3 class="oe_slogan">Notification Mail for Expiry Doc</h3>
-        <div style="text-align: center">
-            <div class="oe_span12">
-                 <div class="oe_demo oe_picture oe_screenshot">
-                    <img style="border:10px solid white;" src="email.png">
-                </div>
-            </div>
-        </div>
-    </div>
-</section>
-
-<div class="row section-content">
-    <div class="col-md-6 img-content">
-        <h3>Our Odoo Services</h3>
-    </div>
-    <div class="bc-span col-md-12">
-        <div class="inner-span">
-            <a target="_blank" href="https://www.openhrms.com">
-                <img class="img-border img-responsive thumbnail" src="cybro-service.png">
-            </a>
-        </div>
-    </div>
-</div>
-
-<section class="oe_container">
-    <h2 class="oe_slogan" style="margin-top:20px;" >Need Any Help?</h2>
-    <div class="oe_slogan" style="margin-top:10px !important;">
-        <div>
-            <a  class="btn btn-primary btn-lg mt8"
-            style="color: #FFFFFF !important;border-radius: 0;" href="https://www.cybrosys.com"><i
-            class="fa fa-envelope"></i> Email </a> <a
-            class="btn btn-primary btn-lg mt8" style="color: #FFFFFF !important;border-radius: 0;"
-            href="https://www.cybrosys.com/contact/"><i
-            class="fa fa-phone"></i> Contact Us </a> <a
-            class="btn btn-primary btn-lg mt8" style="color: #FFFFFF !important;border-radius: 0;"
-            href="https://www.cybrosys.com/odoo-customization-and-installation/"><i
-            class="fa fa-check-square"></i> Request Customization </a>
-        </div>
-        <br>
-        <img src="cybro_logo.png" style="width: 190px; margin-bottom: 20px;" class="center-block">
-    </div>
-</section>
-
-
-
diff --git a/oh_employee_documents_expiry/static/description/oh_document_form.png b/oh_employee_documents_expiry/static/description/oh_document_form.png
deleted file mode 100644
index 594c65059..000000000
Binary files a/oh_employee_documents_expiry/static/description/oh_document_form.png and /dev/null differ
diff --git a/oh_employee_documents_expiry/static/description/oh_employee_fom.png b/oh_employee_documents_expiry/static/description/oh_employee_fom.png
deleted file mode 100644
index 53e0af5aa..000000000
Binary files a/oh_employee_documents_expiry/static/description/oh_employee_fom.png and /dev/null differ
diff --git a/oh_employee_documents_expiry/views/employee_check_list_view.xml b/oh_employee_documents_expiry/views/employee_check_list_view.xml
deleted file mode 100644
index eb702bb92..000000000
--- a/oh_employee_documents_expiry/views/employee_check_list_view.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <record model='ir.ui.view' id='employee_check_list_form_view'>
-        <field name="name">employee.checklist.form</field>
-        <field name="model">employee.checklist</field>
-        <field name="arch" type="xml">
-            <form string="Checklist">
-                <sheet>
-                    <group>
-                        <field name="name"/>
-                        <field name="document_type"/>
-                    </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 model='ir.ui.view' id='employee_check_list_tree_view'>
-        <field name="name">employee.checklist.tree</field>
-        <field name="model">employee.checklist</field>
-        <field name="arch" type="xml">
-            <tree>
-                <field name="name"/>
-                <field name="document_type"/>
-            </tree>
-        </field>
-    </record>
-</odoo>
\ No newline at end of file
diff --git a/oh_employee_documents_expiry/views/employee_document_view.xml b/oh_employee_documents_expiry/views/employee_document_view.xml
deleted file mode 100644
index 7695a396d..000000000
--- a/oh_employee_documents_expiry/views/employee_document_view.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <record model="ir.cron" id="employee_data_reminder">
-        <field name="name">HR Employee Data Expiration</field>
-        <field name="interval_number">1</field>
-        <field name="interval_type">days</field>
-        <field name="numbercall">-1</field>
-        <field name="doall" eval="False"/>
-        <field name="model" eval="'hr.employee.document'"/>
-        <field name="function" eval="'mail_reminder'"/>
-        <field name="args" eval="'()'" />
-    </record>
-
-    <record model='ir.ui.view' id='employee_document_form_view'>
-        <field name="name">hr.employee.document.form</field>
-        <field name="model">hr.employee.document</field>
-        <field name="arch" type="xml">
-            <form>
-                <sheet>
-                    <group>
-                        <group>
-                            <field name="name"/>
-                            <field name="document_name"/>
-                            <field name="doc_attachment_id" widget="many2many_binary" class="oe_inline"/>
-                            <field name="employee_ref" invisible="1"/>
-                        </group>
-                        <group>
-                            <field name="issue_date"/>
-                            <field name="expiry_date"/>
-                        </group>
-                    </group>
-                    <notebook>
-                        <page string="Description">
-                            <field name="description"/>
-                        </page>
-                    </notebook>
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-    <record model='ir.ui.view' id='employee_document_tree_view'>
-        <field name="name">hr.employee.document.tree</field>
-        <field name="model">hr.employee.document</field>
-        <field name="arch" type="xml">
-            <tree>
-                <field name="name"/>
-                <field name="issue_date"/>
-                <field name="expiry_date"/>
-            </tree>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="hr_employee_document_inherit_form_view">
-        <field name="name">hr.employee.form.view</field>
-        <field name="model">hr.employee</field>
-        <field name="inherit_id" ref="hr.view_employee_form"/>
-        <field name="arch" type="xml">
-            <div class="oe_button_box" position="inside">
-                <button class="oe_stat_button" name="document_view" type="object" icon="fa-list-ol">
-                    <field string="Documents" name="document_count" widget="statinfo"/>
-                </button>
-            </div>
-        </field>
-    </record>
-</odoo>
\ No newline at end of file
diff --git a/oh_hr_lawsuit_management/README.md b/oh_hr_lawsuit_management/README.md
deleted file mode 100644
index b0093d442..000000000
--- a/oh_hr_lawsuit_management/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-OHRMS Legal Actions
----------------------
-Supporting Addon for Open HRMS, Managing Legal Actions
-
-Connect with experts
---------------------
-
-If you have any question/queries/additional works on OpenHRMS or this module, You can drop an email directly to Cybrosys.
-
-Contacts
---------
-info - info@cybrosys.com
-Jesni Banu - jesni@cybrosys.in
-
-Website:
-https://www.openhrms.com
-https://www.cybrosys.com
diff --git a/oh_hr_lawsuit_management/__init__.py b/oh_hr_lawsuit_management/__init__.py
deleted file mode 100644
index b3d73d4fb..000000000
--- a/oh_hr_lawsuit_management/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Jesni Banu (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from . import models
-
diff --git a/oh_hr_lawsuit_management/__manifest__.py b/oh_hr_lawsuit_management/__manifest__.py
deleted file mode 100644
index 9cd0c70bd..000000000
--- a/oh_hr_lawsuit_management/__manifest__.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Jesni Banu (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-{
-    'name': 'Open HRMS Legal Actions',
-    'version': '10.0.1.1.0',
-    'summary': """Managing Legal Actions""",
-    'description': 'This module manages legal actions.',
-    'category': 'Generic Modules/Human Resources',
-    'author': 'Cybrosys Techno Solutions',
-    'company': 'Cybrosys Techno Solutions',
-    'website': "https://www.openhrms.com",
-    'depends': ['base', 'hr'],
-    'data': [
-        'security/security.xml',
-        'security/ir.model.access.csv',
-        'views/legal_action_view.xml',
-    ],
-    'demo': [],
-    'images': ['static/description/banner.jpg'],
-    'license': 'AGPL-3',
-    'installable': True,
-    'auto_install': False,
-    'application': False,
-}
diff --git a/oh_hr_lawsuit_management/doc/RELEASE_NOTES.md b/oh_hr_lawsuit_management/doc/RELEASE_NOTES.md
deleted file mode 100644
index a2801cf34..000000000
--- a/oh_hr_lawsuit_management/doc/RELEASE_NOTES.md
+++ /dev/null
@@ -1,11 +0,0 @@
-## Module <oh_hr_lawsuit_management>
-
-#### 07.04.2018
-#### Version 10.0.1.1.0
-##### CHG
-- Index updated
-
-#### 30.03.2018
-#### Version 10.0.1.0.0
-##### ADD
-- Initial commit for Open HRMS Project
diff --git a/oh_hr_lawsuit_management/models/__init__.py b/oh_hr_lawsuit_management/models/__init__.py
deleted file mode 100644
index fa4f1ea58..000000000
--- a/oh_hr_lawsuit_management/models/__init__.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Jesni Banu (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from . import legal
-
-
-
-
diff --git a/oh_hr_lawsuit_management/models/legal.py b/oh_hr_lawsuit_management/models/legal.py
deleted file mode 100644
index f7f51a9a7..000000000
--- a/oh_hr_lawsuit_management/models/legal.py
+++ /dev/null
@@ -1,128 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Jesni Banu (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-from datetime import datetime
-from odoo import models, fields, api, _
-
-
-class HrLawsuit(models.Model):
-    _name = 'hr.lawsuit'
-    _description = 'Hr Lawsuit Management'
-    _inherit = ['mail.thread', 'ir.needaction_mixin']
-
-    @api.model
-    def create(self, vals):
-        vals['name'] = self.env['ir.sequence'].next_by_code('hr.lawsuit')
-        return super(HrLawsuit, self).create(vals)
-
-    @api.multi
-    def won(self):
-        self.state = 'won'
-
-    @api.multi
-    def cancel(self):
-        self.state = 'cancel'
-
-    @api.multi
-    def loss(self):
-        self.state = 'fail'
-
-    @api.multi
-    def process(self):
-        self.state = 'running'
-
-    @api.depends('party2', 'employee_id')
-    def set_party2(self):
-        for each in self:
-            if each.party2 == 'employee':
-                each.party2_name = each.employee_id.name
-
-    name = fields.Char(string='Code', copy=False)
-    company_id = fields.Many2one('res.company', 'Company', readonly=True,
-                                 default=lambda self: self.env.user.company_id)
-    requested_date = fields.Date(string='Date', copy=False, readonly=1, default=datetime.now(),
-                                 states={'draft': [('readonly', False)]})
-    court_name = fields.Char(string='Court Name', track_visibility='always',
-                             states={'won': [('readonly', True)]})
-    judge = fields.Char(string='Judge', track_visibility='always', states={'won': [('readonly', True)]})
-    lawyer = fields.Char(string='Lawyer', track_visibility='always', states={'won': [('readonly', True)]})
-    party1 = fields.Many2one('res.company', string='Party 1', required=1, readonly=1,
-                             states={'draft': [('readonly', False)]})
-    party2 = fields.Selection([('employee', 'Employee')], default='employee',
-                              string='Party 2', required=1, readonly=1, states={'draft': [('readonly', False)]})
-    employee_id = fields.Many2one('hr.employee', string='Employee', copy=False,
-                                  readonly=1, states={'draft': [('readonly', False)]})
-    party2_name = fields.Char(compute='set_party2', string='Name', store=True)
-    case_details = fields.Html(string='Case Details', copy=False, track_visibility='always')
-    state = fields.Selection([('draft', 'Draft'),
-                              ('running', 'Running'),
-                              ('cancel', 'Cancelled'),
-                              ('fail', 'Failed'),
-                              ('won', 'Won')], string='Status',
-                             default='draft', track_visibility='always', copy=False)
-
-
-class HrLegalEmployeeMaster(models.Model):
-    _inherit = 'hr.employee'
-
-    legal_count = fields.Integer(compute='_legal_count', string='# Legal Actions')
-
-    @api.multi
-    def _legal_count(self):
-        for each in self:
-            legal_ids = self.env['hr.lawsuit'].search([('employee_id', '=', each.id)])
-            each.legal_count = len(legal_ids)
-
-    @api.multi
-    def legal_view(self):
-        for each1 in self:
-            legal_obj = self.env['hr.lawsuit'].sudo().search([('employee_id', '=', each1.id)])
-            legal_ids = []
-            for each in legal_obj:
-                legal_ids.append(each.id)
-            view_id = self.env.ref('oh_hr_lawsuit_management.hr_lawsuit_form_view').id
-            if legal_ids:
-                if len(legal_ids) <= 1:
-                    value = {
-                        'view_type': 'form',
-                        'view_mode': 'form',
-                        'res_model': 'hr.lawsuit',
-                        'view_id': view_id,
-                        'type': 'ir.actions.act_window',
-                        'name': _('Legal Actions'),
-                        'res_id': legal_ids and legal_ids[0]
-                    }
-                else:
-                    value = {
-                        'domain': str([('id', 'in', legal_ids)]),
-                        'view_type': 'form',
-                        'view_mode': 'tree,form',
-                        'res_model': 'hr.lawsuit',
-                        'view_id': False,
-                        'type': 'ir.actions.act_window',
-                        'name': _('Legal Actions'),
-                        'res_id': legal_ids
-                    }
-
-                return value
-
-
diff --git a/oh_hr_lawsuit_management/security/ir.model.access.csv b/oh_hr_lawsuit_management/security/ir.model.access.csv
deleted file mode 100644
index 4174bb79a..000000000
--- a/oh_hr_lawsuit_management/security/ir.model.access.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_lawsuit_manager","hr.access_hr_lawsuit_manager","model_hr_lawsuit","oh_hr_lawsuit_management.lawsuit_group_manager",1,1,1,1
-"access_hr_lawsuit_manager1","hr.access_hr_lawsuit_manager","model_hr_lawsuit",,1,0,0,0
-"access_case_details_manager","hr.access_case_details_manager","model_case_details","oh_hr_lawsuit_management.lawsuit_group_manager",1,1,1,1
-"access_wizard_lawsuit_manager","hr.access_wizard_lawsuit_manager","model_wizard_lawsuit","oh_hr_lawsuit_management.lawsuit_group_manager",1,1,1,1
-"access_account_invoice","hr.access_account_invoice","account.model_account_invoice","oh_hr_lawsuit_management.lawsuit_group_manager",1,0,0,0
diff --git a/oh_hr_lawsuit_management/security/security.xml b/oh_hr_lawsuit_management/security/security.xml
deleted file mode 100644
index 026117cba..000000000
--- a/oh_hr_lawsuit_management/security/security.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" ?>
-<odoo>
-    <data>
-        <record id="module_lawsuit_category" model="ir.module.category">
-            <field name="name">Lawsuit</field>
-            <field name="sequence">18</field>
-        </record>
-
-        <record id="lawsuit_group_manager" model="res.groups">
-            <field name="name">Lawsuit Manager</field>
-            <field name="category_id" ref="module_lawsuit_category"/>
-            <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
-            <field name="users" eval="[(4, ref('base.user_root'))]"/>
-        </record>
-
-        <record model="ir.rule" id="lawsuit_comp_rule">
-            <field name="name">Lawsuit multi-company</field>
-            <field name="model_id" ref="model_hr_lawsuit"/>
-            <field name="global" eval="True"/>
-            <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-        </record>
-
-    </data>
-</odoo>
diff --git a/oh_hr_lawsuit_management/static/description/HRMS-BUTTON.png b/oh_hr_lawsuit_management/static/description/HRMS-BUTTON.png
deleted file mode 100644
index 0f1b65bea..000000000
Binary files a/oh_hr_lawsuit_management/static/description/HRMS-BUTTON.png and /dev/null differ
diff --git a/oh_hr_lawsuit_management/static/description/banner.jpg b/oh_hr_lawsuit_management/static/description/banner.jpg
deleted file mode 100644
index 491e60d5f..000000000
Binary files a/oh_hr_lawsuit_management/static/description/banner.jpg and /dev/null differ
diff --git a/oh_hr_lawsuit_management/static/description/cybro-service.png b/oh_hr_lawsuit_management/static/description/cybro-service.png
deleted file mode 100644
index 252929a86..000000000
Binary files a/oh_hr_lawsuit_management/static/description/cybro-service.png and /dev/null differ
diff --git a/oh_hr_lawsuit_management/static/description/cybro_logo.png b/oh_hr_lawsuit_management/static/description/cybro_logo.png
deleted file mode 100644
index bb309114c..000000000
Binary files a/oh_hr_lawsuit_management/static/description/cybro_logo.png and /dev/null differ
diff --git a/oh_hr_lawsuit_management/static/description/hr_legal.png b/oh_hr_lawsuit_management/static/description/hr_legal.png
deleted file mode 100644
index daeaf9024..000000000
Binary files a/oh_hr_lawsuit_management/static/description/hr_legal.png and /dev/null differ
diff --git a/oh_hr_lawsuit_management/static/description/icon.png b/oh_hr_lawsuit_management/static/description/icon.png
deleted file mode 100644
index cd9a8e82d..000000000
Binary files a/oh_hr_lawsuit_management/static/description/icon.png and /dev/null differ
diff --git a/oh_hr_lawsuit_management/static/description/index.html b/oh_hr_lawsuit_management/static/description/index.html
deleted file mode 100644
index a0dee22de..000000000
--- a/oh_hr_lawsuit_management/static/description/index.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<section class="oe_container ">
-    <div class="oe_row">
-        <h2 class="oe_slogan">OpenHRMS</h2>
-        <h3 class="oe_slogan">Most advanced open source HR management software</h3>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced oe_mt32">
-        <div class="oe_span">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <a href="https://www.openhrms.com/#request-demo">
-                    <img src="HRMS-BUTTON.png">
-                </a>
-                <div class="oe_demo_footer oe_centeralign">Online Demo</div>
-            </div>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-        <h2 class="oe_slogan">OHRMS Legal Actions</h2>
-        <h3 class="oe_slogan">Manages Leagal Actions</h3>
-        <h4 class="oe_slogan"><a href="https://www.cybrosys.com">Cybrosys Technologies</a> </h4>
-    </div>
-    <div class="oe_row oe_spaced" style="padding-left:65px;">
-        <h4>Features:</h4>
-        <div>
-            <span style="color:green;"> &#9745; </span> Managing legal actions.<br/>
-            <span style="color:green;"> &#9745; </span> Allows you to take case reports.<br/>
-            <span style="color:green;"> &#9745; </span> Option to followup each case.<br/>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-        <div class="oe_picture">
-            <h3 class="oe_slogan">Overview</h3>
-            <p class="oe_mt32 text-justify" style="text-align: center;">
-                This module managing all legal actions of employees, customer and suppliers.
-            </p>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-        <div class="oe_span12">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <img style="border:8px solid white;" src="hr_legal.png">
-            </div>
-        </div>
-    </div>
-</section>
-
-<div class="row section-content">
-    <div class="col-md-6 img-content">
-        <h3>Our Odoo Services</h3>
-    </div>
-    <div class="bc-span col-md-12">
-        <div class="inner-span">
-            <a target="_blank" href="https://www.openhrms.com">
-                <img class="img-border img-responsive thumbnail" src="cybro-service.png">
-            </a>
-        </div>
-    </div>
-</div>
-
-<section class="oe_container">
-    <h2 class="oe_slogan" style="margin-top:20px;" >Need Any Help?</h2>
-    <div class="oe_slogan" style="margin-top:10px !important;">
-        <div>
-            <a  class="btn btn-primary btn-lg mt8"
-            style="color: #FFFFFF !important;border-radius: 0;" href="https://www.cybrosys.com"><i
-            class="fa fa-envelope"></i> Email </a> <a
-            class="btn btn-primary btn-lg mt8" style="color: #FFFFFF !important;border-radius: 0;"
-            href="https://www.cybrosys.com/contact/"><i
-            class="fa fa-phone"></i> Contact Us </a> <a
-            class="btn btn-primary btn-lg mt8" style="color: #FFFFFF !important;border-radius: 0;"
-            href="https://www.cybrosys.com/odoo-customization-and-installation/"><i
-            class="fa fa-check-square"></i> Request Customization </a>
-        </div>
-        <br>
-        <img src="cybro_logo.png" style="width: 190px; margin-bottom: 20px;" class="center-block">
-    </div>
-</section>
-
diff --git a/oh_hr_lawsuit_management/views/legal_action_view.xml b/oh_hr_lawsuit_management/views/legal_action_view.xml
deleted file mode 100644
index 532d90f10..000000000
--- a/oh_hr_lawsuit_management/views/legal_action_view.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<odoo>
-    <data>
-        <record id="lawsuit_seq" model="ir.sequence">
-            <field name="name">Lawsuit Code</field>
-            <field name="code">hr.lawsuit</field>
-            <field name="prefix">LC</field>
-            <field eval="4" name="padding"/>
-        </record>
-
-        <record model='ir.ui.view' id='hr_lawsuit_form_view'>
-            <field name="name">hr.lawsuit.form</field>
-            <field name="model">hr.lawsuit</field>
-            <field name="arch" type="xml">
-                <form string="Legal Actions">
-                    <header>
-                        <button name="process" string="Process" type="object" states="draft"/>
-                        <button name="won" string="Won" type="object" states="running"/>
-                        <button name="loss" string="Loss" type="object" states="running"/>
-                        <button name="cancel" string="Cancel" type="object" states="running,draft"/>
-                        <field name="state" widget="statusbar" statusbar_visible="draft,running,won"/>
-                    </header>
-                    <sheet>
-                        <label for="name" class="oe_edit_only"/>
-                        <h1>
-                            <field name="name" readonly="1"/>
-                        </h1>
-                        <group>
-                            <group>
-                                <field name="party1"/>
-                                <field name="party2_name" invisible="1"/>
-                                <field name="party2"/>
-                                <field name="employee_id" attrs="{'invisible': [('party2','!=','employee')],
-                                                                  'required': [('party2','=','employee')]}"/>
-                                <field name="court_name"/>
-                                <field name="judge"/>
-                                <field name="lawyer"/>
-                                <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/>
-                            </group>
-                            <group>
-                                <field name="requested_date"/>
-                            </group>
-                        </group>
-                        <notebook>
-                            <page name="case_desc" string="Case Details">
-                                <field name="case_details"/>
-                            </page>
-                        </notebook>
-                    </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 model='ir.ui.view' id='hr_lawsuit_tree_view'>
-            <field name="name">hr.lawsuit.tree</field>
-            <field name="model">hr.lawsuit</field>
-            <field name="arch" type="xml">
-                <tree>
-                    <field name="name"/>
-                    <field name="party1"/>
-                    <field name="party2"/>
-                    <field name="party2_name"/>
-                    <field name="court_name"/>
-                    <field name="judge"/>
-                    <field name="lawyer"/>
-                    <field name="requested_date"/>
-                    <field name="state"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model='ir.ui.view' id='hr_lawsuit_search_view'>
-            <field name="name">hr.lawsuit.search</field>
-            <field name="model">hr.lawsuit</field>
-            <field name="arch" type="xml">
-                <search string="Legal Actions">
-                    <field name="name"/>
-                    <field name="party1"/>
-                    <field name="party2"/>
-                    <field name="court_name"/>
-                    <field name="judge"/>
-                    <field name="lawyer"/>
-                    <field name="requested_date"/>
-                    <field name="state"/>
-                    <separator/>
-                    <group expand="0" string="Group By">
-                        <filter string="Status" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Employee" domain="[]" context="{'group_by':'employee_id'}"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
-        <record id="action_hr_lawsuit" model="ir.actions.act_window">
-            <field name="name">Legal Management</field>
-            <field name="res_model">hr.lawsuit</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="search_view_id" ref="hr_lawsuit_search_view"/>
-            <field name="help" type="html">
-                <p class="oe_view_nocontent_create">
-                    Click to Create a New Record.
-                </p>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="legal_hr_employee_inherit_form_view">
-            <field name="name">hr.employee.form.inherit.view</field>
-            <field name="model">hr.employee</field>
-            <field name="inherit_id" ref="hr.view_employee_form"/>
-            <field name="arch" type="xml">
-                <div class="oe_button_box" position="inside">
-                    <button class="oe_stat_button" name="legal_view" type="object" icon="fa-exclamation-circle">
-                        <field string="Legal Actions" name="legal_count" widget="statinfo"/>
-                    </button>
-                </div>
-            </field>
-        </record>
-
-        <menuitem id="hr_lawsuit_menu"
-                  name="Legal Department" parent="hr.menu_hr_root" sequence="17" groups="lawsuit_group_manager"/>
-
-        <menuitem id="hr_lawsuit_sub_menu" parent="hr_lawsuit_menu" action="action_hr_lawsuit"
-                  name="Legal Actions" sequence="1" groups="lawsuit_group_manager"/>
-    </data>
-</odoo>
\ No newline at end of file
diff --git a/ohrms_loan/README.md b/ohrms_loan/README.md
deleted file mode 100644
index e292e7dce..000000000
--- a/ohrms_loan/README.md
+++ /dev/null
@@ -1,35 +0,0 @@
-Open HRMS Loan Management
-=========================
-
-Manage Loan Requests.
-
-
-Installation
-============
-- www.odoo.com/documentation/10.0/setup/install.html
-- Install our custom addon
-
-License
-=======
-GNU AFFERO GENERAL PUBLIC LICENSE, Version 3 (AGPLv3)
-(http://www.gnu.org/licenses/agpl.html)
-
-Bug Tracker
-===========
-Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported.
-
-Credits
-=======
-* Cybrosys Techno Solutions <https://www.cybrosys.com>
-
-Author
-------
-
-Developers: Anusha P P <anusha@cybrosys.in>
-
-Maintainer
-----------
-
-This module is maintained by Cybrosys Technologies.
-
-For support and more information, please visit https://www.cybrosys.com.
diff --git a/ohrms_loan/__init__.py b/ohrms_loan/__init__.py
deleted file mode 100644
index 268881c69..000000000
--- a/ohrms_loan/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# -*- coding: utf-8 -*-
-import models
-
diff --git a/ohrms_loan/__manifest__.py b/ohrms_loan/__manifest__.py
deleted file mode 100644
index 76478a147..000000000
--- a/ohrms_loan/__manifest__.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of OpenHRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Anusha P P (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-{
-    'name': 'Open HRMS Loan Management',
-    'version': '10.0.2.0.0',
-    'summary': 'Manage Loan Requests',
-    'description': """
-        Helps you to manage Loan Requests of your company's staff.
-        """,
-    'category': 'Human Resources',
-    'author': "Cybrosys Techno Solutions",
-    'company': 'Cybrosys Techno Solutions',
-    'maintainer': 'Cybrosys Techno Solutions',
-    'website': "https://www.openhrms.com",
-    'depends': [
-        'base', 'hr_payroll', 'hr', 'account',
-    ],
-    'data': [
-        'security/ir.model.access.csv',
-        'security/security.xml',
-        'views/hr_loan_seq.xml',
-        'data/salary_rule_loan.xml',
-        'views/hr_loan.xml',
-        'views/hr_payroll.xml',
-    ],
-    'demo': [],
-    'images': ['static/description/banner.jpg'],
-    'license': 'AGPL-3',
-    'installable': True,
-    'auto_install': False,
-    'application': False,
-}
diff --git a/ohrms_loan/data/salary_rule_loan.xml b/ohrms_loan/data/salary_rule_loan.xml
deleted file mode 100644
index 0e3ed6004..000000000
--- a/ohrms_loan/data/salary_rule_loan.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-	<!--Adding a salary rule for loan-->
-	<data noupdate="0">
-		<record id="hr_rule_loan" model="hr.salary.rule">
-			<field name="name">Loan</field>
-			<field name="sequence" eval="100"/>
-			<field name="code">LO</field>
-			<field name="category_id" ref="hr_payroll.DED"/>
-			<field name="condition_select">none</field>
-			<field name="amount_select">code</field>
-			<field name="amount_python_compute">result = -payslip.total_paid</field>
-		</record>
-
-	</data>
-</odoo>
diff --git a/ohrms_loan/doc/RELEASE_NOTES.md b/ohrms_loan/doc/RELEASE_NOTES.md
deleted file mode 100644
index e137010ca..000000000
--- a/ohrms_loan/doc/RELEASE_NOTES.md
+++ /dev/null
@@ -1,12 +0,0 @@
-## Module <ohrms_loan>
-
-#### 09.04.2018
-#### Version 10.0.2.0.0
-##### CHG
-- file name changed.
-- fields removed.
-
-#### 30.03.2018
-#### Version 10.0.1.0.0
-##### ADD
-- Initial commit for Open HRMS Project
diff --git a/ohrms_loan/models/__init__.py b/ohrms_loan/models/__init__.py
deleted file mode 100644
index aacd08ad3..000000000
--- a/ohrms_loan/models/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- coding: utf-8 -*-
-import hr_loan
-import hr_payroll
-
diff --git a/ohrms_loan/models/hr_loan.py b/ohrms_loan/models/hr_loan.py
deleted file mode 100644
index bdf266210..000000000
--- a/ohrms_loan/models/hr_loan.py
+++ /dev/null
@@ -1,125 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from odoo import models, fields, api
-from datetime import datetime
-from dateutil.relativedelta import relativedelta
-from odoo.exceptions import except_orm
-
-
-class HrLoan(models.Model):
-    _name = 'hr.loan'
-    _inherit = ['mail.thread', 'ir.needaction_mixin']
-    _description = "Loan Request"
-
-    @api.one
-    def _compute_loan_amount(self):
-        total_paid = 0.0
-        for loan in self:
-            for line in loan.loan_lines:
-                if line.paid:
-                    total_paid += line.amount
-            balance_amount = loan.loan_amount - total_paid
-            self.total_amount = loan.loan_amount
-            self.balance_amount = balance_amount
-            self.total_paid_amount = total_paid
-
-    name = fields.Char(string="Loan Name", default="/", readonly=True)
-    date = fields.Date(string="Date", default=fields.Date.today(), readonly=True)
-    employee_id = fields.Many2one('hr.employee', string="Employee", required=True)
-    department_id = fields.Many2one('hr.department', related="employee_id.department_id", readonly=True,
-                                    string="Department")
-    installment = fields.Integer(string="No Of Installments", default=1)
-    payment_date = fields.Date(string="Payment Start Date", required=True, default=fields.Date.today())
-    loan_lines = fields.One2many('hr.loan.line', 'loan_id', string="Loan Line", index=True)
-    emp_account_id = fields.Many2one('account.account', string="Loan Account")
-    treasury_account_id = fields.Many2one('account.account', string="Treasury Account")
-    journal_id = fields.Many2one('account.journal', string="Journal")
-    company_id = fields.Many2one('res.company', 'Company', readonly=True,
-                                 default=lambda self: self.env.user.company_id,
-                                 states={'draft': [('readonly', False)]})
-    currency_id = fields.Many2one('res.currency', string='Currency', required=True,
-                                  default=lambda self: self.env.user.company_id.currency_id)
-    job_position = fields.Many2one('hr.job', related="employee_id.job_id", readonly=True, string="Job Position")
-    loan_amount = fields.Float(string="Loan Amount", required=True)
-    total_amount = fields.Float(string="Total Amount", readonly=True, compute='_compute_loan_amount')
-    balance_amount = fields.Float(string="Balance Amount", compute='_compute_loan_amount')
-    total_paid_amount = fields.Float(string="Total Paid Amount", compute='_compute_loan_amount')
-
-    state = fields.Selection([
-        ('draft', 'Draft'),
-        ('waiting_approval_1', 'Submitted'),
-        ('waiting_approval_2', 'Waiting Approval'),
-        ('approve', 'Approved'),
-        ('refuse', 'Refused'),
-        ('cancel', 'Canceled'),
-    ], string="State", default='draft', track_visibility='onchange', copy=False, )
-
-    @api.model
-    def create(self, values):
-        loan_count = self.env['hr.loan'].search_count([('employee_id', '=', values['employee_id']), ('state', '=', 'approve'),
-                                                       ('balance_amount', '!=', 0)])
-        if loan_count:
-            raise except_orm('Error!', 'The employee has already a pending installment')
-        else:
-            values['name'] = self.env['ir.sequence'].get('hr.loan.seq') or ' '
-            res = super(HrLoan, self).create(values)
-            return res
-
-    @api.multi
-    def action_refuse(self):
-        return self.write({'state': 'refuse'})
-
-    @api.multi
-    def action_submit(self):
-        self.write({'state': 'waiting_approval_1'})
-
-    @api.multi
-    def action_cancel(self):
-        self.write({'state': 'cancel'})
-
-    @api.multi
-    def action_approve(self):
-        self.write({'state': 'approve'})
-
-    @api.multi
-    def compute_installment(self):
-        """This automatically create the installment the employee need to pay to
-        company based on payment start date and the no of installments.
-            """
-        for loan in self:
-            date_start = datetime.strptime(loan.payment_date, '%Y-%m-%d')
-            amount = loan.loan_amount / loan.installment
-            for i in range(1, loan.installment + 1):
-                self.env['hr.loan.line'].create({
-                    'date': date_start,
-                    'amount': amount,
-                    'employee_id': loan.employee_id.id,
-                    'loan_id': loan.id})
-                date_start = date_start + relativedelta(months=1)
-        return True
-
-
-class InstallmentLine(models.Model):
-    _name = "hr.loan.line"
-    _description = "Installment Line"
-
-    date = fields.Date(string="Payment Date", required=True)
-    employee_id = fields.Many2one('hr.employee', string="Employee")
-    amount = fields.Float(string="Amount", required=True)
-    paid = fields.Boolean(string="Paid")
-    loan_id = fields.Many2one('hr.loan', string="Loan Ref.")
-    payslip_id = fields.Many2one('hr.payslip', string="Payslip Ref.")
-
-
-class HrEmployee(models.Model):
-    _inherit = "hr.employee"
-
-    @api.one
-    def _compute_employee_loans(self):
-        """This compute the loan amount and total loans count of an employee.
-            """
-        self.loan_count = self.env['hr.loan'].search_count([('employee_id', '=', self.id)])
-
-    loan_count = fields.Integer(string="Loan Count", compute='_compute_employee_loans')
-
-
diff --git a/ohrms_loan/models/hr_payroll.py b/ohrms_loan/models/hr_payroll.py
deleted file mode 100644
index 4aca27237..000000000
--- a/ohrms_loan/models/hr_payroll.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-from odoo import models, fields, api
-
-
-class HrPayslip(models.Model):
-    _inherit = 'hr.payslip'
-
-    @api.one
-    def compute_total_paid(self):
-        """This compute the total paid amount of Loan.
-            """
-        total = 0.0
-        for line in self.loan_ids:
-            if line.paid:
-                total += line.amount
-        self.total_paid = total
-
-    loan_ids = fields.One2many('hr.loan.line', 'payslip_id', string="Loans")
-    total_paid = fields.Float(string="Total Loan Amount", compute='compute_total_paid')
-
-    @api.multi
-    def get_loan(self):
-        """This gives the installment lines of an employee where the state is not in paid.
-            """
-        loan_list = []
-        loan_ids = self.env['hr.loan.line'].search([('employee_id', '=', self.employee_id.id), ('paid', '=', False)])
-        for loan in loan_ids:
-            if loan.loan_id.state == 'approve':
-                loan_list.append(loan.id)
-        self.loan_ids = loan_list
-        return loan_list
-
-    @api.multi
-    def action_payslip_done(self):
-        loan_list = []
-        for line in self.loan_ids:
-            if line.paid:
-                loan_list.append(line.id)
-            else:
-                line.payslip_id = False
-        self.loan_ids = loan_list
-        return super(HrPayslip, self).action_payslip_done()
diff --git a/ohrms_loan/security/ir.model.access.csv b/ohrms_loan/security/ir.model.access.csv
deleted file mode 100644
index e5b282ebc..000000000
--- a/ohrms_loan/security/ir.model.access.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_hr_loan_user,hr.loan.group_user,model_hr_loan,base.group_user,1,1,1,0
-access_hr_loan_line_user,hr.loan.line.group_user,model_hr_loan_line,base.group_user,1,1,0,0
-access_hr_loan_officer,hr.loan.group_hr_user,model_hr_loan,hr.group_hr_user,1,1,1,1
-access_hr_loan_line_officer,hr.loan.line.group_hr_user,model_hr_loan_line,hr.group_hr_user,1,1,1,1
-access_account_move_uinvoice_officer,account.move.group_hr_user,account.model_account_move,hr.group_hr_user,1,1,1,1
-access_account_journal_uinvoice_officer,account.journal.group_hr_user,account.model_account_journal,hr.group_hr_user,1,1,1,1
-acces_account_move_line_officer,account.move.line.group_hr_user,account.model_account_move_line,hr.group_hr_user,1,1,1,1
-acces_ account_account_type_officer, account.account.type.group_hr_user,account.model_account_account_type,hr.group_hr_user,1,1,1,1
-access_hr_loan_manager,hr.loan,model_hr_loan,hr.group_hr_manager,1,1,1,1
-access_hr_loan_line_manager,hr.loan.line,model_hr_loan_line,hr.group_hr_manager,1,1,1,1
-access_account_move_uinvoice_manager,account.move,account.model_account_move,hr.group_hr_manager,1,1,1,1
-access_account_journal_uinvoice_manager,account.journal,account.model_account_journal,hr.group_hr_manager,1,1,1,1
-acces_account_move_line_manager,account.move.line,account.model_account_move_line,hr.group_hr_manager,1,1,1,1
-acces_ account_account_type_manager, account.account.type,account.model_account_account_type,hr.group_hr_manager,1,1,1,1
-access_hr_loan_accountant,hr.loan,model_hr_loan,account.group_account_user,1,1,1,0
-access_hr_loan_line_accountant,hr.loan.line,model_hr_loan_line,account.group_account_user,1,1,1,0
\ No newline at end of file
diff --git a/ohrms_loan/security/security.xml b/ohrms_loan/security/security.xml
deleted file mode 100644
index 5a99058e7..000000000
--- a/ohrms_loan/security/security.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <record id="rule_hr_loan" model="ir.rule">
-            <field name="name">Loan Request Multi Company</field>
-            <field name="model_id" ref="model_hr_loan"/>
-            <field eval="True" name="global"/>
-            <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-         </record>
-
-        <record id="hr_loan_manager_rule" model="ir.rule">
-            <field name="name">Loan Forms 4</field>
-            <field name="model_id" ref="model_hr_loan"/>
-            <field name="groups" eval="[(4, ref('hr.group_hr_user')),(4, ref('account.group_account_user'))]"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
-        </record>
-
-
-        <record id="hr_loan_rule" model="ir.rule">
-            <field name="name">Loan Forms</field>
-            <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
-            <field name="global" eval="True"/>
-            <field name="model_id" ref="model_hr_loan"/>
-            <field name="groups" eval="[(4,ref('base.group_user'))]"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
-        </record>
-
-    </data>
-</odoo>
\ No newline at end of file
diff --git a/ohrms_loan/static/description/HRMS-BUTTON.png b/ohrms_loan/static/description/HRMS-BUTTON.png
deleted file mode 100644
index 0f1b65bea..000000000
Binary files a/ohrms_loan/static/description/HRMS-BUTTON.png and /dev/null differ
diff --git a/ohrms_loan/static/description/accounting_validation.png b/ohrms_loan/static/description/accounting_validation.png
deleted file mode 100644
index 134310d78..000000000
Binary files a/ohrms_loan/static/description/accounting_validation.png and /dev/null differ
diff --git a/ohrms_loan/static/description/advance_request_approval.png b/ohrms_loan/static/description/advance_request_approval.png
deleted file mode 100644
index 30d1cc6e4..000000000
Binary files a/ohrms_loan/static/description/advance_request_approval.png and /dev/null differ
diff --git a/ohrms_loan/static/description/banner.jpg b/ohrms_loan/static/description/banner.jpg
deleted file mode 100644
index 4be55a5aa..000000000
Binary files a/ohrms_loan/static/description/banner.jpg and /dev/null differ
diff --git a/ohrms_loan/static/description/cybro-service.png b/ohrms_loan/static/description/cybro-service.png
deleted file mode 100644
index 252929a86..000000000
Binary files a/ohrms_loan/static/description/cybro-service.png and /dev/null differ
diff --git a/ohrms_loan/static/description/cybro_logo.png b/ohrms_loan/static/description/cybro_logo.png
deleted file mode 100644
index bb309114c..000000000
Binary files a/ohrms_loan/static/description/cybro_logo.png and /dev/null differ
diff --git a/ohrms_loan/static/description/icon.png b/ohrms_loan/static/description/icon.png
deleted file mode 100644
index e90809a0f..000000000
Binary files a/ohrms_loan/static/description/icon.png and /dev/null differ
diff --git a/ohrms_loan/static/description/index.html b/ohrms_loan/static/description/index.html
deleted file mode 100644
index 2d97d75ab..000000000
--- a/ohrms_loan/static/description/index.html
+++ /dev/null
@@ -1,160 +0,0 @@
-<section class="oe_container bg-gray-lighter" xmlns="http://www.w3.org/1999/html">
-    <div class="oe_row">
-        <div class="oe_span">
-            <h2 class="oe_slogan">Open HRMS</h2>
-            <h3 class="oe_slogan">Most advanced open source HR management software</h3>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced oe_mt32">
-        <div class="oe_span">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <a href="https://www.openhrms.com/#request-demo">
-                    <img src="HRMS-BUTTON.png">
-                </a>
-            </div>
-        </div>
-
-    </div>
-</section>
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-        <h2 class="oe_slogan">Open HRMS Loan</h2>
-        <h3 class="oe_slogan">Manage Loan request of employees</h3>
-        <h4 class="oe_slogan"><a href="https://www.cybrosys.com">Cybrosys Technologies</a></h4>
-    </div>
-    <div class="oe_row oe_spaced" style="padding-left:65px;">
-        <h4>Features:</h4>
-        <div>
-            <span style="color:green;"> &#9745; </span>Employee can create loan request.<br/>
-            <span style="color:green;"> &#9745; </span>Double layer approval, from Accounting & HR Department.<br/>
-            <span style="color:green;"> &#9745; </span>Loan amount is deducted from the salary.<br/>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-        <div class="" style="text-align: center;">
-            <div class="oe_picture">
-                <h3 class="oe_slogan">Overview</h3>
-                <p class="oe_mt32">
-                    Open HRMS Loan is a component of Open HRMS suit.
-                    Open HRMS Loan module helps the user to  configure different loan policies, assign approval authority, conduct the verification process and sanction loan for employees.
-                </p>
-            </div>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-        <div class="" style="text-align: center;">
-            <h3 class="oe_slogan">Configuration</h3>
-        </div>
-        <div class="" style="text-align: center;">
-            <p>Install the Module "Open HRMS Loan Accounting" in order to enable Accounting Entries.
-                Enable the option "Loan Approval From Accounting Department" In accounting settings</p>
-            <div class="oe_span12">
-                <div class="oe_demo oe_picture oe_screenshot">
-                    <img style="border:10px solid white;" src="accounting_validation.png">
-                </div>
-            </div>
-        </div>
-        <div class="" style="text-align: center;">
-            <p>Add the deduction rule for loan in Salary Structure</p>
-            <div class="oe_span12">
-                <div class="oe_demo oe_picture oe_screenshot">
-                    <img style="border:10px solid white;" src="loan_rule.png">
-                </div>
-            </div>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-    <div class="" style="text-align: center;">
-        <h3 class="oe_slogan">Loan Request</h3>
-         <p>Employee can create loan request</p>
-        <div class="oe_span12">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <img style="border:10px solid white;" src="loan_request.png">
-            </div>
-        </div>
-    </div>
-    </div>
-</section>
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-    <div class="" style="text-align: center;">
-        <h3 class="oe_slogan">Loan Approval</h3>
-        <p>Once the HR department has given the Approval, the accounts department take the decision</p>
-        <div class="oe_span12">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <img style="border:10px solid white;" src="loan_approval.png">
-            </div>
-        </div>
-    </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-    <div class="" style="text-align: center;">
-        <h3 class="oe_slogan">Employee Payslip</h3>
-         <p>When we create the payslip, all the pending installments will be listed there,
-             we can manually select the installments that have to be deducted  from the salary</p>
-        <div class="oe_span12">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <img style="border:10px solid white;" src="payslip.png">
-            </div>
-        </div>
-    </div>
-    </div>
-</section>
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-    <div class="" style="text-align: center;">
-        <h3 class="oe_slogan">Loan Amount Deduction</h3>
-        <p>When we check the Loan request again,
-            the deducted installments will be changed to paid.</p>
-        <div class="oe_span12">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <img style="border:10px solid white;" src="loan_amount_deduction.png">
-            </div>
-        </div>
-    </div>
-    </div>
-</section>
-
-<div class="row section-content">
- <div class="col-md-6 img-content">
- <h3>Our Odoo Services</h3>
- </div>    <div class="bc-span col-md-12"><div class="inner-span"><a target="_blank" href="https://www.openhrms.com"><img class="img-border img-responsive thumbnail" src="cybro-service.png"></a></div></div>
-</div>
-</div>
-
-<section class="oe_container">
-    <h2 class="oe_slogan" style="margin-top:20px;" >Need Any Help?</h2>
-    <div class="oe_slogan" style="margin-top:10px !important;">
-        <div>
-            <a  class="btn btn-primary btn-lg mt8"
-            style="color: #FFFFFF !important;border-radius: 0;" href="https://www.cybrosys.com"><i
-            class="fa fa-envelope"></i> Email </a> <a
-            class="btn btn-primary btn-lg mt8" style="color: #FFFFFF !important;border-radius: 0;"
-            href="https://www.cybrosys.com/contact/"><i
-            class="fa fa-phone"></i> Contact Us </a> <a
-            class="btn btn-primary btn-lg mt8" style="color: #FFFFFF !important;border-radius: 0;"
-            href="https://www.cybrosys.com/odoo-customization-and-installation/"><i
-            class="fa fa-check-square"></i> Request Customization </a>
-        </div>
-        <br>
-        <img src="cybro_logo.png" style="width: 190px; margin-bottom: 20px;" class="center-block">
-    </div>
-</section>
diff --git a/ohrms_loan/static/description/loan_amount_deduction.png b/ohrms_loan/static/description/loan_amount_deduction.png
deleted file mode 100644
index a6cdded26..000000000
Binary files a/ohrms_loan/static/description/loan_amount_deduction.png and /dev/null differ
diff --git a/ohrms_loan/static/description/loan_approval.png b/ohrms_loan/static/description/loan_approval.png
deleted file mode 100644
index ceeb2d817..000000000
Binary files a/ohrms_loan/static/description/loan_approval.png and /dev/null differ
diff --git a/ohrms_loan/static/description/loan_request.png b/ohrms_loan/static/description/loan_request.png
deleted file mode 100644
index 6d3157db4..000000000
Binary files a/ohrms_loan/static/description/loan_request.png and /dev/null differ
diff --git a/ohrms_loan/static/description/loan_rule.png b/ohrms_loan/static/description/loan_rule.png
deleted file mode 100644
index 330b72cef..000000000
Binary files a/ohrms_loan/static/description/loan_rule.png and /dev/null differ
diff --git a/ohrms_loan/static/description/payslip.png b/ohrms_loan/static/description/payslip.png
deleted file mode 100644
index 0bcf1637e..000000000
Binary files a/ohrms_loan/static/description/payslip.png and /dev/null differ
diff --git a/ohrms_loan/views/hr_loan.xml b/ohrms_loan/views/hr_loan.xml
deleted file mode 100644
index 9ee1a8647..000000000
--- a/ohrms_loan/views/hr_loan.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <!--Loan Tree view-->
-    <record id="hr_loan_tree_view" model="ir.ui.view">
-        <field name="name">hr.loan.tree</field>
-        <field name="model">hr.loan</field>
-        <field name="arch" type="xml">
-            <tree string="Loan Requests">
-                <field name="name"/>
-                <field name="employee_id"/>
-                <field name="loan_amount"/>
-                <field name="date"/>
-                <field name="state"/>
-            </tree>
-        </field>
-    </record>
-
-    <!--Loan Form view-->
-    <record id="hr_loan_form_view" model="ir.ui.view">
-        <field name="name">hr.loan.form</field>
-        <field name="model">hr.loan</field>
-        <field name="arch" type="xml">
-            <form string="Loan Request">
-                <header>
-                    <button name="action_submit" type="object" string="Submit" states="draft" class="oe_highlight"/>
-                    <button name="action_cancel" type="object" string="Cancel" states="waiting_approval_1" />
-                    <button name="action_approve" type="object" string="Approve" states="waiting_approval_1" class="oe_highlight" groups="hr.group_hr_manager,hr.group_hr_user"/>
-                    <button name="action_double_approve" type="object" string="Approve" states="waiting_approval_2" class="oe_highlight" groups="account.group_account_user,account.group_account_manager"/>
-                    <button name="action_refuse" type="object" string="Refuse" states="draft,waiting_approval_1,waiting_approval_2" class="oe_highlight" groups="hr.group_hr_manager,hr.group_hr_user"/>
-                    <field name="state" widget="statusbar" statusbar_visible="draft,waiting_approval_1,waiting_approval_2,approve,cancel" />
-                </header>
-
-                <sheet>
-                    <div class="oe_button_box" name="button_box">
-                    </div>
-                    <div class="oe_title">
-                        <h1>
-                            <field name="name" readonly="1"/>
-                        </h1>
-                    </div>
-                    <group col="4">
-                        <field name="employee_id"  attrs="{'readonly':[('state','=','approve')]}"/>
-                        <field name="date"/>
-                        <field name="department_id"/>
-                        <field name="job_position"/>
-                        <field name="loan_amount" attrs="{'readonly':[('state','=','approve')]}"/>
-                        <field name="installment" attrs="{'readonly':[('state','=','approve')]}"/>
-                        <field name="payment_date" attrs="{'readonly':[('state','=','approve')]}"/>
-                        <field name="emp_account_id"  attrs="{'invisible':[('state', 'in',('draft','waiting_approval_1'))]}"/>
-                        <field name="treasury_account_id"  attrs="{'invisible':[('state', 'in',('draft','waiting_approval_1'))]}"/>
-                        <field name="journal_id"  attrs="{'invisible':[('state', 'in',('draft','waiting_approval_1'))]}"/>
-                        <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/>
-                        <field name="currency_id" options="{'no_create': True}" groups="base.group_multi_company"/>
-                    </group>
-                    <notebook>
-                        <page string="Installments">
-                            <field name="loan_lines">
-                                <tree string="Installments" editable="bottom">
-                                    <field name="date"/>
-                                    <field name="amount"/>
-                                    <field name="paid" readonly="1" invisible="1"/>
-                                </tree>
-                            </field>
-                            <group class="oe_subtotal_footer oe_right" colspan="2" >
-                                <field name="total_amount" widget="monetary" options="{'currency_field': 'currency_id'}"/>
-                                <field name="total_paid_amount" widget="monetary" options="{'currency_field': 'currency_id'}"/>
-                                <field name="balance_amount" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}"/>
-                            </group>
-                            <button type="object" name="compute_installment" string="Compute Installment"  colspan="2" attrs="{'invisible':[('state','=','approve')]}"
-                            groups="hr.group_hr_manager,hr.group_hr_user" class="oe_stat_button"
-                            icon="fa-clock-o"/>
-                            <div class="oe_clear"/>
-                        </page>
-                    </notebook>
-                </sheet>
-                <div class="oe_chatter">
-                    <field name="message_follower_ids" widget="mail_followers"/>
-                    <field name="message_ids" widget="mail_thread"/>
-                </div>
-            </form>
-        </field>
-    </record>
-
-    <!--loan search view-->
-    <record id="view_loan_request_search_form" model="ir.ui.view">
-        <field name="name">hr.loan.search.form</field>
-        <field name="model">hr.loan</field>
-        <field name="arch" type="xml">
-           <search string="Tasks">
-                <field name="employee_id"/>
-                <field name="department_id"/>
-                <group expand="0" string="Group By">
-                    <filter string="Employee" name="employee_id" context="{'group_by':'employee_id'}"/>
-                    <filter string="Department" context="{'group_by':'department_id'}"/>
-                </group>
-            </search>
-        </field>
-    </record>
-
-
-    <!--loan menu-->
-    <menuitem name="Loans And Salary Advance"
-        id="menu_hr_loans_and_advances" parent="hr.menu_hr_root"
-        sequence="20"/>
-
-    <record id="action_hr_loan_request" model="ir.actions.act_window">
-        <field name="name">Loan Requests</field>
-        <field name="res_model">hr.loan</field>
-        <field name="view_mode">tree,form</field>
-        <field name="search_view_id" ref="view_loan_request_search_form"/>
-         <field name="help" type="html">
-            <p class="oe_view_nocontent_create">
-                Click to create a new Loan request.
-            </p><p>
-                Use this menu to create loan requests.
-            </p>
-        </field>
-    </record>
-
-    <menuitem name="Loan Requests"
-        id="menu_base_hr_loan_request"
-        parent = "menu_hr_loans_and_advances"
-        sequence="1"/>
-
-    <menuitem name="Loan Requests"
-        parent="menu_base_hr_loan_request"
-        id="menu_hr_loan_request"
-        action="action_hr_loan_request"/>
-
-    <!-- Shortcuts -->
-    <record id="act_hr_employee_loan_request" model="ir.actions.act_window">
-        <field name="name">Loans</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">hr.loan</field>
-        <field name="src_model">hr.employee</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-        <field name="context">{'search_default_employee_id': [active_id], 'default_employee_id': active_id}</field>
-        <field name="domain">[('employee_id','=',active_id)]</field>
-        <field name="view_id" eval="hr_loan_tree_view"/>
-    </record>
-
-
-    <!-- HR employee inherit Loans -->
-    <record id="view_employee_form_loan_inherit" model="ir.ui.view">
-        <field name="name">hr.employee.loan.form.inherit</field>
-        <field name="model">hr.employee</field>
-        <field name="inherit_id" ref="hr.view_employee_form"/>
-        <field name="arch" type="xml">
-            <xpath expr="//div[@name='button_box']" position="inside">
-                <button name="%(act_hr_employee_loan_request)d"
-                    type="action"
-                    class="oe_stat_button"
-                    icon="fa-calendar"
-                    groups="hr.group_hr_manager,hr.group_hr_user">
-                    <field name="loan_count" widget="statinfo" string="Loans"/>
-                </button>
-            </xpath>
-        </field>
-    </record>
-</odoo>
\ No newline at end of file
diff --git a/ohrms_loan/views/hr_loan_seq.xml b/ohrms_loan/views/hr_loan_seq.xml
deleted file mode 100644
index b4a33e38e..000000000
--- a/ohrms_loan/views/hr_loan_seq.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" ?>
-<odoo>
-    <data noupdate='1'>
-		<record id="ir_seq_hr_loan" model="ir.sequence">
-			<field name="name">Loan Request</field>
-			<field name="code">hr.loan.seq</field>
-			<field name="prefix">LO/</field>
-			<field name="padding">4</field>
-			<field name="number_increment">1</field>
-			<field name="number_next_actual">1</field>
-			<field name="implementation">standard</field>
-		</record>
-	</data>
-</odoo>
\ No newline at end of file
diff --git a/ohrms_loan/views/hr_payroll.xml b/ohrms_loan/views/hr_payroll.xml
deleted file mode 100644
index 6ee94a1b0..000000000
--- a/ohrms_loan/views/hr_payroll.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <record id="hr_payslip_form_inherit_view" model="ir.ui.view">
-        <field name="name">hr.payslip.inherit.form1</field>
-        <field name="model">hr.payslip</field>
-        <field name="inherit_id" ref="hr_payroll.view_hr_payslip_form"/>
-        <field name="arch" type="xml">
-            <xpath expr="//field[@name='input_line_ids']" position="after">
-                <separator string="Loans"/>
-                <group>
-                    <group>
-                       <button name="get_loan" string="Update Loans" type="object" groups="hr_payroll.group_hr_payroll_manager"/>
-                    </group>
-                    <field name="loan_ids" nolabel="1">
-                        <tree string="Loans" editable="bottom">
-                            <field name="loan_id"/>
-                            <field name="date"/>
-                            <field name="amount"/>
-                            <field name="paid" groups="hr_payroll.group_hr_payroll_manager"/>
-                        </tree>
-                    </field>
-                    <group class="oe_subtotal_footer oe_right">
-                        <field name="total_paid"/>
-                    </group>
-                </group>
-            </xpath>
-        </field>
-    </record>
-</odoo>
\ No newline at end of file
diff --git a/ohrms_loan_accounting/README.md b/ohrms_loan_accounting/README.md
deleted file mode 100644
index febde926a..000000000
--- a/ohrms_loan_accounting/README.md
+++ /dev/null
@@ -1,36 +0,0 @@
-Open HRMS Loan Accounting
-=========================
-
-Manage Loan Requests.
-
-
-Installation
-============
-- www.odoo.com/documentation/10.0/setup/install.html
-- Install our custom addon
-
-License
-=======
-GNU AFFERO GENERAL PUBLIC LICENSE, Version 3 (AGPLv3)
-(http://www.gnu.org/licenses/agpl.html)
-
-Bug Tracker
-===========
-Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported.
-
-Credits
-=======
-* Cybrosys Techno Solutions <https://www.cybrosys.com>
-
-Author
-------
-
-Developers: Anusha P P <anusha@cybrosys.in>
-
-Maintainer
-----------
-
-This module is maintained by Cybrosys Technologies.
-
-For support and more information, please visit https://www.cybrosys.com.
-
diff --git a/ohrms_loan_accounting/__init__.py b/ohrms_loan_accounting/__init__.py
deleted file mode 100644
index 89d26e2f5..000000000
--- a/ohrms_loan_accounting/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-# -*- coding: utf-8 -*-
-import models
diff --git a/ohrms_loan_accounting/__manifest__.py b/ohrms_loan_accounting/__manifest__.py
deleted file mode 100644
index 59ae8fee5..000000000
--- a/ohrms_loan_accounting/__manifest__.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of Open HRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Anusha P P (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-{
-    'name': 'Open HRMS Loan Accounting',
-    'version': '10.0.2.0.0',
-    'summary': 'Open HRMS Loan Accounting',
-    'description': """
-        Create accounting entries for loan requests.
-        """,
-    'category': 'Human Resources',
-    'author': "Cybrosys Techno Solutions",
-    'company': 'Cybrosys Techno Solutions',
-    'maintainer': 'Cybrosys Techno Solutions',
-    'website': "https://www.openhrms.com",
-    'depends': [
-        'base','hr_payroll', 'hr', 'account', 'ohrms_loan',
-    ],
-    'data': [
-        'views/hr_loan_config.xml',
-        'views/hr_loan_acc.xml',
-
-    ],
-    'demo': [],
-    'images': ['static/description/banner.jpg'],
-    'license': 'AGPL-3',
-    'installable': True,
-    'auto_install': False,
-    'application': False,
-}
diff --git a/ohrms_loan_accounting/doc/RELEASE_NOTES.md b/ohrms_loan_accounting/doc/RELEASE_NOTES.md
deleted file mode 100644
index f4c7fe0aa..000000000
--- a/ohrms_loan_accounting/doc/RELEASE_NOTES.md
+++ /dev/null
@@ -1,11 +0,0 @@
-## Module <ohrms_loan_accounting>
-
-#### 09.04.2018
-#### Version 10.0.2.0.0
-##### CHG
-- function changed.
-
-#### 30.03.2018
-#### Version 10.0.1.0.0
-##### ADD
-- Initial commit for Open HRMS Project
diff --git a/ohrms_loan_accounting/models/__init__.py b/ohrms_loan_accounting/models/__init__.py
deleted file mode 100644
index 0bc44dcad..000000000
--- a/ohrms_loan_accounting/models/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- coding: utf-8 -*-
-import hr_loan_config
-import hr_loan_acc
-
diff --git a/ohrms_loan_accounting/models/hr_loan_acc.py b/ohrms_loan_accounting/models/hr_loan_acc.py
deleted file mode 100644
index f4709898c..000000000
--- a/ohrms_loan_accounting/models/hr_loan_acc.py
+++ /dev/null
@@ -1,158 +0,0 @@
-# -*- coding: utf-8 -*-
-import time
-from odoo import models, fields, api
-from odoo.exceptions import except_orm
-
-
-class HrLoanAcc(models.Model):
-    _inherit = 'hr.loan'
-
-    @api.multi
-    def action_approve(self):
-        """This create account move for request.
-            """
-        loan_approve = self.env['ir.values'].get_default('account.config.settings', 'loan_approve')
-        contract_obj = self.env['hr.contract'].search([('employee_id', '=', self.employee_id.id)])
-        if not contract_obj:
-            raise except_orm('Warning', 'You must Define a contract for employee')
-        if not self.loan_lines:
-            raise except_orm('Warning', 'You must compute installment before Approved')
-        if loan_approve:
-            self.write({'state': 'waiting_approval_2'})
-        else:
-            raise except_orm('Warning', 'Enable the option for loan approval in accounting settings')
-
-    @api.multi
-    def action_double_approve(self):
-        """This create account move for request in case of double approval.
-            """
-        if not self.emp_account_id or not self.treasury_account_id or not self.journal_id:
-            raise except_orm('Warning', "You must enter employee account & Treasury account and journal to approve ")
-        if not self.loan_lines:
-            raise except_orm('Warning', 'You must compute Loan Request before Approved')
-        timenow = time.strftime('%Y-%m-%d')
-        for loan in self:
-            amount = loan.loan_amount
-            loan_name = loan.employee_id.name
-            reference = loan.name
-            journal_id = loan.journal_id.id
-            debit_account_id = loan.treasury_account_id.id
-            credit_account_id = loan.emp_account_id.id
-            debit_vals = {
-                'name': loan_name,
-                'account_id': debit_account_id,
-                'journal_id': journal_id,
-                'date': timenow,
-                'debit': amount > 0.0 and amount or 0.0,
-                'credit': amount < 0.0 and -amount or 0.0,
-                'loan_id': loan.id,
-            }
-            credit_vals = {
-                'name': loan_name,
-                'account_id': credit_account_id,
-                'journal_id': journal_id,
-                'date': timenow,
-                'debit': amount < 0.0 and -amount or 0.0,
-                'credit': amount > 0.0 and amount or 0.0,
-                'loan_id': loan.id,
-            }
-            vals = {
-                'name': 'Loan For' + ' ' + loan_name,
-                'narration': loan_name,
-                'ref': reference,
-                'journal_id': journal_id,
-                'date': timenow,
-                'line_ids': [(0, 0, debit_vals), (0, 0, credit_vals)]
-            }
-            move = self.env['account.move'].create(vals)
-            move.post()
-        self.write({'state': 'approve'})
-        return True
-
-
-class AccountMoveLine(models.Model):
-    _inherit = "account.move.line"
-
-    loan_id = fields.Many2one('hr.loan', string="Loan")
-
-
-class HrLoanLineAcc(models.Model):
-    _inherit = "hr.loan.line"
-
-    @api.one
-    def action_paid_amount(self):
-        """This create the account move line for payment of each installment.
-            """
-        timenow = time.strftime('%Y-%m-%d')
-        for line in self:
-            if line.loan_id.state != 'approve':
-                raise except_orm('Warning', "Loan Request must be approved")
-            amount = line.amount
-            loan_name = line.employee_id.name
-            reference = line.loan_id.name
-            journal_id = line.loan_id.journal_id.id
-            debit_account_id = line.loan_id.emp_account_id.id
-            credit_account_id = line.loan_id.treasury_account_id.id
-            debit_vals = {
-                'name': loan_name,
-                'account_id': debit_account_id,
-                'journal_id': journal_id,
-                'date': timenow,
-                'debit': amount > 0.0 and amount or 0.0,
-                'credit': amount < 0.0 and -amount or 0.0,
-                'loan_id': line.loan_id.id,
-            }
-            credit_vals = {
-                'name': loan_name,
-                'account_id': credit_account_id,
-                'journal_id': journal_id,
-                'date': timenow,
-                'debit': amount < 0.0 and -amount or 0.0,
-                'credit': amount > 0.0 and amount or 0.0,
-                'loan_id': line.loan_id.id,
-            }
-            vals = {
-                'name': 'Loan For' + ' ' + loan_name,
-                'narration': loan_name,
-                'ref': reference,
-                'journal_id': journal_id,
-                'date': timenow,
-                'line_ids': [(0, 0, debit_vals), (0, 0, credit_vals)]
-            }
-            move = self.env['account.move'].create(vals)
-            move.post()
-        return True
-
-
-class HrPayslipAcc(models.Model):
-    _inherit = 'hr.payslip'
-
-    @api.multi
-    def compute_sheet(self):
-        res = super(HrPayslipAcc, self).compute_sheet()
-        if len(self.loan_ids) == 0:
-            loan_count = self.env['hr.loan'].search_count([('employee_id', '=', self.employee_id.id), ('state', '=', 'approve'),
-                                                           ('balance_amount', '!=', 0)])
-            if loan_count:
-                raise except_orm('Error!', 'Please Update the Loans')
-            else:
-                return res
-        else:
-            return res
-
-    @api.multi
-    def action_payslip_done(self):
-        rules = []
-        for line in self.loan_ids:
-            if line.paid:
-                if self.struct_id:
-                    for line_id in self.struct_id.rule_ids:
-                        rules.append(line_id.code)
-                    if self.struct_id.parent_id:
-                        for line_ids in self.struct_id.parent_id.rule_ids:
-                            rules.append(line_ids.code)
-                if 'LO' in rules:
-                    line.action_paid_amount()
-                else:
-                    raise except_orm('Warning', "Add Salary rule for loan in salary structure")
-        return super(HrPayslipAcc, self).action_payslip_done()
diff --git a/ohrms_loan_accounting/models/hr_loan_config.py b/ohrms_loan_accounting/models/hr_loan_config.py
deleted file mode 100644
index a46dcca3d..000000000
--- a/ohrms_loan_accounting/models/hr_loan_config.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from odoo import models, fields, api, _
-
-
-class AccConfig(models.TransientModel):
-    _inherit = 'account.config.settings'
-
-    loan_approve = fields.Boolean(default=False, string="Approval from Accounting Department",
-                                  help="Loan Approval from account manager")
-
-    @api.multi
-    def set_loan_approve(self):
-        return self.env['ir.values'].sudo().set_default(
-            'account.config.settings', 'loan_approve', self.loan_approve)
diff --git a/ohrms_loan_accounting/static/description/HRMS-BUTTON.png b/ohrms_loan_accounting/static/description/HRMS-BUTTON.png
deleted file mode 100644
index 0f1b65bea..000000000
Binary files a/ohrms_loan_accounting/static/description/HRMS-BUTTON.png and /dev/null differ
diff --git a/ohrms_loan_accounting/static/description/accounting_validation.png b/ohrms_loan_accounting/static/description/accounting_validation.png
deleted file mode 100644
index 134310d78..000000000
Binary files a/ohrms_loan_accounting/static/description/accounting_validation.png and /dev/null differ
diff --git a/ohrms_loan_accounting/static/description/advance_request_approval.png b/ohrms_loan_accounting/static/description/advance_request_approval.png
deleted file mode 100644
index 30d1cc6e4..000000000
Binary files a/ohrms_loan_accounting/static/description/advance_request_approval.png and /dev/null differ
diff --git a/ohrms_loan_accounting/static/description/banner.jpg b/ohrms_loan_accounting/static/description/banner.jpg
deleted file mode 100644
index 926cac52a..000000000
Binary files a/ohrms_loan_accounting/static/description/banner.jpg and /dev/null differ
diff --git a/ohrms_loan_accounting/static/description/cybro-service.png b/ohrms_loan_accounting/static/description/cybro-service.png
deleted file mode 100644
index 252929a86..000000000
Binary files a/ohrms_loan_accounting/static/description/cybro-service.png and /dev/null differ
diff --git a/ohrms_loan_accounting/static/description/cybro_logo.png b/ohrms_loan_accounting/static/description/cybro_logo.png
deleted file mode 100644
index bb309114c..000000000
Binary files a/ohrms_loan_accounting/static/description/cybro_logo.png and /dev/null differ
diff --git a/ohrms_loan_accounting/static/description/icon.png b/ohrms_loan_accounting/static/description/icon.png
deleted file mode 100644
index e90809a0f..000000000
Binary files a/ohrms_loan_accounting/static/description/icon.png and /dev/null differ
diff --git a/ohrms_loan_accounting/static/description/index.html b/ohrms_loan_accounting/static/description/index.html
deleted file mode 100644
index a0222fb2d..000000000
--- a/ohrms_loan_accounting/static/description/index.html
+++ /dev/null
@@ -1,162 +0,0 @@
-<section class="oe_container bg-gray-lighter" xmlns="http://www.w3.org/1999/html">
-    <div class="oe_row">
-        <div class="oe_span">
-            <h2 class="oe_slogan">Open HRMS</h2>
-            <h3 class="oe_slogan">Most advanced open source HR management software</h3>
-        </div>
-
-
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced oe_mt32">
-        <div class="oe_span">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <a href="https://www.openhrms.com/#request-demo">
-                    <img src="HRMS-BUTTON.png">
-                </a>
-            </div>
-        </div>
-
-    </div>
-</section>
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-        <h2 class="oe_slogan">Open HRMS Loan Accounting</h2>
-        <h3 class="oe_slogan">Manage Loan request of employees</h3>
-        <h4 class="oe_slogan"><a href="https://www.cybrosys.com">Cybrosys Technologies</a></h4>
-    </div>
-    <div class="oe_row oe_spaced" style="padding-left:65px;">
-        <h4>Features:</h4>
-        <div>
-            <span style="color:green;"> &#9745; </span>Employee can create loan request.<br/>
-            <span style="color:green;"> &#9745; </span>Double layer approval, from Accounting & HR Department.<br/>
-            <span style="color:green;"> &#9745; </span>Loan amount is deducted from the salary.<br/>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-        <div class="" style="text-align: center;">
-            <div class="oe_picture">
-                <h3 class="oe_slogan">Overview</h3>
-                <p class="oe_mt32">
-                    Open HRMS Loan is a component of Open HRMS suit.
-                    Open HRMS Loan module helps the user to  configure different loan policies, assign approval authority, conduct the verification process and sanction loan for employees.
-                </p>
-            </div>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-        <div class="" style="text-align: center;">
-            <h3 class="oe_slogan">Configuration</h3>
-        </div>
-        <div class="" style="text-align: center;">
-            <p>Install the Module "Open HRMS Loan Accounting" in order to enable Accounting Entries.
-                Enable the option "Loan Approval From Accounting Department" In accounting settings</p>
-            <div class="oe_span12">
-                <div class="oe_demo oe_picture oe_screenshot">
-                    <img style="border:10px solid white;" src="accounting_validation.png">
-                </div>
-            </div>
-        </div>
-        <div class="" style="text-align: center;">
-            <p>Add the deduction rule for loan in Salary Structure</p>
-            <div class="oe_span12">
-                <div class="oe_demo oe_picture oe_screenshot">
-                    <img style="border:10px solid white;" src="loan_rule.png">
-                </div>
-            </div>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-    <div class="" style="text-align: center;">
-        <h3 class="oe_slogan">Loan Request</h3>
-         <p>Employee can create loan request</p>
-        <div class="oe_span12">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <img style="border:10px solid white;" src="loan_request.png">
-            </div>
-        </div>
-    </div>
-    </div>
-</section>
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-    <div class="" style="text-align: center;">
-        <h3 class="oe_slogan">Loan Approval</h3>
-        <p>Once the HR department has given the Approval, the accounts department take the decision</p>
-        <div class="oe_span12">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <img style="border:10px solid white;" src="loan_approval.png">
-            </div>
-        </div>
-    </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-    <div class="" style="text-align: center;">
-        <h3 class="oe_slogan">Employee Payslip</h3>
-         <p>When we create the payslip, all the pending installments will be listed there,
-             we can manually select the installments that have to be deducted  from the salary</p>
-        <div class="oe_span12">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <img style="border:10px solid white;" src="payslip.png">
-            </div>
-        </div>
-    </div>
-    </div>
-</section>
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-    <div class="" style="text-align: center;">
-        <h3 class="oe_slogan">Loan Amount Deduction</h3>
-        <p>When we check the Loan request again,
-            the deducted installments will be changed to paid.</p>
-        <div class="oe_span12">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <img style="border:10px solid white;" src="loan_amount_deduction.png">
-            </div>
-        </div>
-    </div>
-    </div>
-</section>
-
-<div class="row section-content">
- <div class="col-md-6 img-content">
- <h3>Our Odoo Services</h3>
- </div>    <div class="bc-span col-md-12"><div class="inner-span"><a target="_blank" href="https://www.openhrms.com"><img class="img-border img-responsive thumbnail" src="cybro-service.png"></a></div></div>
-</div>
-</div>
-
-<section class="oe_container">
-    <h2 class="oe_slogan" style="margin-top:20px;" >Need Any Help?</h2>
-    <div class="oe_slogan" style="margin-top:10px !important;">
-        <div>
-            <a  class="btn btn-primary btn-lg mt8"
-            style="color: #FFFFFF !important;border-radius: 0;" href="https://www.cybrosys.com"><i
-            class="fa fa-envelope"></i> Email </a> <a
-            class="btn btn-primary btn-lg mt8" style="color: #FFFFFF !important;border-radius: 0;"
-            href="https://www.cybrosys.com/contact/"><i
-            class="fa fa-phone"></i> Contact Us </a> <a
-            class="btn btn-primary btn-lg mt8" style="color: #FFFFFF !important;border-radius: 0;"
-            href="https://www.cybrosys.com/odoo-customization-and-installation/"><i
-            class="fa fa-check-square"></i> Request Customization </a>
-        </div>
-        <br>
-        <img src="cybro_logo.png" style="width: 190px; margin-bottom: 20px;" class="center-block">
-    </div>
-</section>
diff --git a/ohrms_loan_accounting/static/description/loan_amount_deduction.png b/ohrms_loan_accounting/static/description/loan_amount_deduction.png
deleted file mode 100644
index a6cdded26..000000000
Binary files a/ohrms_loan_accounting/static/description/loan_amount_deduction.png and /dev/null differ
diff --git a/ohrms_loan_accounting/static/description/loan_approval.png b/ohrms_loan_accounting/static/description/loan_approval.png
deleted file mode 100644
index ceeb2d817..000000000
Binary files a/ohrms_loan_accounting/static/description/loan_approval.png and /dev/null differ
diff --git a/ohrms_loan_accounting/static/description/loan_request.png b/ohrms_loan_accounting/static/description/loan_request.png
deleted file mode 100644
index 6d3157db4..000000000
Binary files a/ohrms_loan_accounting/static/description/loan_request.png and /dev/null differ
diff --git a/ohrms_loan_accounting/static/description/loan_rule.png b/ohrms_loan_accounting/static/description/loan_rule.png
deleted file mode 100644
index 330b72cef..000000000
Binary files a/ohrms_loan_accounting/static/description/loan_rule.png and /dev/null differ
diff --git a/ohrms_loan_accounting/static/description/payslip.png b/ohrms_loan_accounting/static/description/payslip.png
deleted file mode 100644
index 0bcf1637e..000000000
Binary files a/ohrms_loan_accounting/static/description/payslip.png and /dev/null differ
diff --git a/ohrms_loan_accounting/views/hr_loan_acc.xml b/ohrms_loan_accounting/views/hr_loan_acc.xml
deleted file mode 100644
index 665e431a8..000000000
--- a/ohrms_loan_accounting/views/hr_loan_acc.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <record id="hr_loan_inherited" model="ir.ui.view">
-        <field name="name">HR LOAN</field>
-        <field name="model">hr.loan</field>
-        <field name="inherit_id" ref="ohrms_loan.hr_loan_form_view"/>
-        <field name="arch" type="xml">
-            <xpath expr="//field[@name='emp_account_id']" position="attributes">
-                    <attribute name="invisible">0</attribute>
-            </xpath>
-            <xpath expr="//field[@name='treasury_account_id']" position="attributes">
-                    <attribute name="invisible">0</attribute>
-            </xpath>
-            <xpath expr="//field[@name='journal_id']" position="attributes">
-                    <attribute name="invisible">0</attribute>
-            </xpath>
-        </field>
-    </record>
-
-     <record model="ir.ui.view" id="view_move_line_form_inherit">
-        <field name="name">view.move.line.form.inherit</field>
-        <field name="model">account.move.line</field>
-        <field name="inherit_id" ref="account.view_move_line_form"/>
-        <field name="arch" type="xml">
-        <data>
-            <xpath expr="//field[@name='ref']" position="after">
-                <field name="loan_id"/>
-            </xpath>
-        </data>
-        </field>
-    </record>
-</odoo>
diff --git a/ohrms_loan_accounting/views/hr_loan_config.xml b/ohrms_loan_accounting/views/hr_loan_config.xml
deleted file mode 100644
index a5d01e5d0..000000000
--- a/ohrms_loan_accounting/views/hr_loan_config.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <record id="view_account_config_inherit" model="ir.ui.view">
-            <field name="name">Accounting  settings</field>
-            <field name="model">account.config.settings</field>
-            <field name="inherit_id" ref="account.view_account_config_settings"/>
-            <field name="arch" type="xml">
-                <xpath expr="//div[@name='invoice_taxes']" position="after">
-                    <group string="Loan Approval">
-                        <label for="id" string="Loan Approval"/>
-                        <div>
-                            <field name="loan_approve" class="oe_inline"/>
-                            <label for="loan_approve"/>
-                        </div>
-                    </group>
-                </xpath>
-            </field>
-        </record>
-    </data>
-</odoo>
\ No newline at end of file
diff --git a/ohrms_salary_advance/README.md b/ohrms_salary_advance/README.md
deleted file mode 100644
index 28ddfe662..000000000
--- a/ohrms_salary_advance/README.md
+++ /dev/null
@@ -1,35 +0,0 @@
-Open HRMS Advance Salary
-========================
-
-Advance Salary In HR.
-
-Installation
-============
-- www.odoo.com/documentation/10.0/setup/install.html
-- Install our custom addon
-
-License
-=======
-GNU AFFERO GENERAL PUBLIC LICENSE, Version 3 (AGPLv3)
-(http://www.gnu.org/licenses/agpl.html)
-
-Bug Tracker
-===========
-Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported.
-
-Credits
-=======
-* Cybrosys Techno Solutions <https://www.cybrosys.com>
-
-Author
-------
-
-Developers: Anusha P P <anusha@cybrosys.in>
-            Sreejith P <sreejith@cybrosys.in>
-
-Maintainer
-----------
-
-This module is maintained by Cybrosys Technologies.
-
-For support and more information, please visit https://www.cybrosys.com.
diff --git a/ohrms_salary_advance/__init__.py b/ohrms_salary_advance/__init__.py
deleted file mode 100644
index fca0067a7..000000000
--- a/ohrms_salary_advance/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import models
-
diff --git a/ohrms_salary_advance/__manifest__.py b/ohrms_salary_advance/__manifest__.py
deleted file mode 100644
index e66798a02..000000000
--- a/ohrms_salary_advance/__manifest__.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- coding: utf-8 -*-
-###################################################################################
-#    A part of Open HRMS Project <https://www.openhrms.com>
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2018-TODAY Cybrosys Technologies (<https://www.cybrosys.com>).
-#    Author: Anusha P P (<https://www.cybrosys.com>)
-#
-#    This program is free software: you can modify
-#    it under the terms of the GNU Affero General Public License (AGPL) 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 <https://www.gnu.org/licenses/>.
-#
-###################################################################################
-{
-    'name': 'Open HRMS Advance Salary',
-    'version': '10.0.1.1.0',
-    'summary': 'Advance Salary In HR',
-    'description': """
-        Helps you to manage Advance Salary Request of your company's staff.
-        """,
-    'category': 'Human Resources',
-    'author': "Cybrosys Techno Solutions",
-    'company': 'Cybrosys Techno Solutions',
-    'maintainer': 'Cybrosys Techno Solutions',
-    'website': "https://www.openhrms.com",
-    'depends': [
-        'hr_payroll', 'hr', 'account_accountant', 'hr_contract', 'ohrms_loan',
-    ],
-    'data': [
-        'security/ir.model.access.csv',
-        'security/security.xml',
-        'views/salary_structure.xml',
-        'views/salary_advance.xml',
-    ],
-    'demo': [],
-    'images': ['static/description/banner.jpg'],
-    'license': 'AGPL-3',
-    'installable': True,
-    'auto_install': False,
-    'application': False,
-}
-
diff --git a/ohrms_salary_advance/doc/RELEASE_NOTES.md b/ohrms_salary_advance/doc/RELEASE_NOTES.md
deleted file mode 100644
index b58d7137e..000000000
--- a/ohrms_salary_advance/doc/RELEASE_NOTES.md
+++ /dev/null
@@ -1,12 +0,0 @@
-## Module <ohrms_salary_advance>
-
-#### 31.03.2018
-#### Version 10.0.1.1.0
-##### CHG
-- field name changed.
-
-
-#### 30.03.2018
-#### Version 10.0.1.0.0
-##### ADD
-- Initial commit for Open HRMS Project
diff --git a/ohrms_salary_advance/models/__init__.py b/ohrms_salary_advance/models/__init__.py
deleted file mode 100644
index db668a115..000000000
--- a/ohrms_salary_advance/models/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- coding: utf-8 -*-
-import salary_advance
-import salary_structure
-import hr_advance_payslip
-
diff --git a/ohrms_salary_advance/models/hr_advance_payslip.py b/ohrms_salary_advance/models/hr_advance_payslip.py
deleted file mode 100644
index 354b02859..000000000
--- a/ohrms_salary_advance/models/hr_advance_payslip.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-from datetime import datetime
-from odoo import models
-
-
-class SalaryRuleInput(models.Model):
-    _inherit = 'hr.payslip'
-
-    def get_inputs(self, contract_ids, date_from, date_to):
-        """This Compute the other inputs to employee payslip.
-                           """
-        res = super(SalaryRuleInput, self).get_inputs(contract_ids, date_from, date_to)
-        print self, contract_ids, date_from, date_to
-        contract_obj = self.env['hr.contract']
-        emp_id = contract_obj.browse(contract_ids[0]).employee_id
-        adv_salary = self.env['salary.advance'].search([('employee_id', '=', emp_id.id)])
-        print emp_id, adv_salary
-        for adv_obj in adv_salary:
-            current_date = datetime.strptime(date_from, '%Y-%m-%d').date().month
-            date = adv_obj.date
-            existing_date = datetime.strptime(date, '%Y-%m-%d').date().month
-            if current_date == existing_date:
-                state = adv_obj.state
-                amount = adv_obj.advance
-                for result in res:
-                    if state == 'approve' and amount != 0 and result.get('code') == 'SAR':
-                        result['amount'] = amount
-        return res
diff --git a/ohrms_salary_advance/models/salary_advance.py b/ohrms_salary_advance/models/salary_advance.py
deleted file mode 100644
index c6cc3f6bd..000000000
--- a/ohrms_salary_advance/models/salary_advance.py
+++ /dev/null
@@ -1,186 +0,0 @@
-# -*- coding: utf-8 -*-
-import time
-from datetime import datetime
-from odoo import fields, models, api, _
-from odoo.exceptions import except_orm
-from odoo import exceptions
-
-
-class SalaryAdvancePayment(models.Model):
-    _name = "salary.advance"
-    _inherit = ['mail.thread', 'ir.needaction_mixin']
-
-    name = fields.Char(string='Name', readonly=True, select=True, default=lambda self: 'Adv/')
-    employee_id = fields.Many2one('hr.employee', string='Employee', required=True)
-    date = fields.Date(string='Date', required=True, default=lambda self: fields.Date.today())
-    reason = fields.Text(string='Reason')
-    currency_id = fields.Many2one('res.currency', string='Currency', required=True,
-                                  default=lambda self: self.env.user.company_id.currency_id)
-    company_id = fields.Many2one('res.company', string='Company', required=True,
-                                 default=lambda self: self.env.user.company_id)
-    advance = fields.Float(string='Advance', required=True)
-    payment_method = fields.Many2one('account.journal', string='Payment Method')
-    exceed_condition = fields.Boolean(string='Exceed than maximum',
-                                      help="The Advance is greater than the maximum percentage in salary structure")
-    department = fields.Many2one('hr.department', string='Department')
-    state = fields.Selection([('draft', 'Draft'),
-                              ('submit', 'Submitted'),
-                              ('waiting_approval', 'Waiting Approval'),
-                              ('approve', 'Approved'),
-                              ('cancel', 'Cancelled'),
-                              ('reject', 'Rejected')], string='Status', default='draft', track_visibility='onchange')
-    debit = fields.Many2one('account.account', string='Debit Account')
-    credit = fields.Many2one('account.account', string='Credit Account')
-    journal = fields.Many2one('account.journal', string='Journal')
-    employee_contract_id = fields.Many2one('hr.contract', string='Contract')
-
-    def onchange_employee_id(self, employee_id):
-        if employee_id:
-            employee_obj = self.env['hr.employee'].browse(employee_id)
-            department_id = employee_obj.department_id.id
-            domain = [('employee_id', '=', employee_id)]
-            return {'value': {'department': department_id}, 'domain': {
-                        'employee_contract_id': domain,
-                    }}
-
-    @api.onchange('company_id')
-    def onchange_company_id(self):
-        company = self.company_id
-        domain = [('company_id.id', '=', company.id)]
-        result = {
-            'domain': {
-                'journal': domain,
-            },
-
-        }
-        return result
-
-    @api.one
-    def submit_to_manager(self):
-        self.state = 'submit'
-
-    @api.one
-    def cancel(self):
-        self.state = 'cancel'
-
-    @api.one
-    def reject(self):
-        self.state = 'reject'
-
-    @api.model
-    def create(self, vals):
-        vals['name'] = self.env['ir.sequence'].get('salary.advance.seq') or ' '
-        res_id = super(SalaryAdvancePayment, self).create(vals)
-        return res_id
-
-    @api.one
-    def approve_request(self):
-        """This Approve the employee salary advance request.
-                   """
-        emp_obj = self.env['hr.employee']
-        address = emp_obj.browse([self.employee_id.id]).address_home_id
-        if not address.id:
-            raise except_orm('Error!', 'Define home address for employee')
-        salary_advance_search = self.search([('employee_id', '=', self.employee_id.id), ('id', '!=', self.id),
-                                             ('state', '=', 'approve')])
-        current_month = datetime.strptime(self.date, '%Y-%m-%d').date().month
-        for each_advance in salary_advance_search:
-            existing_month = datetime.strptime(each_advance.date, '%Y-%m-%d').date().month
-            if current_month == existing_month:
-                raise except_orm('Error!', 'Advance can be requested once in a month')
-        if not self.employee_contract_id:
-            raise except_orm('Error!', 'Define a contract for the employee')
-        struct_id = self.employee_contract_id.struct_id
-        if not struct_id.max_percent or not struct_id.advance_date:
-            raise except_orm('Error!', 'Max percentage or advance days are not provided in Contract')
-        adv = self.advance
-        amt = (self.employee_contract_id.struct_id.max_percent * self.employee_contract_id.wage) / 100
-        if adv > amt and not self.exceed_condition:
-            raise except_orm('Error!', 'Advance amount is greater than allotted')
-
-        if not self.advance:
-            raise except_orm('Warning', 'You must Enter the Salary Advance amount')
-        payslip_obj = self.env['hr.payslip'].search([('employee_id', '=', self.employee_id.id),
-                                                     ('state', '=', 'done'), ('date_from', '<=', self.date),
-                                                     ('date_to', '>=', self.date)])
-        if payslip_obj:
-            raise except_orm('Warning', "This month salary already calculated")
-
-        for slip in self.env['hr.payslip'].search([('employee_id', '=', self.employee_id.id)]):
-            slip_moth = datetime.strptime(slip.date_from, '%Y-%m-%d').date().month
-            if current_month == slip_moth + 1:
-                slip_day = datetime.strptime(slip.date_from, '%Y-%m-%d').date().day
-                current_day = datetime.strptime(self.date, '%Y-%m-%d').date().day
-                if current_day - slip_day < struct_id.advance_date:
-                    raise exceptions.Warning(
-                        _('Request can be done after "%s" Days From prevoius month salary') % struct_id.advance_date)
-        self.state = 'waiting_approval'
-
-    @api.one
-    def approve_request_acc_dept(self):
-        """This Approve the employee salary advance request from accounting department.
-                   """
-        salary_advance_search = self.search([('employee_id', '=', self.employee_id.id), ('id', '!=', self.id),
-                                             ('state', '=', 'approve')])
-        current_month = datetime.strptime(self.date, '%Y-%m-%d').date().month
-        for each_advance in salary_advance_search:
-            existing_month = datetime.strptime(each_advance.date, '%Y-%m-%d').date().month
-            print current_month, existing_month
-            if current_month == existing_month:
-                raise except_orm('Error!', 'Advance can be requested once in a month')
-        if not self.debit or not self.credit or not self.journal:
-            raise except_orm('Warning', "You must enter Debit & Credit account and journal to approve ")
-        if not self.advance:
-            raise except_orm('Warning', 'You must Enter the Salary Advance amount')
-
-        move_obj = self.env['account.move']
-        timenow = time.strftime('%Y-%m-%d')
-        line_ids = []
-        debit_sum = 0.0
-        credit_sum = 0.0
-        for request in self:
-            amount = request.advance
-            request_name = request.employee_id.name
-            reference = request.name
-            journal_id = request.journal.id
-            move = {
-                'narration': 'Salary Advance Of ' + request_name,
-                'ref': reference,
-                'journal_id': journal_id,
-                'date': timenow,
-                'state': 'posted',
-            }
-
-            debit_account_id = request.debit.id
-            credit_account_id = request.credit.id
-
-            if debit_account_id:
-                debit_line = (0, 0, {
-                    'name': request_name,
-                    'account_id': debit_account_id,
-                    'journal_id': journal_id,
-                    'date': timenow,
-                    'debit': amount > 0.0 and amount or 0.0,
-                    'credit': amount < 0.0 and -amount or 0.0,
-                    'currency_id': self.currency_id.id,
-                })
-                line_ids.append(debit_line)
-                debit_sum += debit_line[2]['debit'] - debit_line[2]['credit']
-
-            if credit_account_id:
-                credit_line = (0, 0, {
-                    'name': request_name,
-                    'account_id': credit_account_id,
-                    'journal_id': journal_id,
-                    'date': timenow,
-                    'debit': amount < 0.0 and -amount or 0.0,
-                    'credit': amount > 0.0 and amount or 0.0,
-                    'currency_id': self.currency_id.id,
-                })
-                line_ids.append(credit_line)
-                credit_sum += credit_line[2]['credit'] - credit_line[2]['debit']
-
-            move.update({'line_ids': line_ids})
-            move_id = move_obj.create(move)
-            self.state = 'approve'
-            return True
diff --git a/ohrms_salary_advance/models/salary_structure.py b/ohrms_salary_advance/models/salary_structure.py
deleted file mode 100644
index d432d0fc8..000000000
--- a/ohrms_salary_advance/models/salary_structure.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from odoo import fields, models
-
-
-class SalaryStructure(models.Model):
-    _inherit = 'hr.payroll.structure'
-
-    max_percent = fields.Integer(string='Max.Salary Advance Percentage')
-    advance_date = fields.Integer(string='Salary Advance-After days')
-
diff --git a/ohrms_salary_advance/security/ir.model.access.csv b/ohrms_salary_advance/security/ir.model.access.csv
deleted file mode 100644
index 5343aaebc..000000000
--- a/ohrms_salary_advance/security/ir.model.access.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_salary_advance_user,salary.advance,model_salary_advance,base.group_user,1,1,1,0
-access_salary_advance_officer,salary.advance,model_salary_advance,hr.group_hr_user,1,1,1,1
-access_salary_advance_manager,salary.advance,model_salary_advance,hr.group_hr_manager,1,1,1,1
-access_account_manager,salary.advance,model_salary_advance,account.group_account_manager,1,1,1,1
diff --git a/ohrms_salary_advance/security/security.xml b/ohrms_salary_advance/security/security.xml
deleted file mode 100644
index fba5dc7f0..000000000
--- a/ohrms_salary_advance/security/security.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-
-        <record id="rule_advance_salary_multi_company" model="ir.rule">
-            <field name="name">Advance Request Multi Company</field>
-            <field name="model_id" ref="model_salary_advance"/>
-            <field eval="True" name="global"/>
-            <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-         </record>
-
-        <record id="hr_salary_advance_manager_rule" model="ir.rule">
-            <field name="name">Salary Advance</field>
-            <field name="model_id" ref="model_salary_advance"/>
-            <field name="groups" eval="[(4, ref('hr.group_hr_user')),(4, ref('account.group_account_user'))]"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
-        </record>
-
-        <record id="hr_salary_advance_employee_rule" model="ir.rule">
-            <field name="name">Salary Advance Rule For Employee</field>
-            <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
-            <field name="global" eval="True"/>
-            <field name="model_id" ref="model_salary_advance"/>
-            <field name="groups" eval="[(4,ref('base.group_user'))]"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
-        </record>
-
-    </data>
-</odoo>
\ No newline at end of file
diff --git a/ohrms_salary_advance/static/description/HRMS-BUTTON.png b/ohrms_salary_advance/static/description/HRMS-BUTTON.png
deleted file mode 100644
index 0f1b65bea..000000000
Binary files a/ohrms_salary_advance/static/description/HRMS-BUTTON.png and /dev/null differ
diff --git a/ohrms_salary_advance/static/description/advance_request_approval.png b/ohrms_salary_advance/static/description/advance_request_approval.png
deleted file mode 100644
index 30d1cc6e4..000000000
Binary files a/ohrms_salary_advance/static/description/advance_request_approval.png and /dev/null differ
diff --git a/ohrms_salary_advance/static/description/banner.jpg b/ohrms_salary_advance/static/description/banner.jpg
deleted file mode 100644
index 127ea73a8..000000000
Binary files a/ohrms_salary_advance/static/description/banner.jpg and /dev/null differ
diff --git a/ohrms_salary_advance/static/description/cybro-service.png b/ohrms_salary_advance/static/description/cybro-service.png
deleted file mode 100644
index 252929a86..000000000
Binary files a/ohrms_salary_advance/static/description/cybro-service.png and /dev/null differ
diff --git a/ohrms_salary_advance/static/description/cybro_logo.png b/ohrms_salary_advance/static/description/cybro_logo.png
deleted file mode 100644
index bb309114c..000000000
Binary files a/ohrms_salary_advance/static/description/cybro_logo.png and /dev/null differ
diff --git a/ohrms_salary_advance/static/description/icon.png b/ohrms_salary_advance/static/description/icon.png
deleted file mode 100644
index 2dbd13de8..000000000
Binary files a/ohrms_salary_advance/static/description/icon.png and /dev/null differ
diff --git a/ohrms_salary_advance/static/description/index.html b/ohrms_salary_advance/static/description/index.html
deleted file mode 100644
index a2586ec2b..000000000
--- a/ohrms_salary_advance/static/description/index.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<section class="oe_container bg-gray-lighter" xmlns="http://www.w3.org/1999/html">
-    <div class="oe_row">
-        <div class="oe_span">
-            <h2 class="oe_slogan">OpenHRMS</h2>
-            <h3 class="oe_slogan">Most advanced open source HR management software</h3>
-        </div>
-
-
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced oe_mt32">
-        <div class="oe_span">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <a href="https://www.openhrms.com/#request-demo">
-                    <img src="HRMS-BUTTON.png">
-                </a>
-            </div>
-        </div>
-
-    </div>
-</section>
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-        <h2 class="oe_slogan">HR Salary Advance</h2>
-        <h3 class="oe_slogan">Manage salary advance request of employees</h3>
-        <h4 class="oe_slogan"><a href="https://www.cybrosys.com">Cybrosys Technologies</a></h4>
-    </div>
-    <div class="oe_row oe_spaced" style="padding-left:65px;">
-        <h4>Features:</h4>
-        <div>
-            <span style="color:green;"> &#9745; </span>Employee can request for advance salary.<br/>
-            <span style="color:green;"> &#9745; </span>Set advance salary percentage limit in salary structure.<br/>
-            <span style="color:green;"> &#9745; </span>Set salary advance days in salary structure.<br/>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-        <div class="" style="text-align: center;">
-            <div class="oe_picture">
-                <h3 class="oe_slogan">Overview</h3>
-                <p class="oe_mt32">
-                    HR Salary Advance is a component of Open HRMS suit. HR Salary Advance
-                    module helps the user to manage salary advance requests from employees. You can configure advance salary rules,
-                    set advance salary limit, minimum number of days, and provide advance salary to employees
-                </p>
-            </div>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-        <div class="" style="text-align: center;">
-            <h3 class="oe_slogan">Configuration</h3>
-            <p>Add salary advance Rules in Salary Structure and provide the maximum advance percentage and advance days</p>
-            <div class="oe_span12">
-                <div class="oe_demo oe_picture oe_screenshot">
-                    <img style="border:10px solid white;" src="salary_advance_rule.png">
-                </div>
-            </div>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-    <div class="" style="text-align: center;">
-        <h3 class="oe_slogan">Advance Request</h3>
-         <p>Employee can create Advance request</p>
-        <div class="oe_span12">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <img style="border:10px solid white;" src="salary_request.png">
-            </div>
-        </div>
-    </div>
-    </div>
-</section>
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-    <div class="" style="text-align: center;">
-        <h3 class="oe_slogan">Salary Advance request approval From Hr & Accounts Department</h3>
-        <div class="oe_span12">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <img style="border:10px solid white;" src="advance_request_approval.png">
-            </div>
-        </div>
-    </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-    <div class="" style="text-align: center;">
-        <h3 class="oe_slogan">Employee Payslip</h3>
-         <p>When we create payslip salary advance will  be deducted from the salary</p>
-        <div class="oe_span12">
-            <div class="oe_demo oe_picture oe_screenshot">
-                <img style="border:10px solid white;" src="salary_advance_deduction.png">
-            </div>
-        </div>
-    </div>
-    </div>
-</section>
-
-
-<div class="row section-content">
- <div class="col-md-6 img-content">
- <h3>Our Odoo Services</h3>
- </div>    <div class="bc-span col-md-12"><div class="inner-span"><a target="_blank" href="https://www.openhrms.com"><img class="img-border img-responsive thumbnail" src="cybro-service.png"></a></div></div>
-</div>
-</div>
-
-<section class="oe_container oe_dark">
-    <h2 class="oe_slogan" style="margin-top:20px;" >Need Any Help?</h2>
-    <div class="oe_slogan" style="margin-top:10px !important;">
-        <div>
-            <a  class="btn btn-primary btn-lg mt8"
-            style="color: #FFFFFF !important;border-radius: 0;" href="https://www.cybrosys.com"><i
-            class="fa fa-envelope"></i> Email </a> <a
-            class="btn btn-primary btn-lg mt8" style="color: #FFFFFF !important;border-radius: 0;"
-            href="https://www.cybrosys.com/contact/"><i
-            class="fa fa-phone"></i> Contact Us </a> <a
-            class="btn btn-primary btn-lg mt8" style="color: #FFFFFF !important;border-radius: 0;"
-            href="https://www.cybrosys.com/odoo-customization-and-installation/"><i
-            class="fa fa-check-square"></i> Request Customization </a>
-        </div>
-        <br>
-        <img src="cybro_logo.png" style="width: 190px; margin-bottom: 20px;" class="center-block">
-    </div>
-</section>
-
diff --git a/ohrms_salary_advance/static/description/salary_advance_deduction.png b/ohrms_salary_advance/static/description/salary_advance_deduction.png
deleted file mode 100644
index da3903688..000000000
Binary files a/ohrms_salary_advance/static/description/salary_advance_deduction.png and /dev/null differ
diff --git a/ohrms_salary_advance/static/description/salary_advance_rule.png b/ohrms_salary_advance/static/description/salary_advance_rule.png
deleted file mode 100644
index 4b94e76cf..000000000
Binary files a/ohrms_salary_advance/static/description/salary_advance_rule.png and /dev/null differ
diff --git a/ohrms_salary_advance/static/description/salary_request.png b/ohrms_salary_advance/static/description/salary_request.png
deleted file mode 100644
index 56ab33c23..000000000
Binary files a/ohrms_salary_advance/static/description/salary_request.png and /dev/null differ
diff --git a/ohrms_salary_advance/views/salary_advance.xml b/ohrms_salary_advance/views/salary_advance.xml
deleted file mode 100644
index e25b97b90..000000000
--- a/ohrms_salary_advance/views/salary_advance.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<odoo>
-    <data>
-
-        <record id="view_salary_advance_form" model="ir.ui.view">
-            <field name="name">salary.advance.form</field>
-            <field name="model">salary.advance</field>
-            <field name="arch" type="xml">
-                <form string="Salary Advance">
-                    <header>
-                        <button name="submit_to_manager" string="Submit" type="object" states="draft" class="oe_highlight"/>
-                        <button name="approve_request" string="Approve" type="object" states="submit" class="oe_highlight" groups="hr.group_hr_manager,hr.group_hr_user"/>
-                        <button name="approve_request_acc_dept" string="Approve" type="object" states="waiting_approval" class="oe_highlight" groups="account.group_account_manager,account.group_account_user"/>
-                        <button name="cancel" string="Cancel" type="object" states="draft,submit"/>
-                        <button name="reject" string="Reject" type="object" states="waiting_approval"/>
-                        <field name="state" widget="statusbar" statusbar_visible="draft,submit,waiting_approval,approve,cancel,reject"/>
-                    </header>
-                	<sheet>
-                        <div class="oe_title oe_left">
-                            <h2>
-                            <field name="name" class="oe_inline" readonly="1"/>
-                            </h2>
-                        </div>
-                		<group>
-	                		<group>
-	                        	<field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
-                                <field name="department"/>
-                                <field name="date"/>
-	                        	<field name="reason"/>
-                                <field name="exceed_condition" groups="hr.group_hr_manager,hr.group_hr_user"/>
-		                    </group>
-		                    <group>
-                    			<field name="advance"/>
-                                <field name="currency_id" groups="base.group_multi_currency"/>
-                                <field name="company_id"  groups="base.group_multi_currency"/>
-                                <field name="credit"  attrs="{'invisible':[('state', '=', 'draft'), ('state', '=', 'submit')]}" groups="account.group_account_manager"/>
-                                <field name="debit" attrs="{'invisible':[('state', '=', 'draft'), ('state', '=', 'submit')]}" groups="account.group_account_manager"/>
-                                <field name="journal" attrs="{'invisible': [('state', '=', 'draft'), ('state', '=', 'submit')]}" groups="account.group_account_manager"/>
-                                <field name="employee_contract_id"  attrs="{'invisible': ['|', ('state', '=', 'draft'), ('state', '=', 'approve')]}" groups="hr.group_hr_manager,hr.group_hr_user"/>
-	                    	</group>
-                    	</group>
-		            </sheet>
-                </form>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_salary_advance_tree">
-            <field name="name">salary.advance.tree</field>
-            <field name="model">salary.advance</field>
-            <field name="arch" type="xml">
-                <tree string="Salary Advance">
-                    <field name="employee_id"/>
-                    <field name="date"/>
-                    <field name="advance"/>
-                    <field name="state"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="view_salary_advance_filter" model="ir.ui.view">
-            <field name="name">salary.advance.select</field>
-            <field name="model">salary.advance</field>
-            <field name="arch" type="xml">
-                <search string="Search">
-                    <field name="name" string="Salary Advance" filter_domain="['|',('name','ilike',self)]"/>
-                    <field name="employee_id"/>
-                    <field name="state"/>
-                    <filter string="My Requests" domain="[('employee_id.user_id.id','=',uid)]" name="my_requests_filter"/>
-                     <filter domain="[('state', '=', 'draft')]" string="To Submit" name="to_report" help="New Requests"/>
-                    <filter domain="[('state','in',('submit','waiting_approval'))]" string="To Approve" name="submitted" help="Submitted Requests"/>
-                    <filter domain="[('state', '=', 'approve')]" string="Approved" name="approved" help="Approved Requests"/>
-                    <separator/>
-                    <group expand="0" string="Group By">
-                        <filter string="Employee" domain="[]" context="{'group_by':'employee_id'}"/>
-                        <filter name="State" string="State" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Date" domain="[]" context="{'group_by':'date'}"/>
-                    </group>
-               </search>
-            </field>
-        </record>
-
-        <record id="action_my_salary_advance" model="ir.actions.act_window">
-            <field name="name">Salary Advance</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">salary.advance</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="search_view_id" ref="view_salary_advance_filter"/>
-            <field name="context">{'search_default_my_requests_filter':1}</field>
-            <field name="domain">[('employee_id.user_id', '=', uid)]</field>
-            <field name="help" type="html">
-                <p class="oe_view_nocontent_create">
-                    Create Requests.
-                </p>
-            </field>
-        </record>
-
-        <record id="action_my_salary_advance_request_approved" model="ir.actions.act_window">
-            <field name="name">Salary Advance</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">salary.advance</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="search_view_id" ref="view_salary_advance_filter"/>
-            <field name="context">{'search_default_approved':1}</field>
-            <field name="domain">[('employee_id.user_id', '=', uid)]</field>
-            <field name="help" type="html">
-                <p class="oe_view_nocontent_create">
-                    Create Requests.
-                </p>
-            </field>
-        </record>
-
-         <record id="action_salary_advance_to_approve" model="ir.actions.act_window">
-            <field name="name">Salary Advance</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">salary.advance</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="search_view_id" ref="view_salary_advance_filter"/>
-            <field name="context">{'search_default_submitted': 1}</field>
-            <field name="domain"></field>
-            <field name="help" type="html">
-                <p class="oe_view_nocontent_create">
-                    Create Requests.
-                </p>
-            </field>
-        </record>
-
-        <record id="ir_seq_hr_advance" model="ir.sequence">
-			<field name="name">Salary Advance Request</field>
-			<field name="code">salary.advance.seq</field>
-			<field name="prefix">SAR </field>
-			<field name="padding">4</field>
-			<field name="number_increment">1</field>
-			<field name="number_next_actual">1</field>
-			<field name="implementation">standard</field>
-            <field name="company_id" eval="False"/>
-		</record>
-
-        <menuitem id="parent_menu_salary_advance" name="Advance" parent="ohrms_loan.menu_hr_loans_and_advances" sequence="7"/>
-        <menuitem id="menu_my_salary_advance" action="action_my_salary_advance" parent="parent_menu_salary_advance" name="Request Salary Advance" sequence="1" />
-        <menuitem id="menu_salary_advance" action="action_salary_advance_to_approve" parent="parent_menu_salary_advance" name="Salary Advance To Approve" sequence="3" groups="hr.group_hr_manager,hr.group_hr_user,account.group_account_manager"/>
-        <menuitem id="menu_my_salary_advance_approved" action="action_my_salary_advance_request_approved" parent="parent_menu_salary_advance" name="My Approved Salary Advance" sequence="2" />
-    </data>
-</odoo>
\ No newline at end of file
diff --git a/ohrms_salary_advance/views/salary_structure.xml b/ohrms_salary_advance/views/salary_structure.xml
deleted file mode 100644
index 808ac50e9..000000000
--- a/ohrms_salary_advance/views/salary_structure.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<odoo>
-    <data>
-        <!-- advance salary rule -->
-        <record id="hr_payslip_rule_advance" model="hr.salary.rule">
-            <field name="code">SAR</field>
-            <field name="name">Advance Salary</field>
-            <field name="category_id" ref="hr_payroll.DED"/>
-            <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = inputs.SAR and - (inputs.SAR.amount)</field>
-            <field name="appears_on_payslip" eval="True"/>
-            <field name="sequence" eval="190"/>
-        </record>
-
-        <record id="hr_rule_input_advance" model="hr.rule.input">
-            <field name="code">SAR</field>
-            <field name="name">Salary Advance</field>
-            <field name="input_id" ref="hr_payslip_rule_advance"/>
-        </record>
-        <!-- salary structure -->
-        <record model="ir.ui.view" id="model_salary_structure">
-            <field name="name">salary.structure.form</field>
-            <field name="model">hr.payroll.structure</field>
-            <field name="inherit_id" ref="hr_payroll.view_hr_employee_grade_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//field[@name='parent_id']" position="after">
-                    <field name="max_percent"/>
-                    <field name="advance_date"/>
-                </xpath>
-            </field>
-        </record>
-    </data>
-</odoo>