diff --git a/.gitmodules b/.gitmodules
index 04d086b5..5309e9a7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,10 @@
 [submodule "external/hibou-oca/social"]
 	path = external/hibou-oca/social
 	url = https://github.com/hibou-io/oca-social.git
+[submodule "external/camptocamp-cloud-platform"]
+	path = external/camptocamp-cloud-platform
+	url = https://github.com/hibou-io/camptocamp-cloud-platform
+[submodule "external/hibou-shipbox"]
+	path = external/hibou-shipbox
+	url = https://gitlab.com/hibou-io/hibou-odoo/shipbox.git
+>>>>>>> .gitmodules
diff --git a/attachment_minio/README.md b/attachment_minio/README.md
new file mode 100644
index 00000000..3a81269c
--- /dev/null
+++ b/attachment_minio/README.md
@@ -0,0 +1,60 @@
+# Use MinIO (or Amazon S3) for Attachment/filestore
+
+MinIO provides S3 API compatible storage to scale out without a shared filesystem like NFS.
+
+This module will store the bucket used in the attachment database object, thus allowing 
+you to retain read-only access to the filestore by simply overriding the bucket.
+
+## Setup details
+
+Before installing this app, you should add several System Parameters (the most important of
+which is `ir_attachment.location`), OR set them through the config file as described later.
+
+**The in database System Parameters will act as overrides to the Config File versions.**
+
+| Key                               | Example Value | Default Value |
+|-----------------------------------|---------------|---------------|
+| ir_attachment.location            | s3            |               |
+| ir_attachment.location.host       | minio:9000    |               |
+| ir_attachment.location.bucket     | odoo          |               |
+| ir_attachment.location.region     | us-west-1     | us-west-1     |
+| ir_attachment.location.access_key | minio         |               |
+| ir_attachment.location.secret_key | minio_secret  |               |
+| ir_attachment.location.secure     | 1             |               |
+
+**Config File:**
+
+```
+attachment_minio_host = minio:9000
+attachment_minio_region = us-west-1
+attachment_minio_access_key = minio
+attachment_minio_secret_key = minio_secret
+attachment_minio_bucket = odoo
+attachment_minio_secure = False
+```
+
+In general, they should all be specified other than "region" (if you are not using AWS S3) 
+and "secure" which should be set if the "host" needs to be accessed over SSL/TLS.
+
+Install `attachment_minio` and during the installation `base_attachment_object_storage` should move 
+your existing filestore attachment files into the database or object storage.
+
+For example, you can run a shell command like the following to set the parameter:
+
+```
+env['ir.config_parameter'].set_param('ir_attachment.location', 's3')
+# If already installed...
+# env['ir.attachment'].force_storage()
+env.cr.commit()
+```
+
+If `attachment_minio` is not already installed, you can then install it and the migration 
+should be noted in the logs.  **Ensure that the timeouts are long enough that the migration can finish.**
+
+### Base Setup
+
+This module utilizes `base_attachment_object_storage`
+
+The System Parameter `ir_attachment.storage.force.database` can be customized to 
+force storage of files in the database. See the documentation of the module 
+`base_attachment_object_storage`.
diff --git a/attachment_minio/__init__.py b/attachment_minio/__init__.py
new file mode 100755
index 00000000..899bcc97
--- /dev/null
+++ b/attachment_minio/__init__.py
@@ -0,0 +1,2 @@
+from . import models
+
diff --git a/attachment_minio/__manifest__.py b/attachment_minio/__manifest__.py
new file mode 100755
index 00000000..fe230ae8
--- /dev/null
+++ b/attachment_minio/__manifest__.py
@@ -0,0 +1,75 @@
+{
+    "name": "Attachment MinIO",
+    "version": "13.0.1.0.0",
+    "depends": [
+        "base_attachment_object_storage",
+    ],
+    "author": "Hibou Corp.",
+    "license": "AGPL-3",
+    "description": """
+# Use MinIO (or Amazon S3) for Attachment/filestore
+
+MinIO provides S3 API compatible storage to scale out without a shared filesystem like NFS.
+
+This module will store the bucket used in the attachment database object, thus allowing 
+you to retain read-only access to the filestore by simply overriding the bucket.
+
+## Setup details
+
+Before installing this app, you should add several System Parameters (the most important of
+which is `ir_attachment.location`), OR set them through the config file as described later.
+
+**The in database System Parameters will act as overrides to the Config File versions.**
+
+| Key                               | Example Value | Default Value |
+|-----------------------------------|---------------|---------------|
+| ir_attachment.location            | s3            |               |
+| ir_attachment.location.host       | minio:9000    |               |
+| ir_attachment.location.bucket     | odoo          |               |
+| ir_attachment.location.region     | us-west-1     | us-west-1     |
+| ir_attachment.location.access_key | minio         |               |
+| ir_attachment.location.secret_key | minio_secret  |               |
+| ir_attachment.location.secure     | 1             |               |
+
+**Config File:**
+
+```
+attachment_minio_host = minio:9000
+attachment_minio_region = us-west-1
+attachment_minio_access_key = minio
+attachment_minio_secret_key = minio_secret
+attachment_minio_bucket = odoo
+attachment_minio_secure = False
+```
+
+In general, they should all be specified other than "region" (if you are not using AWS S3) 
+and "secure" which should be set if the "host" needs to be accessed over SSL/TLS.
+
+Install `attachment_minio` and during the installation `base_attachment_object_storage` should move 
+your existing filestore attachment files into the database or object storage.
+
+For example, you can run a shell command like the following to set the parameter:
+
+```
+env['ir.config_parameter'].set_param('ir_attachment.location', 's3')
+# If already installed...
+# env['ir.attachment'].force_storage()
+env.cr.commit()
+```
+
+If `attachment_minio` is not already installed, you can then install it and the migration 
+should be noted in the logs.  **Ensure that the timeouts are long enough that the migration can finish.**
+
+    """,
+    "summary": "",
+    "website": "",
+    "category": 'Tools',
+    "auto_install": False,
+    "installable": True,
+    "application": False,
+    "external_dependencies": {
+        "python": [
+            "minio",
+        ],
+    },
+}
diff --git a/attachment_minio/migrations/13.0.0.0.1/post-migration.py b/attachment_minio/migrations/13.0.0.0.1/post-migration.py
new file mode 100644
index 00000000..b8a62e3a
--- /dev/null
+++ b/attachment_minio/migrations/13.0.0.0.1/post-migration.py
@@ -0,0 +1,67 @@
+# Copyright 2020 Hibou Corp.
+# Copyright 2016-2019 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
+
+import logging
+
+from contextlib import closing
+
+import odoo
+
+_logger = logging.getLogger(__name__)
+
+
+def migrate(cr, version):
+    if not version:
+        return
+    cr.execute("""
+        SELECT value FROM ir_config_parameter
+        WHERE key = 'ir_attachment.location'
+    """)
+    row = cr.fetchone()
+
+    if row[0] == 's3':
+        uid = odoo.SUPERUSER_ID
+        registry = odoo.modules.registry.Registry(cr.dbname)
+        new_cr = registry.cursor()
+        with closing(new_cr):
+            with odoo.api.Environment.manage():
+                env = odoo.api.Environment(new_cr, uid, {})
+                store_local = env['ir.attachment'].search(
+                    [('store_fname', '=like', 's3://%'),
+                     '|', ('res_model', '=', 'ir.ui.view'),
+                          ('res_field', 'in', ['image_small',
+                                               'image_medium',
+                                               'web_icon_data',
+                                               # image.mixin sizes
+                                               # image_128 is essentially image_medium
+                                               'image_128',
+                                               # depending on use case, these may need migrated/moved
+                                               # 'image_256',
+                                               # 'image_512',
+                                               ])
+                     ],
+                )
+
+                _logger.info(
+                    'Moving %d attachments from S3 to DB for fast access',
+                    len(store_local)
+                )
+                for attachment_id in store_local.ids:
+                    # force re-storing the document, will move
+                    # it from the object storage to the database
+
+                    # This is a trick to avoid having the 'datas' function
+                    # fields computed for every attachment on each
+                    # iteration of the loop.  The former issue being that
+                    # it reads the content of the file of ALL the
+                    # attachments on each loop.
+                    try:
+                        env.clear()
+                        attachment = env['ir.attachment'].browse(attachment_id)
+                        _logger.info('Moving attachment %s (id: %s)',
+                                     attachment.name, attachment.id)
+                        attachment.write({'datas': attachment.datas})
+                        new_cr.commit()
+                    except:
+                        new_cr.rollback()
diff --git a/attachment_minio/models/__init__.py b/attachment_minio/models/__init__.py
new file mode 100644
index 00000000..aaf38a16
--- /dev/null
+++ b/attachment_minio/models/__init__.py
@@ -0,0 +1 @@
+from . import ir_attachment
diff --git a/attachment_minio/models/ir_attachment.py b/attachment_minio/models/ir_attachment.py
new file mode 100644
index 00000000..70ba2640
--- /dev/null
+++ b/attachment_minio/models/ir_attachment.py
@@ -0,0 +1,112 @@
+# Copyright 2020 Hibou Corp.
+# Copyright 2016 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
+
+import io
+import base64
+import logging
+from minio import Minio
+from minio.error import NoSuchKey
+
+from odoo import api, exceptions, models, tools
+from ..s3uri import S3Uri
+
+_logger = logging.getLogger(__name__)
+
+
+class MinioAttachment(models.Model):
+    _inherit = 'ir.attachment'
+
+    @api.model
+    def _get_minio_client(self):
+        config = tools.config
+        params = self.env['ir.config_parameter'].sudo()
+        host = params.get_param('ir_attachment.location.host') or config.get('attachment_minio_host')
+        region = params.get_param('ir_attachment.location.region') or config.get('attachment_minio_region', 'us-west-1')
+        access_key = params.get_param('ir_attachment.location.access_key') or config.get('attachment_minio_access_key')
+        secret_key = params.get_param('ir_attachment.location.secret_key') or config.get('attachment_minio_secret_key')
+        secure = params.get_param('ir_attachment.location.secure') or config.get('attachment_minio_secure')
+        if not all((host, access_key, secret_key)):
+            raise exceptions.UserError('Incorrect configuration of attachment_minio.')
+        return Minio(host,
+                           access_key=access_key,
+                           secret_key=secret_key,
+                           region=region,
+                           secure=bool(secure))
+
+    @api.model
+    def _get_minio_bucket(self, client, name=None):
+        config = tools.config
+        params = self.env['ir.config_parameter'].sudo()
+        bucket = name or params.get_param('ir_attachment.location.bucket') or config.get('attachment_minio_bucket')
+        if not bucket:
+            raise exceptions.UserError('Incorrect configuration of attachment_minio -- Missing bucket.')
+        if not client.bucket_exists(bucket):
+            region = params.get_param('ir_attachment.location.region', 'us-west-1')
+            client.make_bucket(bucket, region)
+        return bucket
+
+    @api.model
+    def _get_minio_key(self, sha):
+        # scatter files across 256 dirs
+        # This mirrors Odoo's own object storage so that it is easier to migrate
+        # to or from external storage.
+        fname = sha[:2] + '/' + sha
+        return fname
+
+    @api.model
+    def _get_minio_fname(self, bucket, key):
+        return 's3://%s/%s' % (bucket, key)
+
+    # core API methods from base_attachment_object_storage
+
+    def _get_stores(self):
+        res = super(MinioAttachment, self)._get_stores()
+        res.append('s3')
+        return res
+
+    @api.model
+    def _store_file_read(self, fname, bin_size=False):
+        if fname.startswith('s3://'):
+            client = self._get_minio_client()
+            s3uri = S3Uri(fname)
+            bucket = self._get_minio_bucket(client, name=s3uri.bucket())
+            try:
+                response = client.get_object(bucket, s3uri.item())
+                return base64.b64encode(response.read())
+            except NoSuchKey:
+                _logger.info('attachment "%s" missing from remote object storage', (fname, ))
+            return ''
+        return super(MinioAttachment, self)._store_file_read(fname, bin_size=bin_size)
+
+    @api.model
+    def _store_file_write(self, key, bin_data):
+        if self._storage() == 's3':
+            client = self._get_minio_client()
+            bucket = self._get_minio_bucket(client)
+            minio_key = self._get_minio_key(key)
+            with io.BytesIO(bin_data) as bin_data_io:
+                client.put_object(bucket, minio_key, bin_data_io, len(bin_data),
+                                  content_type=self.mimetype)
+            return self._get_minio_fname(bucket, minio_key)
+        return super(MinioAttachment, self)._store_file_write(key, bin_data)
+
+    @api.model
+    def _store_file_delete(self, fname):
+        if fname.startswith('s3://'):
+            client = self._get_minio_client()
+            try:
+                s3uri = S3Uri(fname)
+            except ValueError:
+                # Cannot delete unparsable file
+                return True
+            bucket_name = s3uri.bucket()
+            if bucket_name == self._get_minio_bucket(client):
+                try:
+                    client.remove_object(bucket_name, s3uri.item())
+                except NoSuchKey:
+                    _logger.info('unable to remove missing attachment "%s" from remote object storage', (fname, ))
+            else:
+                _logger.info('skip delete "%s" because of bucket-mismatch', (fname, ))
+            return
+        return super(MinioAttachment, self)._store_file_delete(fname)
diff --git a/attachment_minio/s3uri.py b/attachment_minio/s3uri.py
new file mode 100644
index 00000000..f94df79e
--- /dev/null
+++ b/attachment_minio/s3uri.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Copyright 2016 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
+
+import re
+
+
+class S3Uri(object):
+
+    _url_re = re.compile("^s3:///*([^/]*)/?(.*)", re.IGNORECASE | re.UNICODE)
+
+    def __init__(self, uri):
+        match = self._url_re.match(uri)
+        if not match:
+            raise ValueError("%s: is not a valid S3 URI" % (uri,))
+        self._bucket, self._item = match.groups()
+
+    def bucket(self):
+        return self._bucket
+
+    def item(self):
+        return self._item
diff --git a/auth_admin/__init__.py b/auth_admin/__init__.py
new file mode 100755
index 00000000..e4f4917a
--- /dev/null
+++ b/auth_admin/__init__.py
@@ -0,0 +1,3 @@
+from . import controllers
+from . import models
+from . import wizard
diff --git a/auth_admin/__manifest__.py b/auth_admin/__manifest__.py
new file mode 100755
index 00000000..1420a7a3
--- /dev/null
+++ b/auth_admin/__manifest__.py
@@ -0,0 +1,28 @@
+{
+    'name': 'Auth Admin',
+    'author': 'Hibou Corp. <hello@hibou.io>',
+    'category': 'Hidden',
+    'version': '13.0.1.0.0',
+    'description':
+        """
+Login as other user
+===================
+
+Provides a way for an authenticated user, with certain permissions, to login as a different user.
+Can also create a URL that logs in as that user.
+
+Out of the box, only allows you to generate a login for an 'External User', e.g. portal users.
+
+*2017-11-15* New button to generate the login on the Portal User Wizard (Action on Contact)
+        """,
+    'depends': [
+        'base',
+        'website',
+        'portal',
+    ],
+    'auto_install': False,
+    'data': [
+        'views/res_users.xml',
+        'wizard/portal_wizard_views.xml',
+    ],
+}
diff --git a/auth_admin/controllers/__init__.py b/auth_admin/controllers/__init__.py
new file mode 100755
index 00000000..757b12a1
--- /dev/null
+++ b/auth_admin/controllers/__init__.py
@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+from . import main
diff --git a/auth_admin/controllers/main.py b/auth_admin/controllers/main.py
new file mode 100755
index 00000000..cf0ac9df
--- /dev/null
+++ b/auth_admin/controllers/main.py
@@ -0,0 +1,39 @@
+from odoo import http, exceptions
+from ..models.res_users import check_admin_auth_login
+
+from logging import getLogger
+_logger = getLogger(__name__)
+
+
+class AuthAdmin(http.Controller):
+
+    @http.route(['/auth_admin'], type='http', auth='public', website=True)
+    def index(self, *args, **post):
+        u = post.get('u')
+        e = post.get('e')
+        o = post.get('o')
+        h = post.get('h')
+
+        if not all([u, e, o, h]):
+            exceptions.Warning('Invalid Request')
+
+        u = str(u)
+        e = str(e)
+        o = str(o)
+        h = str(h)
+
+        try:
+            user = check_admin_auth_login(http.request.env, u, e, o, h)
+
+            http.request.session.uid = user.id
+            http.request.session.login = user.login
+            http.request.session.password = ''
+            http.request.session.auth_admin = int(o)
+            http.request.uid = user.id
+            uid = http.request.session.authenticate(http.request.session.db, user.login, 'x')
+            if uid is not False:
+                http.request.params['login_success'] = True
+                return http.redirect_with_hash('/my/home')
+            return http.local_redirect('/my/home')
+        except (exceptions.Warning, ) as e:
+            return http.Response(e.message, status=400)
diff --git a/auth_admin/models/__init__.py b/auth_admin/models/__init__.py
new file mode 100755
index 00000000..88351653
--- /dev/null
+++ b/auth_admin/models/__init__.py
@@ -0,0 +1 @@
+from . import res_users
diff --git a/auth_admin/models/res_users.py b/auth_admin/models/res_users.py
new file mode 100755
index 00000000..074abca0
--- /dev/null
+++ b/auth_admin/models/res_users.py
@@ -0,0 +1,92 @@
+from odoo import models, api, exceptions
+from odoo.http import request
+from datetime import datetime
+from time import mktime
+import hmac
+from hashlib import sha256
+
+from logging import getLogger
+_logger = getLogger(__name__)
+
+
+def admin_auth_generate_login(env, user):
+    """
+    Generates a URL to allow the current user to login as the portal user.
+
+    :param env: Odoo environment
+    :param user: `res.users` in
+    :return:
+    """
+    if not env['res.partner'].check_access_rights('write'):
+        return None
+    u = str(user.id)
+    now = datetime.utcnow()
+    fifteen = int(mktime(now.timetuple())) + (15 * 60)
+    e = str(fifteen)
+    o = str(env.uid)
+
+    config = env['ir.config_parameter'].sudo()
+    key = str(config.search([('key', '=', 'database.secret')], limit=1).value)
+    h = hmac.new(key.encode(), (u + e + o).encode(), sha256)
+
+    base_url = str(config.search([('key', '=', 'web.base.url')], limit=1).value)
+
+    _logger.warn('login url for user id: ' + u + ' original user id: ' + o)
+
+    return base_url + '/auth_admin?u=' + u + '&e=' + e + '&o=' + o + '&h=' + h.hexdigest()
+
+
+def check_admin_auth_login(env, u_user_id, e_expires, o_org_user_id, hash_):
+    """
+    Checks that the parameters are valid and that the user exists.
+
+    :param env: Odoo environment
+    :param u_user_id: Desired user id to login as.
+    :param e_expires: Expiration timestamp
+    :param o_org_user_id: Original user id.
+    :param hash_: HMAC generated hash
+    :return: `res.users`
+    """
+
+    now = datetime.utcnow()
+    now = int(mktime(now.timetuple()))
+    fifteen = now + (15 * 60)
+
+    config = env['ir.config_parameter'].sudo()
+    key = str(config.search([('key', '=', 'database.secret')], limit=1).value)
+
+    myh = hmac.new(key.encode(), str(str(u_user_id) + str(e_expires) + str(o_org_user_id)).encode(), sha256)
+
+    if not hmac.compare_digest(hash_, myh.hexdigest()):
+        raise exceptions.AccessDenied('Invalid Request')
+
+    if not (now <= int(e_expires) <= fifteen):
+        raise exceptions.AccessDenied('Expired')
+
+    user = env['res.users'].sudo().search([('id', '=', int(u_user_id))], limit=1)
+    if not user.id:
+        raise exceptions.AccessDenied('Invalid User')
+    return user
+
+
+class ResUsers(models.Model):
+    _inherit = 'res.users'
+
+    def admin_auth_generate_login(self):
+        self.ensure_one()
+
+        login_url = admin_auth_generate_login(self.env, self)
+        if login_url:
+            raise exceptions.Warning(login_url)
+
+        return False
+
+    def _check_credentials(self, password):
+        try:
+            return super(ResUsers, self)._check_credentials(password)
+        except exceptions.AccessDenied:
+            if request and hasattr(request, 'session') and request.session.get('auth_admin'):
+                _logger.warn('_check_credentials for user id: ' + \
+                             str(request.session.uid) + ' original user id: ' + str(request.session.auth_admin))
+            else:
+                raise
diff --git a/auth_admin/views/res_users.xml b/auth_admin/views/res_users.xml
new file mode 100755
index 00000000..b818c870
--- /dev/null
+++ b/auth_admin/views/res_users.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="auth_admin_view_users_tree" model="ir.ui.view">
+        <field name="name">auth_admin.res.users.tree</field>
+        <field name="model">res.users</field>
+        <field name="inherit_id" ref="base.view_users_tree"/>
+        <field name="arch" type="xml">
+            <xpath expr="//tree" position="inside">
+                <field name="share" invisible="1"/>
+                <button string="Generate Login" type="object" name="admin_auth_generate_login" attrs="{'invisible': [('share', '=', False)]}"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/auth_admin/wizard/__init__.py b/auth_admin/wizard/__init__.py
new file mode 100755
index 00000000..8bff21fa
--- /dev/null
+++ b/auth_admin/wizard/__init__.py
@@ -0,0 +1 @@
+from . import portal_wizard
diff --git a/auth_admin/wizard/portal_wizard.py b/auth_admin/wizard/portal_wizard.py
new file mode 100755
index 00000000..e2e9486c
--- /dev/null
+++ b/auth_admin/wizard/portal_wizard.py
@@ -0,0 +1,31 @@
+from odoo import api, fields, models
+from ..models.res_users import admin_auth_generate_login
+
+
+class PortalWizard(models.TransientModel):
+    _inherit = 'portal.wizard'
+
+    def admin_auth_generate_login(self):
+        self.ensure_one()
+        self.user_ids.admin_auth_generate_login()
+        return {
+            "type": "ir.actions.act_window",
+            "res_model": self._name,
+            "views": [[False, "form"]],
+            "res_id": self.id,
+            "target": "new",
+        }
+
+
+class PortalWizardUser(models.TransientModel):
+    _inherit = 'portal.wizard.user'
+
+    force_login_url = fields.Char(string='Force Login URL')
+
+    def admin_auth_generate_login(self):
+        ir_model_access = self.env['ir.model.access']
+        for row in self.filtered(lambda r: r.in_portal):
+            user = row.partner_id.user_ids[0] if row.partner_id.user_ids else None
+            if ir_model_access.check('res.partner', mode='unlink') and user:
+                row.force_login_url = admin_auth_generate_login(self.env, user)
+        self.filtered(lambda r: not r.in_portal).update({'force_login_url': ''})
diff --git a/auth_admin/wizard/portal_wizard_views.xml b/auth_admin/wizard/portal_wizard_views.xml
new file mode 100755
index 00000000..6389e4ca
--- /dev/null
+++ b/auth_admin/wizard/portal_wizard_views.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="portal_wizard" model="ir.ui.view">
+        <field name="name">Portal Access Management - Auth Admin</field>
+        <field name="model">portal.wizard</field>
+        <field name="inherit_id" ref="portal.wizard_view"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='in_portal']" position="after">
+                <field name="force_login_url"/>
+            </xpath>
+            <xpath expr="//button[last()]" position="after">
+                <button string="Generate Login URL" type="object" name="admin_auth_generate_login" class="btn-primary" />
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
\ No newline at end of file
diff --git a/base_attachment_object_storage b/base_attachment_object_storage
new file mode 120000
index 00000000..aa3e0960
--- /dev/null
+++ b/base_attachment_object_storage
@@ -0,0 +1 @@
+./external/camptocamp-cloud-platform/base_attachment_object_storage
\ No newline at end of file
diff --git a/delivery_fedex_hibou/__init__.py b/delivery_fedex_hibou/__init__.py
new file mode 100644
index 00000000..0650744f
--- /dev/null
+++ b/delivery_fedex_hibou/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/delivery_fedex_hibou/__manifest__.py b/delivery_fedex_hibou/__manifest__.py
new file mode 100644
index 00000000..347e017a
--- /dev/null
+++ b/delivery_fedex_hibou/__manifest__.py
@@ -0,0 +1,19 @@
+{
+    'name': 'Hibou Fedex Shipping',
+    'version': '13.0.1.0.0',
+    'category': 'Stock',
+    'author': "Hibou Corp.",
+    'license': 'AGPL-3',
+    'website': 'https://hibou.io/',
+    'depends': [
+        'delivery_fedex',
+        'delivery_hibou',
+    ],
+    'data': [
+        'views/stock_views.xml',
+    ],
+    'demo': [
+    ],
+    'installable': True,
+    'application': False,
+ }
diff --git a/delivery_fedex_hibou/models/__init__.py b/delivery_fedex_hibou/models/__init__.py
new file mode 100644
index 00000000..cfdf1b44
--- /dev/null
+++ b/delivery_fedex_hibou/models/__init__.py
@@ -0,0 +1,2 @@
+from . import delivery_fedex
+from . import stock
diff --git a/delivery_fedex_hibou/models/delivery_fedex.py b/delivery_fedex_hibou/models/delivery_fedex.py
new file mode 100644
index 00000000..3fb7a6c1
--- /dev/null
+++ b/delivery_fedex_hibou/models/delivery_fedex.py
@@ -0,0 +1,453 @@
+import logging
+from odoo import fields, models, tools, _
+from odoo.exceptions import UserError, ValidationError
+from odoo.addons.delivery_fedex.models.delivery_fedex import _convert_curr_iso_fdx
+from .fedex_request import FedexRequest
+
+pdf = tools.pdf
+_logger = logging.getLogger(__name__)
+
+
+class DeliveryFedex(models.Model):
+    _inherit = 'delivery.carrier'
+
+    fedex_service_type = fields.Selection(selection_add=[
+        ('GROUND_HOME_DELIVERY', 'GROUND_HOME_DELIVERY'),
+        # ('FEDEX_EXPRESS_SAVER', 'FEDEX_EXPRESS_SAVER'),  # included in 13.0, ensure it stays there...
+    ])
+
+    def _get_fedex_is_third_party(self, order=None, picking=None):
+        third_party_account = self.get_third_party_account(order=order, picking=picking)
+        if third_party_account:
+            if not third_party_account.delivery_type == 'fedex':
+                raise ValidationError('Non-FedEx Shipping Account indicated during FedEx shipment.')
+            return True
+        return False
+
+    def _get_fedex_payment_account_number(self, order=None, picking=None):
+        """
+        Common hook to customize what Fedex Account number to use.
+        :return: FedEx Account Number
+        """
+        # Provided by Hibou Odoo Suite `delivery_hibou`
+        third_party_account = self.get_third_party_account(order=order, picking=picking)
+        if third_party_account:
+            if not third_party_account.delivery_type == 'fedex':
+                raise ValidationError('Non-FedEx Shipping Account indicated during FedEx shipment.')
+            return third_party_account.name
+        return self.fedex_account_number
+
+    def _get_fedex_account_number(self, order=None, picking=None):
+        if order:
+            # third_party_account = self.get_third_party_account(order=order, picking=picking)
+            # if third_party_account:
+            #     if not third_party_account.delivery_type == 'fedex':
+            #         raise ValidationError('Non-FedEx Shipping Account indicated during FedEx shipment.')
+            #     return third_party_account.name
+            if order.warehouse_id.fedex_account_number:
+                return order.warehouse_id.fedex_account_number
+            return self.fedex_account_number
+        if picking:
+            if picking.picking_type_id.warehouse_id.fedex_account_number:
+                return picking.picking_type_id.warehouse_id.fedex_account_number
+        return self.fedex_account_number
+
+    def _get_fedex_meter_number(self, order=None, picking=None):
+        if order:
+            if order.warehouse_id.fedex_meter_number:
+                return order.warehouse_id.fedex_meter_number
+            return self.fedex_meter_number
+        if picking:
+            if picking.picking_type_id.warehouse_id.fedex_meter_number:
+                return picking.picking_type_id.warehouse_id.fedex_meter_number
+        return self.fedex_meter_number
+
+    def _get_fedex_recipient_is_residential(self, partner):
+        if self.fedex_service_type.find('HOME') >= 0:
+            return True
+        return not partner.is_company
+
+    """
+    Overrides to use Hibou Delivery methods to get shipper etc. and to add 'transit_days' to result.
+    """
+    def fedex_rate_shipment(self, order):
+        max_weight = self._fedex_convert_weight(self.fedex_default_packaging_id.max_weight, self.fedex_weight_unit)
+        price = 0.0
+        is_india = order.partner_shipping_id.country_id.code == 'IN' and order.company_id.partner_id.country_id.code == 'IN'
+
+        # Estimate weight of the sales order; will be definitely recomputed on the picking field "weight"
+        est_weight_value = sum([(line.product_id.weight * line.product_uom_qty) for line in order.order_line if not line.display_type]) or 0.0
+        weight_value = self._fedex_convert_weight(est_weight_value, self.fedex_weight_unit)
+
+        # Some users may want to ship very lightweight items; in order to give them a rating, we round the
+        # converted weight of the shipping to the smallest value accepted by FedEx: 0.01 kg or lb.
+        # (in the case where the weight is actually 0.0 because weights are not set, don't do this)
+        if weight_value > 0.0:
+            weight_value = max(weight_value, 0.01)
+
+        order_currency = order.currency_id
+        superself = self.sudo()
+
+        # Hibou Delivery methods for collecting details in an overridable way
+        shipper_company = superself.get_shipper_company(order=order)
+        shipper_warehouse = superself.get_shipper_warehouse(order=order)
+        recipient = superself.get_recipient(order=order)
+        acc_number = superself._get_fedex_account_number(order=order)
+        meter_number = superself._get_fedex_meter_number(order=order)
+        order_name = superself.get_order_name(order=order)
+        residential = self._get_fedex_recipient_is_residential(recipient)
+        date_planned = None
+        if self.env.context.get('date_planned'):
+            date_planned = self.env.context.get('date_planned')
+
+        # Authentication stuff
+        srm = FedexRequest(self.log_xml, request_type="rating", prod_environment=self.prod_environment)
+        srm.web_authentication_detail(superself.fedex_developer_key, superself.fedex_developer_password)
+        srm.client_detail(acc_number, meter_number)
+
+        # Build basic rating request and set addresses
+        srm.transaction_detail(order_name)
+        srm.shipment_request(
+            self.fedex_droppoff_type,
+            self.fedex_service_type,
+            self.fedex_default_packaging_id.shipper_package_code,
+            self.fedex_weight_unit,
+            self.fedex_saturday_delivery,
+        )
+        pkg = self.fedex_default_packaging_id
+
+        srm.set_currency(_convert_curr_iso_fdx(order_currency.name))
+        srm.set_shipper(shipper_company, shipper_warehouse)
+        srm.set_recipient(recipient, residential=residential)
+
+        if max_weight and weight_value > max_weight:
+            total_package = int(weight_value / max_weight)
+            last_package_weight = weight_value % max_weight
+
+            for sequence in range(1, total_package + 1):
+                srm.add_package(
+                    max_weight,
+                    package_code=pkg.shipper_package_code,
+                    package_height=pkg.height,
+                    package_width=pkg.width,
+                    package_length=pkg.length,
+                    sequence_number=sequence,
+                    mode='rating',
+                )
+            if last_package_weight:
+                total_package = total_package + 1
+                srm.add_package(
+                    last_package_weight,
+                    package_code=pkg.shipper_package_code,
+                    package_height=pkg.height,
+                    package_width=pkg.width,
+                    package_length=pkg.length,
+                    sequence_number=total_package,
+                    mode='rating',
+                )
+            srm.set_master_package(weight_value, total_package)
+        else:
+            srm.add_package(
+                weight_value,
+                package_code=pkg.shipper_package_code,
+                package_height=pkg.height,
+                package_width=pkg.width,
+                package_length=pkg.length,
+                mode='rating',
+            )
+            srm.set_master_package(weight_value, 1)
+
+        # Commodities for customs declaration (international shipping)
+        if self.fedex_service_type in ['INTERNATIONAL_ECONOMY', 'INTERNATIONAL_PRIORITY'] or is_india:
+            total_commodities_amount = 0.0
+            commodity_country_of_manufacture = order.warehouse_id.partner_id.country_id.code
+
+            for line in order.order_line.filtered(lambda l: l.product_id.type in ['product', 'consu'] and not l.display_type):
+                commodity_amount = line.price_reduce_taxinc
+                total_commodities_amount += (commodity_amount * line.product_uom_qty)
+                commodity_description = line.product_id.name
+                commodity_number_of_piece = '1'
+                commodity_weight_units = self.fedex_weight_unit
+                commodity_weight_value = self._fedex_convert_weight(line.product_id.weight * line.product_uom_qty, self.fedex_weight_unit)
+                commodity_quantity = line.product_uom_qty
+                commodity_quantity_units = 'EA'
+                commodity_harmonized_code = line.product_id.hs_code or ''
+                srm.commodities(_convert_curr_iso_fdx(order_currency.name), commodity_amount, commodity_number_of_piece, commodity_weight_units, commodity_weight_value, commodity_description, commodity_country_of_manufacture, commodity_quantity, commodity_quantity_units, commodity_harmonized_code)
+            srm.customs_value(_convert_curr_iso_fdx(order_currency.name), total_commodities_amount, "NON_DOCUMENTS")
+            srm.duties_payment(order.warehouse_id.partner_id, acc_number, superself.fedex_duty_payment)
+
+        request = srm.rate(date_planned=date_planned)
+
+        warnings = request.get('warnings_message')
+        if warnings:
+            _logger.info(warnings)
+
+        if not request.get('errors_message'):
+            if _convert_curr_iso_fdx(order_currency.name) in request['price']:
+                price = request['price'][_convert_curr_iso_fdx(order_currency.name)]
+            else:
+                _logger.info("Preferred currency has not been found in FedEx response")
+                company_currency = order.company_id.currency_id
+                if _convert_curr_iso_fdx(company_currency.name) in request['price']:
+                    amount = request['price'][_convert_curr_iso_fdx(company_currency.name)]
+                    price = company_currency._convert(amount, order_currency, order.company_id, order.date_order or fields.Date.today())
+                else:
+                    amount = request['price']['USD']
+                    price = company_currency._convert(amount, order_currency, order.company_id, order.date_order or fields.Date.today())
+        else:
+            return {'success': False,
+                    'price': 0.0,
+                    'error_message': _('Error:\n%s') % request['errors_message'],
+                    'warning_message': False}
+
+        return {'success': True,
+                'price': price,
+                'error_message': False,
+                'transit_days': request.get('transit_days', False),
+                'date_delivered': request.get('date_delivered', False),
+                'warning_message': _('Warning:\n%s') % warnings if warnings else False}
+
+    """
+    Overrides to use Hibou Delivery methods to get shipper etc. and add insurance.
+    """
+    def fedex_send_shipping(self, pickings):
+        res = []
+
+        for picking in pickings:
+
+            srm = FedexRequest(self.log_xml, request_type="shipping", prod_environment=self.prod_environment)
+            superself = self.sudo()
+
+            shipper_company = superself.get_shipper_company(picking=picking)
+            shipper_warehouse = superself.get_shipper_warehouse(picking=picking)
+            recipient = superself.get_recipient(picking=picking)
+            acc_number = superself._get_fedex_account_number(picking=picking)
+            meter_number = superself._get_fedex_meter_number(picking=picking)
+            payment_acc_number = superself._get_fedex_payment_account_number()
+            order_name = superself.get_order_name(picking=picking)
+            attn = superself.get_attn(picking=picking)
+            insurance_value = superself.get_insurance_value(picking=picking)
+            residential = self._get_fedex_recipient_is_residential(recipient)
+
+            srm.web_authentication_detail(superself.fedex_developer_key, superself.fedex_developer_password)
+            srm.client_detail(acc_number, meter_number)
+
+            srm.transaction_detail(picking.id)
+
+            package_type = picking.package_ids and picking.package_ids[0].packaging_id.shipper_package_code or self.fedex_default_packaging_id.shipper_package_code
+            srm.shipment_request(self.fedex_droppoff_type, self.fedex_service_type, package_type, self.fedex_weight_unit, self.fedex_saturday_delivery)
+            srm.set_currency(_convert_curr_iso_fdx(picking.company_id.currency_id.name))
+            srm.set_shipper(shipper_company, shipper_warehouse)
+            srm.set_recipient(recipient, attn=attn, residential=residential)
+
+            srm.shipping_charges_payment(payment_acc_number, third_party=bool(self.get_third_party_account(picking=picking)))
+
+            srm.shipment_label('COMMON2D', self.fedex_label_file_type, self.fedex_label_stock_type, 'TOP_EDGE_OF_TEXT_FIRST', 'SHIPPING_LABEL_FIRST')
+
+            order = picking.sale_id
+            company = shipper_company
+            order_currency = picking.sale_id.currency_id or picking.company_id.currency_id
+
+            net_weight = self._fedex_convert_weight(picking.shipping_weight, self.fedex_weight_unit)
+
+            # Commodities for customs declaration (international shipping)
+            if self.fedex_service_type in ['INTERNATIONAL_ECONOMY', 'INTERNATIONAL_PRIORITY'] or (picking.partner_id.country_id.code == 'IN' and picking.picking_type_id.warehouse_id.partner_id.country_id.code == 'IN'):
+
+                commodity_currency = order_currency
+                total_commodities_amount = 0.0
+                commodity_country_of_manufacture = picking.picking_type_id.warehouse_id.partner_id.country_id.code
+
+                for operation in picking.move_line_ids:
+                    commodity_amount = operation.move_id.sale_line_id.price_reduce_taxinc or operation.product_id.list_price
+                    total_commodities_amount += (commodity_amount * operation.qty_done)
+                    commodity_description = operation.product_id.name
+                    commodity_number_of_piece = '1'
+                    commodity_weight_units = self.fedex_weight_unit
+                    commodity_weight_value = self._fedex_convert_weight(operation.product_id.weight * operation.qty_done, self.fedex_weight_unit)
+                    commodity_quantity = operation.qty_done
+                    commodity_quantity_units = 'EA'
+                    commodity_harmonized_code = operation.product_id.hs_code or ''
+                    srm.commodities(_convert_curr_iso_fdx(commodity_currency.name), commodity_amount, commodity_number_of_piece, commodity_weight_units, commodity_weight_value, commodity_description, commodity_country_of_manufacture, commodity_quantity, commodity_quantity_units, commodity_harmonized_code)
+                srm.customs_value(_convert_curr_iso_fdx(commodity_currency.name), total_commodities_amount, "NON_DOCUMENTS")
+                srm.duties_payment(shipper_warehouse.partner_id, acc_number, superself.fedex_duty_payment)
+                send_etd = superself.env['ir.config_parameter'].get_param("delivery_fedex.send_etd")
+                srm.commercial_invoice(self.fedex_document_stock_type, send_etd)
+
+            package_count = len(picking.package_ids) or 1
+
+            # For india picking courier is not accepted without this details in label.
+            po_number = order.display_name or False
+            dept_number = False
+            if picking.partner_id.country_id.code == 'IN' and picking.picking_type_id.warehouse_id.partner_id.country_id.code == 'IN':
+                po_number = 'B2B' if picking.partner_id.commercial_partner_id.is_company else 'B2C'
+                dept_number = 'BILL D/T: SENDER'
+
+            # TODO RIM master: factorize the following crap
+
+            ################
+            # Multipackage #
+            ################
+            if package_count > 1:
+
+                # Note: Fedex has a complex multi-piece shipping interface
+                # - Each package has to be sent in a separate request
+                # - First package is called "master" package and holds shipping-
+                #   related information, including addresses, customs...
+                # - Last package responses contains shipping price and code
+                # - If a problem happens with a package, every previous package
+                #   of the shipping has to be cancelled separately
+                # (Why doing it in a simple way when the complex way exists??)
+
+                master_tracking_id = False
+                package_labels = []
+                carrier_tracking_ref = ""
+
+                for sequence, package in enumerate(picking.package_ids, start=1):
+
+                    package_weight = self._fedex_convert_weight(package.shipping_weight, self.fedex_weight_unit)
+                    packaging = package.packaging_id
+
+                    # Hibou Delivery
+                    # Add more details to package.
+                    srm._add_package(
+                        package_weight,
+                        package_code=packaging.shipper_package_code,
+                        package_height=packaging.height,
+                        package_width=packaging.width,
+                        package_length=packaging.length,
+                        sequence_number=sequence,
+                        po_number=po_number,
+                        dept_number=dept_number,
+                        # reference=picking.display_name,
+                        reference=('%s-%d' % (order_name, sequence)),  # above "reference" is new in 13.0, using new name but old value
+                        insurance=insurance_value,
+                    )
+                    srm.set_master_package(net_weight, package_count, master_tracking_id=master_tracking_id)
+                    request = srm.process_shipment()
+                    package_name = package.name or sequence
+
+                    warnings = request.get('warnings_message')
+                    if warnings:
+                        _logger.info(warnings)
+
+                    # First package
+                    if sequence == 1:
+                        if not request.get('errors_message'):
+                            master_tracking_id = request['master_tracking_id']
+                            package_labels.append((package_name, srm.get_label()))
+                            carrier_tracking_ref = request['tracking_number']
+                        else:
+                            raise UserError(request['errors_message'])
+
+                    # Intermediary packages
+                    elif sequence > 1 and sequence < package_count:
+                        if not request.get('errors_message'):
+                            package_labels.append((package_name, srm.get_label()))
+                            carrier_tracking_ref = carrier_tracking_ref + "," + request['tracking_number']
+                        else:
+                            raise UserError(request['errors_message'])
+
+                    # Last package
+                    elif sequence == package_count:
+                        # recuperer le label pdf
+                        if not request.get('errors_message'):
+                            package_labels.append((package_name, srm.get_label()))
+
+                            if _convert_curr_iso_fdx(order_currency.name) in request['price']:
+                                carrier_price = request['price'][_convert_curr_iso_fdx(order_currency.name)]
+                            else:
+                                _logger.info("Preferred currency has not been found in FedEx response")
+                                company_currency = picking.company_id.currency_id
+                                if _convert_curr_iso_fdx(company_currency.name) in request['price']:
+                                    amount = request['price'][_convert_curr_iso_fdx(company_currency.name)]
+                                    carrier_price = company_currency._convert(
+                                        amount, order_currency, company, order.date_order or fields.Date.today())
+                                else:
+                                    amount = request['price']['USD']
+                                    carrier_price = company_currency._convert(
+                                        amount, order_currency, company, order.date_order or fields.Date.today())
+
+                            carrier_tracking_ref = carrier_tracking_ref + "," + request['tracking_number']
+
+                            logmessage = _("Shipment created into Fedex<br/>"
+                                           "<b>Tracking Numbers:</b> %s<br/>"
+                                           "<b>Packages:</b> %s") % (carrier_tracking_ref, ','.join([pl[0] for pl in package_labels]))
+                            if self.fedex_label_file_type != 'PDF':
+                                attachments = [('LabelFedex-%s.%s' % (pl[0], self.fedex_label_file_type), pl[1]) for pl in package_labels]
+                            if self.fedex_label_file_type == 'PDF':
+                                attachments = [('LabelFedex.pdf', pdf.merge_pdf([pl[1] for pl in package_labels]))]
+                            picking.message_post(body=logmessage, attachments=attachments)
+                            shipping_data = {'exact_price': carrier_price,
+                                             'tracking_number': carrier_tracking_ref}
+                            res = res + [shipping_data]
+                        else:
+                            raise UserError(request['errors_message'])
+
+            # TODO RIM handle if a package is not accepted (others should be deleted)
+
+            ###############
+            # One package #
+            ###############
+            elif package_count == 1:
+                packaging = picking.package_ids[:1].packaging_id or picking.carrier_id.fedex_default_packaging_id
+                srm._add_package(
+                    net_weight,
+                    package_code=packaging.shipper_package_code,
+                    package_height=packaging.height,
+                    package_width=packaging.width,
+                    package_length=packaging.length,
+                    po_number=po_number,
+                    dept_number=dept_number,
+                    # reference=picking.display_name,
+                    reference=order_name,  # above "reference" is new in 13.0, using new name but old value
+                    insurance=insurance_value,
+                )
+                srm.set_master_package(net_weight, 1)
+
+                # Ask the shipping to fedex
+                request = srm.process_shipment()
+
+                warnings = request.get('warnings_message')
+                if warnings:
+                    _logger.info(warnings)
+
+                if not request.get('errors_message'):
+
+                    if _convert_curr_iso_fdx(order_currency.name) in request['price']:
+                        carrier_price = request['price'][_convert_curr_iso_fdx(order_currency.name)]
+                    else:
+                        _logger.info("Preferred currency has not been found in FedEx response")
+                        company_currency = picking.company_id.currency_id
+                        if _convert_curr_iso_fdx(company_currency.name) in request['price']:
+                            amount = request['price'][_convert_curr_iso_fdx(company_currency.name)]
+                            carrier_price = company_currency._convert(
+                                amount, order_currency, company, order.date_order or fields.Date.today())
+                        else:
+                            amount = request['price']['USD']
+                            carrier_price = company_currency._convert(
+                                amount, order_currency, company, order.date_order or fields.Date.today())
+
+                    carrier_tracking_ref = request['tracking_number']
+                    logmessage = (_("Shipment created into Fedex <br/> <b>Tracking Number : </b>%s") % (carrier_tracking_ref))
+
+                    fedex_labels = [('LabelFedex-%s-%s.%s' % (carrier_tracking_ref, index, self.fedex_label_file_type), label)
+                                    for index, label in enumerate(srm._get_labels(self.fedex_label_file_type))]
+                    picking.message_post(body=logmessage, attachments=fedex_labels)
+                    shipping_data = {'exact_price': carrier_price,
+                                     'tracking_number': carrier_tracking_ref}
+                    res = res + [shipping_data]
+                else:
+                    raise UserError(request['errors_message'])
+
+            ##############
+            # No package #
+            ##############
+            else:
+                raise UserError(_('No packages for this picking'))
+            if self.return_label_on_delivery:
+                self.get_return_label(picking, tracking_number=request['tracking_number'], origin_date=request['date'])
+            commercial_invoice = srm.get_document()
+            if commercial_invoice:
+                fedex_documents = [('DocumentFedex.pdf', commercial_invoice)]
+                picking.message_post(body='Fedex Documents', attachments=fedex_documents)
+        return res
diff --git a/delivery_fedex_hibou/models/fedex_request.py b/delivery_fedex_hibou/models/fedex_request.py
new file mode 100644
index 00000000..e29e35d8
--- /dev/null
+++ b/delivery_fedex_hibou/models/fedex_request.py
@@ -0,0 +1,203 @@
+from zeep.exceptions import Fault
+from odoo.addons.delivery_fedex.models import fedex_request
+from odoo.tools import remove_accents
+import logging
+_logger = logging.getLogger(__name__)
+
+STATECODE_REQUIRED_COUNTRIES = fedex_request.STATECODE_REQUIRED_COUNTRIES
+
+
+def sanitize_name(name):
+    if isinstance(name, str):
+        return name.replace('[', '').replace(']', '')
+    return 'Unknown'
+
+
+class FedexRequest(fedex_request.FedexRequest):
+    _transit_days = {
+        'ONE_DAYS': 1,
+        'ONE_DAY': 1,
+        'TWO_DAYS': 2,
+        'THREE_DAYS': 3,
+        'FOUR_DAYS': 4,
+        'FIVE_DAYS': 5,
+        'SIX_DAYS': 6,
+        'SEVEN_DAYS': 7,
+        'EIGHT_DAYS': 8,
+        'NINE_DAYS': 9,
+        'TEN_DAYS': 10,
+    }
+
+    _service_transit_days = {
+        'FEDEX_2_DAY': 2,
+        'FEDEX_2_DAY_AM': 2,
+        'FIRST_OVERNIGHT': 1,
+        'PRIORITY_OVERNIGHT': 1,
+        'STANDARD_OVERNIGHT': 1,
+    }
+
+    def set_recipient(self, recipient_partner, attn=None, residential=False):
+        """
+        Adds ATTN: and sanitizes against known 'illegal' common characters in names.
+        :param recipient_partner: default
+        :param attn: NEW add to contact name as an ' ATTN: $attn'
+        :param residential: NEW allow ground home delivery
+        :return:
+        """
+        Contact = self.factory.Contact()
+        if recipient_partner.is_company:
+            Contact.PersonName = ''
+            Contact.CompanyName = sanitize_name(remove_accents(recipient_partner.name))
+        else:
+            Contact.PersonName = sanitize_name(remove_accents(recipient_partner.name))
+            Contact.CompanyName = sanitize_name(remove_accents(recipient_partner.parent_id.name)) or ''
+
+        if attn:
+            Contact.PersonName = Contact.PersonName + ' ATTN: ' + str(attn)
+
+        Contact.PhoneNumber = recipient_partner.phone or ''
+
+        Address = self.factory.Address()
+        Address.StreetLines = [remove_accents(recipient_partner.street) or '', remove_accents(recipient_partner.street2) or '']
+        Address.City = remove_accents(recipient_partner.city) or ''
+        if recipient_partner.country_id.code in STATECODE_REQUIRED_COUNTRIES:
+            Address.StateOrProvinceCode = recipient_partner.state_id.code or ''
+        else:
+            Address.StateOrProvinceCode = ''
+        Address.PostalCode = recipient_partner.zip or ''
+        Address.CountryCode = recipient_partner.country_id.code or ''
+
+        if residential:
+            Address.Residential = True
+
+        self.RequestedShipment.Recipient = self.factory.Party()
+        self.RequestedShipment.Recipient.Contact = Contact
+        self.RequestedShipment.Recipient.Address = Address
+
+    def add_package(self, weight_value, package_code=False, package_height=0, package_width=0, package_length=0, sequence_number=False, mode='shipping', reference=False, insurance=False):
+        # TODO remove in master and change the signature of a public method
+        return self._add_package(weight_value=weight_value, package_code=package_code, package_height=package_height, package_width=package_width,
+                                 package_length=package_length, sequence_number=sequence_number, mode=mode, po_number=False, dept_number=False, reference=reference, insurance=insurance)
+
+    def _add_package(self, weight_value, package_code=False, package_height=0, package_width=0, package_length=0, sequence_number=False, mode='shipping', po_number=False, dept_number=False, reference=False, insurance=False):
+        package = self.factory.RequestedPackageLineItem()
+        package_weight = self.factory.Weight()
+        package_weight.Value = weight_value
+        package_weight.Units = self.RequestedShipment.TotalWeight.Units
+
+        if insurance:
+            insured = self.factory.Money()
+            insured.Amount = insurance
+            # TODO at some point someone might need currency here
+            insured.Currency = 'USD'
+            package.InsuredValue = insured
+
+        package.PhysicalPackaging = 'BOX'
+        if package_code == 'YOUR_PACKAGING':
+            package.Dimensions = self.factory.Dimensions()
+            package.Dimensions.Height = package_height
+            package.Dimensions.Width = package_width
+            package.Dimensions.Length = package_length
+            # TODO in master, add unit in product packaging and perform unit conversion
+            package.Dimensions.Units = "IN" if self.RequestedShipment.TotalWeight.Units == 'LB' else 'CM'
+        if po_number:
+            po_reference = self.factory.CustomerReference()
+            po_reference.CustomerReferenceType = 'P_O_NUMBER'
+            po_reference.Value = po_number
+            package.CustomerReferences.append(po_reference)
+        if dept_number:
+            dept_reference = self.factory.CustomerReference()
+            dept_reference.CustomerReferenceType = 'DEPARTMENT_NUMBER'
+            dept_reference.Value = dept_number
+            package.CustomerReferences.append(dept_reference)
+        if reference:
+            customer_reference = self.factory.CustomerReference()
+            customer_reference.CustomerReferenceType = 'CUSTOMER_REFERENCE'
+            customer_reference.Value = reference
+            package.CustomerReferences.append(customer_reference)
+
+        package.Weight = package_weight
+        if mode == 'rating':
+            package.GroupPackageCount = 1
+        if sequence_number:
+            package.SequenceNumber = sequence_number
+        else:
+            self.hasOnePackage = True
+
+        if mode == 'rating':
+            self.RequestedShipment.RequestedPackageLineItems.append(package)
+        else:
+            self.RequestedShipment.RequestedPackageLineItems = package
+
+    def shipping_charges_payment(self, shipping_charges_payment_account, third_party=False):
+        """
+        Allow 'shipping_charges_payment_account' to be considered 'third_party'
+        :param shipping_charges_payment_account: default
+        :param third_party: NEW add to indicate that the 'shipping_charges_payment_account' is third party.
+        :return:
+        """
+        self.RequestedShipment.ShippingChargesPayment = self.factory.Payment()
+        self.RequestedShipment.ShippingChargesPayment.PaymentType = 'SENDER' if not third_party else 'THIRD_PARTY'
+        Payor = self.factory.Payor()
+        Payor.ResponsibleParty = self.factory.Party()
+        Payor.ResponsibleParty.AccountNumber = shipping_charges_payment_account
+        self.RequestedShipment.ShippingChargesPayment.Payor = Payor
+
+    # Rating stuff
+
+    def rate(self, date_planned=None):
+        """
+        Response will contain 'transit_days' key with number of days.
+        :param date_planned: Planned Outgoing shipment. Used to have FedEx tell us how long it will take for the package to arrive.
+        :return:
+        """
+        if date_planned:
+            self.RequestedShipment.ShipTimestamp = date_planned
+
+        formatted_response = {'price': {}}
+        del self.ClientDetail['Region']
+        if self.hasCommodities:
+            self.RequestedShipment.CustomsClearanceDetail.Commodities = self.listCommodities
+
+        try:
+            self.response = self.client.service.getRates(WebAuthenticationDetail=self.WebAuthenticationDetail,
+                                                         ClientDetail=self.ClientDetail,
+                                                         TransactionDetail=self.TransactionDetail,
+                                                         Version=self.VersionId,
+                                                         RequestedShipment=self.RequestedShipment,
+                                                         ReturnTransitAndCommit=True)  # New ReturnTransitAndCommit for CommitDetails in response
+            if (self.response.HighestSeverity != 'ERROR' and self.response.HighestSeverity != 'FAILURE'):
+                if not getattr(self.response, "RateReplyDetails", False):
+                    raise Exception("No rating found")
+                for rating in self.response.RateReplyDetails[0].RatedShipmentDetails:
+                    formatted_response['price'][rating.ShipmentRateDetail.TotalNetFedExCharge.Currency] = float(rating.ShipmentRateDetail.TotalNetFedExCharge.Amount)
+                if len(self.response.RateReplyDetails[0].RatedShipmentDetails) == 1:
+                    if 'CurrencyExchangeRate' in self.response.RateReplyDetails[0].RatedShipmentDetails[0].ShipmentRateDetail and self.response.RateReplyDetails[0].RatedShipmentDetails[0].ShipmentRateDetail['CurrencyExchangeRate']:
+                        formatted_response['price'][self.response.RateReplyDetails[0].RatedShipmentDetails[0].ShipmentRateDetail.CurrencyExchangeRate.FromCurrency] = float(self.response.RateReplyDetails[0].RatedShipmentDetails[0].ShipmentRateDetail.TotalNetFedExCharge.Amount) / float(self.response.RateReplyDetails[0].RatedShipmentDetails[0].ShipmentRateDetail.CurrencyExchangeRate.Rate)
+
+                # Hibou Delivery Planning
+                if hasattr(self.response.RateReplyDetails[0], 'DeliveryTimestamp') and self.response.RateReplyDetails[0].DeliveryTimestamp:
+                    formatted_response['date_delivered'] = self.response.RateReplyDetails[0].DeliveryTimestamp
+                elif hasattr(self.response.RateReplyDetails[0], 'CommitDetails') and hasattr(self.response.RateReplyDetails[0].CommitDetails[0], 'CommitTimestamp'):
+                    formatted_response['date_delivered'] = self.response.RateReplyDetails[0].CommitDetails[0].CommitTimestamp
+                    formatted_response['transit_days'] = self._service_transit_days.get(self.response.RateReplyDetails[0].CommitDetails[0].ServiceType, 0)
+                elif hasattr(self.response.RateReplyDetails[0], 'CommitDetails') and hasattr(self.response.RateReplyDetails[0].CommitDetails[0], 'TransitTime'):
+                    transit_days = self.response.RateReplyDetails[0].CommitDetails[0].TransitTime
+                    transit_days = self._transit_days.get(transit_days, 0)
+                    formatted_response['transit_days'] = transit_days
+            else:
+                errors_message = '\n'.join([("%s: %s" % (n.Code, n.Message)) for n in self.response.Notifications if (n.Severity == 'ERROR' or n.Severity == 'FAILURE')])
+                formatted_response['errors_message'] = errors_message
+
+            if any([n.Severity == 'WARNING' for n in self.response.Notifications]):
+                warnings_message = '\n'.join([("%s: %s" % (n.Code, n.Message)) for n in self.response.Notifications if n.Severity == 'WARNING'])
+                formatted_response['warnings_message'] = warnings_message
+
+        except Fault as fault:
+            formatted_response['errors_message'] = fault
+        except IOError:
+            formatted_response['errors_message'] = "Fedex Server Not Found"
+        except Exception as e:
+            formatted_response['errors_message'] = e.args[0]
+
+        return formatted_response
diff --git a/delivery_fedex_hibou/models/stock.py b/delivery_fedex_hibou/models/stock.py
new file mode 100644
index 00000000..3dfb1a1f
--- /dev/null
+++ b/delivery_fedex_hibou/models/stock.py
@@ -0,0 +1,8 @@
+from odoo import api, fields, models
+
+
+class StockWarehouse(models.Model):
+    _inherit = 'stock.warehouse'
+
+    fedex_account_number = fields.Char(string='FedEx Account Number')
+    fedex_meter_number = fields.Char(string='FedEx Meter Number')
diff --git a/delivery_fedex_hibou/views/stock_views.xml b/delivery_fedex_hibou/views/stock_views.xml
new file mode 100644
index 00000000..8df21336
--- /dev/null
+++ b/delivery_fedex_hibou/views/stock_views.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="fedex_view_warehouse" model="ir.ui.view">
+        <field name="name">stock.warehouse</field>
+        <field name="model">stock.warehouse</field>
+        <field name="inherit_id" ref="stock.view_warehouse" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='partner_id']" position="after">
+                <field name="fedex_account_number"/>
+                <field name="fedex_meter_number"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/delivery_hibou/__init__.py b/delivery_hibou/__init__.py
new file mode 100644
index 00000000..0650744f
--- /dev/null
+++ b/delivery_hibou/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/delivery_hibou/__manifest__.py b/delivery_hibou/__manifest__.py
new file mode 100644
index 00000000..4897f03c
--- /dev/null
+++ b/delivery_hibou/__manifest__.py
@@ -0,0 +1,24 @@
+{
+    'name': 'Delivery Hibou',
+    'summary': 'Adds underlying pinnings for things like "RMA Return Labels"',
+    'version': '13.0.1.0.0',
+    'author': "Hibou Corp.",
+    'category': 'Stock',
+    'license': 'AGPL-3',
+    'images': [],
+    'website': "https://hibou.io",
+    'description': """
+This is a collection of "typical" carrier needs, and a bridge into Hibou modules like `delivery_partner` and `sale_planner`.
+""",
+    'depends': [
+        'delivery',
+        'delivery_partner',
+    ],
+    'demo': [],
+    'data': [
+        'views/delivery_views.xml',
+        'views/stock_views.xml',
+    ],
+    'auto_install': False,
+    'installable': True,
+}
diff --git a/delivery_hibou/models/__init__.py b/delivery_hibou/models/__init__.py
new file mode 100644
index 00000000..29ce1386
--- /dev/null
+++ b/delivery_hibou/models/__init__.py
@@ -0,0 +1,2 @@
+from . import delivery
+from . import stock
diff --git a/delivery_hibou/models/delivery.py b/delivery_hibou/models/delivery.py
new file mode 100644
index 00000000..03c30aea
--- /dev/null
+++ b/delivery_hibou/models/delivery.py
@@ -0,0 +1,159 @@
+from odoo import fields, models
+from odoo.addons.stock.models.stock_move import PROCUREMENT_PRIORITIES
+
+
+class DeliveryCarrier(models.Model):
+    _inherit = 'delivery.carrier'
+
+    automatic_insurance_value = fields.Float(string='Automatic Insurance Value',
+                                             help='Will be used during shipping to determine if the '
+                                                  'picking\'s value warrants insurance being added.')
+    procurement_priority = fields.Selection(PROCUREMENT_PRIORITIES,
+                                            string='Procurement Priority',
+                                            help='Priority for this carrier. Will affect pickings '
+                                                 'and procurements related to this carrier.')
+
+    # Utility
+
+    def get_insurance_value(self, order=None, picking=None):
+        value = 0.0
+        if order:
+            if order.order_line:
+                value = sum(order.order_line.filtered(lambda l: l.type != 'service').mapped('price_subtotal'))
+            else:
+                return value
+        if picking:
+            value = picking.declared_value()
+            if picking.require_insurance == 'no':
+                value = 0.0
+            elif picking.require_insurance == 'auto' and self.automatic_insurance_value and self.automatic_insurance_value > value:
+                value = 0.0
+        return value
+
+    def get_third_party_account(self, order=None, picking=None):
+        if order and order.shipping_account_id:
+            return order.shipping_account_id
+        if picking and picking.shipping_account_id:
+            return picking.shipping_account_id
+        return None
+
+    def get_order_name(self, order=None, picking=None):
+        if order:
+            return order.name
+        if picking:
+            if picking.sale_id:
+                return picking.sale_id.name  # + ' - ' + picking.name
+            return picking.name
+        return ''
+
+    def get_attn(self, order=None, picking=None):
+        if order:
+            return order.client_order_ref
+        if picking and picking.sale_id:
+            return picking.sale_id.client_order_ref
+        # If Picking has a reference, decide what it is.
+        return False
+
+    def _classify_picking(self, picking):
+        if picking.picking_type_id.code == 'incoming' and picking.location_id.usage == 'supplier' and picking.location_dest_id.usage == 'customer':
+            return 'dropship'
+        elif picking.picking_type_id.code == 'incoming' and picking.location_id.usage == 'customer' and picking.location_dest_id.usage == 'supplier':
+            return 'dropship_in'
+        elif picking.picking_type_id.code == 'incoming':
+            return 'in'
+        return 'out'
+
+    def is_amazon(self, order=None, picking=None):
+        """
+        Amazon MWS orders potentially need to be flagged for
+        clean up on the carrier's side.
+
+        Override to return based on criteria in your company.
+        :return:
+        """
+        return False
+
+    # Shipper Company
+
+    def get_shipper_company(self, order=None, picking=None):
+        """
+        Shipper Company: The `res.partner` that provides the name of where the shipment is coming from.
+        """
+        if order:
+            return order.company_id.partner_id
+        if picking:
+            return getattr(self, ('_get_shipper_company_%s' % (self._classify_picking(picking),)),
+                           self._get_shipper_company_out)(picking)
+        return None
+
+    def _get_shipper_company_dropship(self, picking):
+        return picking.company_id.partner_id
+
+    def _get_shipper_company_dropship_in(self, picking):
+        return picking.company_id.partner_id
+
+    def _get_shipper_company_in(self, picking):
+        return picking.company_id.partner_id
+
+    def _get_shipper_company_out(self, picking):
+        return picking.company_id.partner_id
+
+    # Shipper Warehouse
+
+    def get_shipper_warehouse(self, order=None, picking=None):
+        """
+        Shipper Warehouse: The `res.partner` that is basically the physical address a shipment is coming from.
+        """
+        if order:
+            return order.warehouse_id.partner_id
+        if picking:
+            return getattr(self, ('_get_shipper_warehouse_%s' % (self._classify_picking(picking),)),
+                           self._get_shipper_warehouse_out)(picking)
+        return None
+
+    def _get_shipper_warehouse_dropship(self, picking):
+        return picking.partner_id
+
+    def _get_shipper_warehouse_dropship_in(self, picking):
+        if picking.sale_id:
+            picking.sale_id.partner_shipping_id
+        return self._get_shipper_warehouse_dropship_in_no_sale(picking)
+
+    def _get_shipper_warehouse_dropship_in_no_sale(self, picking):
+        return picking.company_id.partner_id
+
+    def _get_shipper_warehouse_in(self, picking):
+        return picking.partner_id
+
+    def _get_shipper_warehouse_out(self, picking):
+        return picking.picking_type_id.warehouse_id.partner_id
+
+    # Recipient
+
+    def get_recipient(self, order=None, picking=None):
+        """
+        Recipient: The `res.partner` receiving the shipment.
+        """
+        if order:
+            return order.partner_shipping_id
+        if picking:
+            return getattr(self, ('_get_recipient_%s' % (self._classify_picking(picking),)),
+                           self._get_recipient_out)(picking)
+        return None
+
+    def _get_recipient_dropship(self, picking):
+        if picking.sale_id:
+            return picking.sale_id.partner_shipping_id
+        return picking.partner_id
+
+    def _get_recipient_dropship_no_sale(self, picking):
+        return picking.company_id.partner_id
+
+    def _get_recipient_dropship_in(self, picking):
+        return picking.picking_type_id.warehouse_id.partner_id
+
+    def _get_recipient_in(self, picking):
+        return picking.picking_type_id.warehouse_id.partner_id
+
+    def _get_recipient_out(self, picking):
+        return picking.partner_id
diff --git a/delivery_hibou/models/stock.py b/delivery_hibou/models/stock.py
new file mode 100644
index 00000000..35559223
--- /dev/null
+++ b/delivery_hibou/models/stock.py
@@ -0,0 +1,48 @@
+from odoo import api, fields, models
+
+
+class StockPicking(models.Model):
+    _inherit = 'stock.picking'
+
+    shipping_account_id = fields.Many2one('partner.shipping.account', string='Shipping Account')
+    require_insurance = fields.Selection([
+            ('auto', 'Automatic'),
+            ('yes', 'Yes'),
+            ('no', 'No'),
+        ], string='Require Insurance', default='auto',
+        help='If your carrier supports it, auto should be calculated off of the "Automatic Insurance Value" field.')
+
+    @api.depends('move_lines.priority', 'carrier_id')
+    def _compute_priority(self):
+        with_carrier_priority = self.filtered(lambda p: p.carrier_id.procurement_priority)
+        for picking in with_carrier_priority:
+            picking.priority = picking.carrier_id.procurement_priority
+        super(StockPicking, (self-with_carrier_priority))._compute_priority()
+
+    @api.model
+    def create(self, values):
+        origin = values.get('origin')
+        if origin and not values.get('shipping_account_id'):
+            so = self.env['sale.order'].search([('name', '=', str(origin))], limit=1)
+            if so and so.shipping_account_id:
+                values['shipping_account_id'] = so.shipping_account_id.id
+
+        res = super(StockPicking, self).create(values)
+        return res
+
+    def declared_value(self):
+        self.ensure_one()
+        cost = sum([(l.product_id.standard_price * l.qty_done) for l in self.move_line_ids] or [0.0])
+        if not cost:
+            # Assume Full Value
+            cost = sum([(l.product_id.standard_price * l.product_uom_qty) for l in self.move_lines] or [0.0])
+        return cost
+
+
+class StockMove(models.Model):
+    _inherit = 'stock.move'
+
+    def _prepare_procurement_values(self):
+        res = super(StockMove, self)._prepare_procurement_values()
+        res['priority'] = self.picking_id.priority or self.priority
+        return res
diff --git a/delivery_hibou/tests/__init__.py b/delivery_hibou/tests/__init__.py
new file mode 100644
index 00000000..d4e6373e
--- /dev/null
+++ b/delivery_hibou/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_delivery_hibou
diff --git a/delivery_hibou/tests/test_delivery_hibou.py b/delivery_hibou/tests/test_delivery_hibou.py
new file mode 100644
index 00000000..7b47b750
--- /dev/null
+++ b/delivery_hibou/tests/test_delivery_hibou.py
@@ -0,0 +1,148 @@
+from odoo.tests import common
+
+
+class TestDeliveryHibou(common.TransactionCase):
+
+    def setUp(self):
+        super(TestDeliveryHibou, self).setUp()
+        self.partner = self.env.ref('base.res_partner_address_13')
+        self.product = self.env.ref('product.product_product_7')
+        # Create Shipping Account
+        self.shipping_account = self.env['partner.shipping.account'].create({
+            'name': '123123',
+            'delivery_type': 'other',
+        })
+        # Create Carrier
+        self.delivery_product = self.env['product.product'].create({
+            'name': 'Test Carrier1 Delivery',
+            'type': 'service',
+        })
+        self.carrier = self.env['delivery.carrier'].create({
+            'name': 'Test Carrier1',
+            'product_id': self.delivery_product.id,
+        })
+
+    def test_delivery_hibou(self):
+        # Assign a new shipping account
+        self.partner.shipping_account_id = self.shipping_account
+
+        # Assign values to new Carrier
+        test_insurance_value = 600
+        test_procurement_priority = '2'
+        self.carrier.automatic_insurance_value = test_insurance_value
+        self.carrier.procurement_priority = test_procurement_priority
+
+
+        sale_order = self.env['sale.order'].create({
+            'partner_id': self.partner.id,
+            'partner_shipping_id': self.partner.id,
+            'partner_invoice_id': self.partner.id,
+            'shipping_account_id': self.shipping_account.id,
+            'order_line': [(0, 0, {
+                'product_id': self.product.id,
+            })]
+        })
+        self.assertFalse(sale_order.carrier_id)
+        action = sale_order.action_open_delivery_wizard()
+        form = common.Form(self.env[action['res_model']].with_context(**action.get('context', {})))
+        form.carrier_id = self.carrier
+        wizard = form.save()
+        wizard.button_confirm()
+
+        #sale_order.set_delivery_line()
+        self.assertEqual(sale_order.carrier_id, self.carrier)
+        sale_order.action_confirm()
+        # Make sure 3rd party Shipping Account is set.
+        self.assertEqual(sale_order.shipping_account_id, self.shipping_account)
+
+        self.assertTrue(sale_order.picking_ids)
+        # Priority coming from Carrier procurement_priority
+        self.assertEqual(sale_order.picking_ids.priority, test_procurement_priority)
+        # 3rd party Shipping Account copied from Sale Order
+        self.assertEqual(sale_order.picking_ids.shipping_account_id, self.shipping_account)
+        self.assertEqual(sale_order.carrier_id.get_third_party_account(order=sale_order), self.shipping_account)
+
+        # Test attn
+        test_ref = 'TEST100'
+        self.assertEqual(sale_order.carrier_id.get_attn(order=sale_order), False)
+        sale_order.client_order_ref = test_ref
+        self.assertEqual(sale_order.carrier_id.get_attn(order=sale_order), test_ref)
+        # The picking should get this ref as well
+        self.assertEqual(sale_order.picking_ids.carrier_id.get_attn(picking=sale_order.picking_ids), test_ref)
+
+        # Test order_name
+        self.assertEqual(sale_order.carrier_id.get_order_name(order=sale_order), sale_order.name)
+        # The picking should get the same 'order_name'
+        self.assertEqual(sale_order.picking_ids.carrier_id.get_order_name(picking=sale_order.picking_ids), sale_order.name)
+
+    def test_carrier_hibou_out(self):
+        test_insurance_value = 4000
+        self.carrier.automatic_insurance_value = test_insurance_value
+
+        picking_out = self.env.ref('stock.outgoing_shipment_main_warehouse')
+        picking_out.action_assign()
+        self.assertEqual(picking_out.state, 'assigned')
+
+        picking_out.carrier_id = self.carrier
+
+        # This relies heavily on the 'stock' demo data.
+        # Should only have a single move_line_ids and it should not be done at all.
+        self.assertEqual(picking_out.move_line_ids.mapped('qty_done'), [0.0])
+        self.assertEqual(picking_out.move_line_ids.mapped('product_uom_qty'), [15.0])
+        self.assertEqual(picking_out.move_line_ids.mapped('product_id.standard_price'), [3300.0])
+
+        # The 'value' is assumed to be all of the product value from the initial demand.
+        self.assertEqual(picking_out.declared_value(), 15.0 * 3300.0)
+        self.assertEqual(picking_out.carrier_id.get_insurance_value(picking=picking_out), picking_out.declared_value())
+
+        # Workflow where user explicitly opts out of insurance on the picking level.
+        picking_out.require_insurance = 'no'
+        self.assertEqual(picking_out.carrier_id.get_insurance_value(picking=picking_out), 0.0)
+        picking_out.require_insurance = 'auto'
+
+        # Lets choose to only delivery one piece at the moment.
+        # This does not meet the minimum on the carrier to have insurance value.
+        picking_out.move_line_ids.qty_done = 1.0
+        self.assertEqual(picking_out.declared_value(), 3300.0)
+        self.assertEqual(picking_out.carrier_id.get_insurance_value(picking=picking_out), 0.0)
+        # Workflow where user opts in to insurance.
+        picking_out.require_insurance = 'yes'
+        self.assertEqual(picking_out.carrier_id.get_insurance_value(picking=picking_out), 3300.0)
+        picking_out.require_insurance = 'auto'
+
+        # Test with picking having 3rd party account.
+        self.assertEqual(picking_out.carrier_id.get_third_party_account(picking=picking_out), None)
+        picking_out.shipping_account_id = self.shipping_account
+        self.assertEqual(picking_out.carrier_id.get_third_party_account(picking=picking_out), self.shipping_account)
+
+        # Shipment Time Methods!
+        self.assertEqual(picking_out.carrier_id._classify_picking(picking=picking_out), 'out')
+        self.assertEqual(picking_out.carrier_id.get_shipper_company(picking=picking_out),
+                         picking_out.company_id.partner_id)
+        self.assertEqual(picking_out.carrier_id.get_shipper_warehouse(picking=picking_out),
+                         picking_out.picking_type_id.warehouse_id.partner_id)
+        self.assertEqual(picking_out.carrier_id.get_recipient(picking=picking_out),
+                         picking_out.partner_id)
+        # This picking has no `sale_id`
+        # Right now ATTN requires a sale_id, which this picking doesn't have (none of the stock ones do)
+        self.assertEqual(picking_out.carrier_id.get_attn(picking=picking_out), False)
+        self.assertEqual(picking_out.carrier_id.get_order_name(picking=picking_out), picking_out.name)
+
+    def test_carrier_hibou_in(self):
+        picking_in = self.env.ref('stock.incomming_shipment1')
+        self.assertEqual(picking_in.state, 'assigned')
+
+        picking_in.carrier_id = self.carrier
+        # This relies heavily on the 'stock' demo data.
+        # Should only have a single move_line_ids and it should not be done at all.
+        self.assertEqual(picking_in.move_line_ids.mapped('qty_done'), [0.0])
+        self.assertEqual(picking_in.move_line_ids.mapped('product_uom_qty'), [35.0])
+        self.assertEqual(picking_in.move_line_ids.mapped('product_id.standard_price'), [55.0])
+
+        self.assertEqual(picking_in.carrier_id._classify_picking(picking=picking_in), 'in')
+        self.assertEqual(picking_in.carrier_id.get_shipper_company(picking=picking_in),
+                         picking_in.company_id.partner_id)
+        self.assertEqual(picking_in.carrier_id.get_shipper_warehouse(picking=picking_in),
+                         picking_in.partner_id)
+        self.assertEqual(picking_in.carrier_id.get_recipient(picking=picking_in),
+                         picking_in.picking_type_id.warehouse_id.partner_id)
diff --git a/delivery_hibou/views/delivery_views.xml b/delivery_hibou/views/delivery_views.xml
new file mode 100644
index 00000000..01208bbd
--- /dev/null
+++ b/delivery_hibou/views/delivery_views.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="view_delivery_carrier_form" model="ir.ui.view">
+        <field name="name">hibou.delivery.carrier.form</field>
+        <field name="model">delivery.carrier</field>
+        <field name="inherit_id" ref="delivery.view_delivery_carrier_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='integration_level']" position="after">
+                <field name="automatic_insurance_value"/>
+                <field name="procurement_priority"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/delivery_hibou/views/stock_views.xml b/delivery_hibou/views/stock_views.xml
new file mode 100644
index 00000000..78067b01
--- /dev/null
+++ b/delivery_hibou/views/stock_views.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="view_picking_withcarrier_out_form" model="ir.ui.view">
+        <field name="name">hibou.delivery.stock.picking_withcarrier.form.view</field>
+        <field name="model">stock.picking</field>
+        <field name="inherit_id" ref="delivery.view_picking_withcarrier_out_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='carrier_id']" position="before">
+                <field name="require_insurance" attrs="{'readonly': [('state', 'in', ('done', 'cancel'))]}"/>
+                <field name="shipping_account_id" attrs="{'readonly': [('state', 'in', ('done', 'cancel'))]}"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/delivery_partner/README.rst b/delivery_partner/README.rst
new file mode 100644
index 00000000..e527d2bc
--- /dev/null
+++ b/delivery_partner/README.rst
@@ -0,0 +1,29 @@
+*********************************
+Hibou - Partner Shipping Accounts
+*********************************
+
+Records shipping account numbers on partners.
+
+For more information and add-ons, visit `Hibou.io <https://hibou.io/>`_.
+
+
+=============
+Main Features
+=============
+
+* New model: Customer Shipping Account
+* Includes manager-level access permissions.
+
+.. image:: https://user-images.githubusercontent.com/15882954/41176601-e40f8558-6b15-11e8-998e-6a7ee5709c0f.png
+    :alt: 'Register Payment Detail'
+    :width: 988
+    :align: left
+
+
+=======
+License
+=======
+
+Please see `LICENSE <https://github.com/hibou-io/hibou-odoo-suite/blob/11.0/LICENSE>`_.
+
+Copyright Hibou Corp. 2018
diff --git a/delivery_partner/__init__.py b/delivery_partner/__init__.py
new file mode 100644
index 00000000..0650744f
--- /dev/null
+++ b/delivery_partner/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/delivery_partner/__manifest__.py b/delivery_partner/__manifest__.py
new file mode 100755
index 00000000..52bb240d
--- /dev/null
+++ b/delivery_partner/__manifest__.py
@@ -0,0 +1,24 @@
+{
+    'name': 'Partner Shipping Accounts',
+    'author': 'Hibou Corp. <hello@hibou.io>',
+    'version': '13.0.1.0.0',
+    'category': 'Stock',
+    'sequence': 95,
+    'summary': 'Record shipping account numbers on partners.',
+    'description': """
+Record shipping account numbers on partners.
+
+* Customer Shipping Account Model
+    """,
+    'website': 'https://hibou.io/',
+    'depends': [
+        'delivery',
+        'contacts',
+    ],
+    'data': [
+        'security/ir.model.access.csv',
+        'views/delivery_views.xml',
+    ],
+    'installable': True,
+    'application': False,
+}
diff --git a/delivery_partner/models/__init__.py b/delivery_partner/models/__init__.py
new file mode 100644
index 00000000..be8cabd6
--- /dev/null
+++ b/delivery_partner/models/__init__.py
@@ -0,0 +1 @@
+from . import delivery
diff --git a/delivery_partner/models/delivery.py b/delivery_partner/models/delivery.py
new file mode 100644
index 00000000..72361774
--- /dev/null
+++ b/delivery_partner/models/delivery.py
@@ -0,0 +1,47 @@
+from odoo import api, fields, models
+
+
+class Partner(models.Model):
+    _inherit = 'res.partner'
+
+    shipping_account_ids = fields.One2many('partner.shipping.account', 'partner_id', string='Shipping Accounts')
+
+
+class SaleOrder(models.Model):
+    _inherit = 'sale.order'
+
+    shipping_account_id = fields.Many2one('partner.shipping.account', string='Shipping Account')
+
+
+class PartnerShippingAccount(models.Model):
+    _name = 'partner.shipping.account'
+
+    name = fields.Char(string='Account Num.', required=True)
+    description = fields.Char(string='Description')
+    partner_id = fields.Many2one('res.partner', string='Partner', help='Leave blank to allow as a generic 3rd party shipper.')
+    delivery_type = fields.Selection([
+        ('other', 'Other'),
+    ], string='Carrier', required=True)
+    note = fields.Text(string='Internal Note')
+
+    def name_get(self):
+        delivery_types = self._fields['delivery_type']._description_selection(self.env)
+
+        def get_name(value):
+            name = [n for v, n in delivery_types if v == value]
+            return name[0] if name else 'Undefined'
+
+        res = []
+        for acc in self:
+            if acc.description:
+                res.append((acc.id, acc.description))
+            else:
+                res.append((acc.id, '%s: %s' % (get_name(acc.delivery_type), acc.name)))
+        return res
+
+    @api.constrains('name', 'delivery_type')
+    def _check_validity(self):
+        for acc in self:
+            check = getattr(acc, acc.delivery_type + '_check_validity', None)
+            if check:
+                return check()
diff --git a/delivery_partner/security/ir.model.access.csv b/delivery_partner/security/ir.model.access.csv
new file mode 100644
index 00000000..3db88333
--- /dev/null
+++ b/delivery_partner/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_partner_shipping_account,partner.shipping.account,model_partner_shipping_account,base.group_partner_manager,1,1,1,1
diff --git a/delivery_partner/views/delivery_views.xml b/delivery_partner/views/delivery_views.xml
new file mode 100644
index 00000000..3bf8176c
--- /dev/null
+++ b/delivery_partner/views/delivery_views.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="partner_shipping_account_view_tree" model="ir.ui.view">
+        <field name="name">partner.shipping.account.tree</field>
+        <field name="model">partner.shipping.account</field>
+        <field name="arch" type="xml">
+            <tree string="Shipping Accounts">
+                <field name="description"/>
+                <field name="name"/>
+                <field name="delivery_type"/>
+                <field name="partner_id"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="partner_shipping_account_view_form" model="ir.ui.view">
+        <field name="name">partner.shipping.account.form</field>
+        <field name="model">partner.shipping.account</field>
+        <field name="arch" type="xml">
+            <form string="Shipping Account">
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="partner_id"/>
+                            <field name="description"/>
+                            <field name="name"/>
+                            <field name="delivery_type"/>
+                        </group>
+                        <group name="carrier"/>
+                    </group>
+                    <field name="note" placeholder="Any additional notes..."/>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="partner_shipping_account_view_search" model="ir.ui.view">
+        <field name="name">partner.shipping.account.search</field>
+        <field name="model">partner.shipping.account</field>
+        <field name="arch" type="xml">
+            <search string="Shipping Account Search">
+                <field name="description"/>
+                <field name="name"/>
+                <field name="partner_id"/>
+                <field name="delivery_type"/>
+            </search>
+        </field>
+    </record>
+
+    <record id="partner_shipping_account_action_main" model="ir.actions.act_window">
+        <field name="name">Shipping Accounts</field>
+        <field name="res_model">partner.shipping.account</field>
+        <field name="view_mode">tree,form</field>
+        <field name="help" type="html">
+            <p>
+                No accounts
+            </p>
+        </field>
+    </record>
+
+    <menuitem id="partner_shipping_account_menu_main" name="Partner Shipping Accounts"
+              action="delivery_partner.partner_shipping_account_action_main"
+              sequence="20" parent="contacts.res_partner_menu_config"/>
+
+    <!-- Inherited -->
+    <record id="view_partner_property_form_inherit" model="ir.ui.view">
+        <field name="name">res.partner.carrier.property.form.inherit</field>
+        <field name="model">res.partner</field>
+        <field name="inherit_id" ref="delivery.view_partner_property_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='property_delivery_carrier_id']" position="after">
+                <field name="shipping_account_ids" context="{'default_partner_id': active_id}">
+                    <tree>
+                        <field name="description"/>
+                        <field name="name"/>
+                        <field name="delivery_type"/>
+                    </tree>
+                </field>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="view_order_form_inherit" model="ir.ui.view">
+        <field name="name">sale.order.form.inherit</field>
+        <field name="model">sale.order</field>
+        <field name="inherit_id" ref="sale.view_order_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='payment_term_id']" position="before">
+                <field name="shipping_account_id" options="{'no_create': True, 'no_open': True}" domain="['|', ('partner_id', '=', False), ('partner_id', '=', partner_id)]"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/external/camptocamp-cloud-platform b/external/camptocamp-cloud-platform
new file mode 160000
index 00000000..af8cee48
--- /dev/null
+++ b/external/camptocamp-cloud-platform
@@ -0,0 +1 @@
+Subproject commit af8cee48fb6b9a8a6acf924d40409cc693a2aa0c
diff --git a/external/hibou-shipbox b/external/hibou-shipbox
new file mode 160000
index 00000000..e0a0f3e9
--- /dev/null
+++ b/external/hibou-shipbox
@@ -0,0 +1 @@
+Subproject commit e0a0f3e9c6664c8e5e46cc77ff9c89dccb514fee
diff --git a/hibou_professional/__init__.py b/hibou_professional/__init__.py
new file mode 100644
index 00000000..09434554
--- /dev/null
+++ b/hibou_professional/__init__.py
@@ -0,0 +1,3 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from . import models
diff --git a/hibou_professional/__manifest__.py b/hibou_professional/__manifest__.py
new file mode 100644
index 00000000..e254a959
--- /dev/null
+++ b/hibou_professional/__manifest__.py
@@ -0,0 +1,24 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+{
+    'name': 'Hibou Professional',
+    'author': 'Hibou Corp. <hello@hibou.io>',
+    'category': 'Tools',
+    'depends': ['mail'],
+    'version': '13.0.1.0.0',
+    'description': """
+Hibou Professional Support and Billing
+======================================
+
+    """,
+    'website': 'https://hibou.io/',
+    'data': [
+        'views/webclient_templates.xml',
+    ],
+    'qweb': [
+        'static/src/xml/templates.xml',
+    ],
+    'installable': True,
+    'auto_install': True,
+    'license': 'OPL-1',
+}
diff --git a/hibou_professional/models/__init__.py b/hibou_professional/models/__init__.py
new file mode 100644
index 00000000..1ae9ad83
--- /dev/null
+++ b/hibou_professional/models/__init__.py
@@ -0,0 +1,3 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from . import update
diff --git a/hibou_professional/models/update.py b/hibou_professional/models/update.py
new file mode 100644
index 00000000..ef0c517c
--- /dev/null
+++ b/hibou_professional/models/update.py
@@ -0,0 +1,208 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+import datetime
+import requests
+
+from odoo import api, fields, models, release
+from odoo.exceptions import UserError
+
+
+class PublisherWarrantyContract(models.AbstractModel):
+    _inherit = 'publisher_warranty.contract'
+
+    CONFIG_HIBOU_URL = 'https://api.hibou.io/hibouapi/v1/professional'
+    CONFIG_HIBOU_MESSAGE_URL = 'https://api.hibou.io/hibouapi/v1/professional/message'
+    CONFIG_HIBOU_QUOTE_URL = 'https://api.hibou.io/hibouapi/v1/professional/quote'
+    DAYS_ENDING_SOON = 7
+
+    @api.model
+    def hibou_professional_status(self):
+        get_param = self.env['ir.config_parameter'].sudo().get_param
+        expiration_date = get_param('database.hibou_professional_expiration_date')
+        expiration_reason = get_param('database.hibou_professional_expiration_reason')
+        dbuuid = get_param('database.uuid')
+        expiring = False
+        expired = False
+        if expiration_date:
+            expiration_date_date = fields.Date.from_string(expiration_date)
+            today = fields.Date.today()
+            if expiration_date_date < today:
+                if expiration_reason == 'trial':
+                    expired = 'Your trial of Hibou Professional has ended.'
+                else:
+                    expired = 'Your Hibou Professional subscription has ended.'
+            elif expiration_date_date < (today + datetime.timedelta(days=self.DAYS_ENDING_SOON)):
+                if expiration_reason == 'trial':
+                    expiring = 'Your trial of Hibou Professional is ending soon.'
+                else:
+                    expiring = 'Your Hibou Professional subscription is ending soon.'
+
+        is_admin = self.env.user.has_group('base.group_erp_manager')
+        allow_admin_message = get_param('database.hibou_allow_admin_message')
+        allow_message = get_param('database.hibou_allow_message')
+
+        return {
+            'expiration_date': get_param('database.hibou_professional_expiration_date'),
+            'expiration_reason': get_param('database.hibou_professional_expiration_reason'),
+            'expiring': expiring,
+            'expired': expired,
+            'professional_code': get_param('database.hibou_professional_code'),
+            'dbuuid': dbuuid,
+            'is_admin': is_admin,
+            'allow_admin_message': allow_admin_message,
+            'allow_message': allow_message,
+        }
+
+    @api.model
+    def hibou_professional_update_message_preferences(self, allow_admin_message, allow_message):
+        if self.env.user.has_group('base.group_erp_manager'):
+            set_param = self.env['ir.config_parameter'].sudo().set_param
+            set_param('database.hibou_allow_admin_message', allow_admin_message and '1')
+            set_param('database.hibou_allow_message', allow_message and '1')
+        return self.hibou_professional_status()
+
+    def _check_message_allow(self):
+        get_param = self.env['ir.config_parameter'].sudo().get_param
+        allow_message = get_param('database.hibou_allow_message')
+        if not allow_message:
+            allow_message = get_param('database.hibou_allow_admin_message') and self.env.user.has_group(
+                'base.group_erp_manager')
+            if not allow_message:
+                raise UserError('You are not allowed to send messages at this time.')
+
+    @api.model
+    def hibou_professional_quote(self):
+        get_param = self.env['ir.config_parameter'].sudo().get_param
+        try:
+            self._hibou_install()
+        except:
+            pass
+        dbuuid = get_param('database.uuid')
+        dbtoken = get_param('database.hibou_token')
+        if dbuuid and dbtoken:
+            return {'url': self.CONFIG_HIBOU_QUOTE_URL + '/%s/%s' % (dbuuid, dbtoken)}
+        return {}
+
+    @api.model
+    def hibou_professional_send_message(self, type, priority, subject, body, user_url, res_id):
+        self._check_message_allow()
+        get_param = self.env['ir.config_parameter'].sudo().get_param
+        dbuuid = get_param('database.uuid')
+        dbtoken = get_param('database.hibou_token')
+        user_name = self.env.user.name
+        user_email = self.env.user.email or self.env.user.login
+        company_name = self.env.user.company_id.name
+        data = {
+            'jsonrpc': '2.0',
+            'method': 'call',
+            'params': {
+                'dbuuid': dbuuid,
+                'user_name': user_name,
+                'user_email': user_email,
+                'user_url': user_url,
+                'company_name': company_name,
+                'type': type,
+                'priority': priority,
+                'subject': subject,
+                'body': body,
+                'res_id': res_id,
+            },
+        }
+        if dbtoken:
+            data['params']['dbtoken'] = dbtoken
+        try:
+            r = requests.post(self.CONFIG_HIBOU_MESSAGE_URL + '/new', json=data, timeout=30)
+            r.raise_for_status()
+            wrapper = r.json()
+            return wrapper.get('result', {})
+        except:
+            return {'error': 'Error sending message.'}
+
+    @api.model
+    def hibou_professional_get_messages(self):
+        self._check_message_allow()
+        get_param = self.env['ir.config_parameter'].sudo().get_param
+        dbuuid = get_param('database.uuid')
+        dbtoken = get_param('database.hibou_token')
+        try:
+            r = requests.get(self.CONFIG_HIBOU_MESSAGE_URL + '/get/%s/%s' % (dbuuid, dbtoken), timeout=30)
+            r.raise_for_status()
+            # not jsonrpc
+            return r.json()
+        except:
+            return {'error': 'Error retrieving messages, maybe the token is wrong.'}
+
+    @api.model
+    def hibou_professional_update(self, professional_code):
+        set_param = self.env['ir.config_parameter'].sudo().set_param
+        set_param('database.hibou_professional_code', professional_code)
+        try:
+            self._hibou_install()
+        except:
+            pass
+        return self.hibou_professional_status()
+
+    def _get_hibou_modules(self):
+        domain = [('state', 'in', ['installed', 'to upgrade', 'to remove']), ('author', 'ilike', 'hibou')]
+        module_list = self.env['ir.module.module'].sudo().search_read(domain, ['name'])
+        return {module['name']: 1 for module in module_list}
+
+    def _get_hibou_message(self):
+        IrParamSudo = self.env['ir.config_parameter'].sudo()
+
+        dbuuid = IrParamSudo.get_param('database.uuid')
+        dbtoken = IrParamSudo.get_param('database.hibou_token')
+        db_create_date = IrParamSudo.get_param('database.create_date')
+        user = self.env.user.sudo()
+        professional_code = IrParamSudo.get_param('database.hibou_professional_code')
+
+        module_dictionary = self._get_hibou_modules()
+        modules = []
+        for module, qty in module_dictionary.items():
+            modules.append(module if qty == 1 else '%s,%s' % (module, qty))
+
+        web_base_url = IrParamSudo.get_param('web.base.url')
+        msg = {
+            "dbuuid": dbuuid,
+            "dbname": self._cr.dbname,
+            "db_create_date": db_create_date,
+            "version": release.version,
+            "language": user.lang,
+            "web_base_url": web_base_url,
+            "modules": '\n'.join(modules),
+            "professional_code": professional_code,
+        }
+        if dbtoken:
+            msg['dbtoken'] = dbtoken
+        msg.update({'company_' + key: value for key, value in user.company_id.read(["name", "email", "phone"])[0].items() if key != 'id'})
+        return msg
+
+    def _process_hibou_message(self, result):
+        if result.get('professional_info'):
+            set_param = self.env['ir.config_parameter'].sudo().set_param
+            set_param('database.hibou_professional_expiration_date', result['professional_info'].get('expiration_date'))
+            set_param('database.hibou_professional_expiration_reason', result['professional_info'].get('expiration_reason', 'trial'))
+            if result['professional_info'].get('professional_code'):
+                set_param('database.hibou_professional_code', result['professional_info'].get('professional_code'))
+            if result['professional_info'].get('dbtoken'):
+                set_param('database.hibou_token', result['professional_info'].get('dbtoken'))
+
+    def _hibou_install(self):
+        data = self._get_hibou_message()
+        data = {
+            'jsonrpc': '2.0',
+            'method': 'call',
+            'params': data,
+        }
+        r = requests.post(self.CONFIG_HIBOU_URL, json=data, timeout=30)
+        r.raise_for_status()
+        wrapper = r.json()
+        self._process_hibou_message(wrapper.get('result', {}))
+
+    @api.model
+    def _get_sys_logs(self):
+        try:
+            self._hibou_install()
+        except:
+            pass
+        return super(PublisherWarrantyContract, self)._get_sys_logs()
diff --git a/hibou_professional/static/src/css/web.css b/hibou_professional/static/src/css/web.css
new file mode 100644
index 00000000..ca02ed75
--- /dev/null
+++ b/hibou_professional/static/src/css/web.css
@@ -0,0 +1,21 @@
+.hibou_professional_systray .o_mail_systray_dropdown {
+    max-height: 580px !important;
+}
+.hibou_professional_systray .o_mail_systray_dropdown_items {
+    max-height: 578px !important;
+}
+.hibou_professional_systray .subscription_form button {
+    margin-top: 6px;
+}
+
+.hibou_professional_systray .hibou-icon-small {
+    margin-top: -2px;
+}
+
+.hibou_professional_systray .hibou_professional_help {
+    color: #0a6fa2;
+}
+
+.hibou_professional_systray .o_preview_title span {
+    font-weight: bold;
+}
diff --git a/hibou_professional/static/src/img/hibou_icon_small.png b/hibou_professional/static/src/img/hibou_icon_small.png
new file mode 100644
index 00000000..2ea52f7e
Binary files /dev/null and b/hibou_professional/static/src/img/hibou_icon_small.png differ
diff --git a/hibou_professional/static/src/js/core.js b/hibou_professional/static/src/js/core.js
new file mode 100644
index 00000000..2545025a
--- /dev/null
+++ b/hibou_professional/static/src/js/core.js
@@ -0,0 +1,275 @@
+odoo.define('hibou_professional.core', function (require) {
+"use strict";
+
+var Widget = require('web.Widget');
+var SystrayMenu = require('web.SystrayMenu');
+
+var HibouProfessionalSystrayWidget = Widget.extend({
+    template: 'HibouProfessionalSystrayWidget',
+
+    start: function() {
+        var self = this;
+        self.expiration_date = false;
+        self.expiration_reason = false;
+        self.professional_code = false;
+        this.types = [['lead', 'Sales'], ['ticket', 'Support']];
+        this.message_subjects = {'lead': [], 'ticket': [], 'task': []};
+        self.expiring = false;
+        self.expired = false;
+        self.dbuuid = false;
+        self.quote_url = false;
+        self.is_admin = false;
+        self.allow_admin_message = false;
+        self.allow_message = false;
+        this._rpc({
+            model: 'publisher_warranty.contract',
+            method: 'hibou_professional_status',
+        }).then(function (result) {
+            self.handleStatusUpdate(result);
+        });
+        return this._super();
+    },
+
+    get_subjects: function(type) {
+        if (this.message_subjects && this.message_subjects[type]) {
+            return this.message_subjects[type]
+        }
+        return [];
+    },
+
+    set_error: function(error) {
+        this.$('.hibou_professional_error').text(error);
+    },
+
+    update_message_type: function(el) {
+        var selected_type = this.$('select.hibou_message_type').val();
+        if (selected_type && this.$('.hibou_subject_selection_option.' + selected_type).length > 0) {
+            this.$('#hibou_subject_selection').show();
+            this.$('.hibou_subject_selection_option').hide().attr('disabled', true);
+            this.$('.hibou_subject_selection_option.' + selected_type).show().attr('disabled', false);
+            var selected_subject = this.$('.hibou_subject_selection_option.' + selected_type)[0];
+            this.$('select.hibou_subject_selection').val(selected_subject.value);
+        } else if (selected_type) {
+            this.$('select.hibou_subject_selection').val('0');
+            this.$('#hibou_subject_selection').hide();
+        } else {
+            this.$('#hibou_subject_selection').hide();
+            this.$('#hibou_message_priority').hide();
+            this.$('#hibou_message_subject').hide();
+        }
+        this.update_subject_selection();
+    },
+
+    update_subject_selection: function(el) {
+        var selected_subject = this.$('select.hibou_subject_selection').val();
+        if (selected_subject == '0') {
+            this.$('#hibou_message_priority').show();
+            this.$('#hibou_message_subject').show();
+        } else {
+            this.$('#hibou_message_priority').hide();
+            this.$('#hibou_message_subject').hide();
+        }
+    },
+
+    update_message_subjects: function(subjects_by_type) {
+        // TODO actually update instead of overriding...
+        this.message_subjects = subjects_by_type;
+        this.renderElement();
+    },
+
+    button_update_subscription: function() {
+        var self = this;
+        var professional_code = self.$('input.hibou_professional_code').val();
+        if (!professional_code) {
+            alert('Please enter a subscription code first.');
+            return;
+        }
+        self.$('.update_subscription').prop('disabled', 'disabled');
+        self._rpc({
+            model: 'publisher_warranty.contract',
+            method: 'hibou_professional_update',
+            args: [professional_code],
+        }).then(function (result) {
+            self.$('.update_subscription').prop('disabled', false);
+            self.handleStatusUpdate(result);
+        });
+    },
+
+    button_update_message_preferences: function() {
+        var self = this;
+        var allow_admin_message = self.$('input.hibou_allow_admin_message').prop('checked');
+        var allow_message = self.$('input.hibou_allow_message').prop('checked');
+        self.$('.update_message_preferences').prop('disabled', 'disabled');
+        self._rpc({
+            model: 'publisher_warranty.contract',
+            method: 'hibou_professional_update_message_preferences',
+            args: [allow_admin_message, allow_message],
+        }).then(function (result) {
+            self.$('.update_message_preferences').prop('disabled', false);
+            self.handleStatusUpdate(result);
+        });
+    },
+
+    button_quote: function() {
+        var self = this;
+        var message_p = self.$('.button-quote-link p');
+        message_p.text('Retrieving URL...');
+        self._rpc({
+            model: 'publisher_warranty.contract',
+            method: 'hibou_professional_quote',
+        }).then(function (result) {
+            if (result && result['url']) {
+                self.quote_url = result.url
+                self.$('.button-quote-link').attr('href', self.quote_url);
+                message_p.text('Quote URL ready. Click again!');
+            } else {
+                message_p.text('Error with quote url.  Maybe the database token is incorrect.');
+            }
+        });
+    },
+
+    button_send_message: function() {
+        var self = this;
+        var message_type = self.$('select.hibou_message_type').val();
+        var message_priority = self.$('select.hibou_message_priority').val();
+        var message_subject = self.$('input.hibou_message_subject').val();
+        var message_subject_id = self.$('select.hibou_subject_selection').val();
+        var current_url = window.location.href;
+        if (message_subject_id == '0' && (!message_subject || message_subject.length < 3)) {
+            alert('Please enter a longer subject.');
+            return;
+        }
+        var message_body = self.$('textarea.hibou_message_body').val();
+        self.$('.hibou_send_message').prop('disabled', 'disabled');
+        self._rpc({
+            model: 'publisher_warranty.contract',
+            method: 'hibou_professional_send_message',
+            args: [message_type, message_priority, message_subject, message_body, current_url, message_subject_id],
+        }).then(function (result) {
+            // TODO result will have a subject to add to the subjects and re-render.
+            self.$('.hibou_send_message').prop('disabled', false);
+            var message_response = self.$('.hibou_message_response');
+            var access_link = self.$('.hibou_message_response a');
+            var message_form = self.$('.hibou_message_form');
+            if (!result) {
+                access_link.text('An error has occured.')
+            } else {
+                if (result.error) {
+                    access_link.text(result.error);
+                } else {
+                    access_link.text(result.message || 'Your message has been received.')
+                }
+                if (result.access_url) {
+                access_link.attr('href', result.access_url);
+                }
+            }
+            message_response.show();
+            message_form.hide();
+        });
+    },
+
+    button_get_messages: function() {
+        var self = this;
+        var $button = this.$('.hibou_get_messages');
+        $button.prop('disabled', 'disabled');
+        self._rpc({
+            model: 'publisher_warranty.contract',
+            method: 'hibou_professional_get_messages',
+            args: [],
+        }).then(function (result) {
+            $button.prop('disabled', false);
+            if (result['message_subjects']) {
+                self.update_message_subjects(result.message_subjects);
+                setTimeout(function () {
+                    self.$('.dropdown-toggle').click();
+                }, 100);
+            } else if (result['error']) {
+                self.set_error(result['error']);
+            }
+        });
+    },
+
+    renderElement: function() {
+        var self = this;
+        this._super();
+
+        this.update_message_type();
+        this.update_subject_selection();
+
+        this.$('select.hibou_message_type').on('change', function(el) {
+            self.update_message_type(el);
+        });
+        this.$('select.hibou_subject_selection').on('change', function(el) {
+            self.update_subject_selection(el);
+        });
+
+        // Update Subscription Button
+        this.$('.update_subscription').on('click', function(e){
+            e.preventDefault();
+            e.stopPropagation();
+            self.button_update_subscription();
+        });
+
+        this.$('.hibou_get_messages').on('click', function(e){
+            e.preventDefault();
+            e.stopPropagation();
+            self.button_get_messages();
+        });
+
+        // Retrieve quote URL
+        this.$('.button-quote-link').on('click', function(e){
+            if (self.quote_url) {
+                return;  // allow default url click event
+            }
+            e.preventDefault();
+            e.stopPropagation();
+            self.button_quote();
+        });
+
+        // Update Message Preferences Button
+        this.$('.update_message_preferences').on('click', function(e){
+            e.preventDefault();
+            e.stopPropagation();
+            self.button_update_message_preferences();
+        });
+
+        // Send Message Button
+        this.$('.hibou_send_message').on('click', function(e){
+            e.preventDefault();
+            e.stopPropagation();
+            self.button_send_message();
+        });
+
+        // Kill the default click event
+        this.$('.hibou_message_form_container').on('click', function (e) {
+            //e.preventDefault();
+            e.stopPropagation();
+        })
+    },
+
+    handleStatusUpdate: function(status) {
+        this.expiration_date = status.expiration_date;
+        this.expiration_reason = status.expiration_reason;
+        this.professional_code = status.professional_code;
+        this.types = [['lead', 'Sales'], ['ticket', 'Support']];
+        if (this.professional_code) {
+            this.types.push(['task', 'Project Manager/Developer'])
+        }
+        this.expiring = status.expiring;
+        this.expired = status.expired;
+        this.dbuuid = status.dbuuid;
+        this.is_admin = status.is_admin;
+        this.allow_admin_message = status.allow_admin_message;
+        this.allow_message = status.allow_message;
+        this.renderElement();
+    },
+
+});
+
+SystrayMenu.Items.push(HibouProfessionalSystrayWidget);
+
+return {
+    HibouProfessionalSystrayWidget: HibouProfessionalSystrayWidget,
+};
+
+});
\ No newline at end of file
diff --git a/hibou_professional/static/src/xml/templates.xml b/hibou_professional/static/src/xml/templates.xml
new file mode 100644
index 00000000..161cb124
--- /dev/null
+++ b/hibou_professional/static/src/xml/templates.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates id="template" xml:space="preserve">
+    <t t-name="HibouProfessionalSystrayWidget">
+        <li class="hibou_professional_systray o_mail_systray_item">
+            <a class="dropdown-toggle o-no-caret" data-toggle="dropdown" aria-expanded="false" data-flip="false" data-display="static" href="#">
+                <img t-if="! (widget.expiring || widget.expired)" class="hibou-icon-small" width="16px" height="16px" src="/hibou_professional/static/src/img/hibou_icon_small.png" alt="Hibou Icon"/>
+                <i class="fa fa-exclamation-triangle" t-if="widget.expiring || widget.expired"/>
+                <span class="expiration_message" t-if="widget.expiring" t-esc="widget.expiring"/>
+                <span class="expiration_message" t-if="widget.expired" t-esc="widget.expired"/>
+            </a>
+            <div class="dropdown-menu dropdown-menu-right o_mail_systray_dropdown" role="menu">
+                <div class="o_mail_systray_dropdown_items">
+                    <a href="https://hibou.io/help?utm_source=db&amp;utm_medium=help" target="_blank">
+                        <div class="o_mail_preview">
+                            <div class="o_preview_info">
+                                <div class="o_preview_title">
+                                    <span class="o_preview_name hibou_professional_help">
+                                        Hibou Professional Help
+                                    </span>
+                                </div>
+                                <div>
+                                    <p>We're here to help!<br/>Click here to review Hibou's help resources or to contact us today.</p>
+                                </div>
+                                <div class="text-danger hibou_professional_error"/>
+                            </div>
+                        </div>
+                    </a>
+                    <div t-if="widget.allow_message || (widget.allow_admin_message &amp;&amp; widget.is_admin)" class="o_mail_preview hibou_message_form_container">
+                        <div class="o_preview_info">
+                            <div class="o_preview_title">
+                                    <span class="o_preview_name hibou_professional_help">Talk to Hibou!</span>
+                            </div>
+                            <div>
+                                <br/>
+                                <p class="get_messages">
+                                    <button class="hibou_get_messages btn btn-secondary btn-sm">Retrieve Recent Subjects</button>
+                                </p>
+                            </div>
+                            <div class="hibou_message_form">
+                                <t t-set="subject_types" t-value="widget.types"/>
+                                <p>
+                                    <label for="hibou_message_type">Who do you want to talk to?</label>
+                                    <select class="hibou_message_type form-control" name="hibou_message_type">
+                                        <t t-foreach="subject_types" t-as="type">
+                                            <option t-attf-value="#{type[0]}" t-esc="type[1]"/>
+                                        </t>
+                                    </select>
+                                </p>
+                                <p id="hibou_subject_selection">
+                                    <label for="hibou_subject_selection">Update Existing</label>
+                                    <select class="hibou_subject_selection form-control" name="hibou_subject_selection">
+                                        <t t-foreach="subject_types" t-as="type">
+                                            <t t-foreach="widget.get_subjects(type[0])" t-as="subject">
+                                                <option t-attf-value="#{subject[0]}" t-attf-class="hibou_subject_selection_option #{type[0]}" t-esc="subject[1]"/>
+                                            </t>
+                                        </t>
+                                        <option value="0">New</option>
+                                    </select>
+                                </p>
+                                <p id="hibou_message_priority">
+                                    <label for="hibou_message_priority">Priority</label>
+                                    <select class="hibou_message_priority form-control" name="hibou_message_priority">
+                                        <option value="0">Low priority</option>
+                                        <option value="1">Medium priority</option>
+                                        <option value="2">High priority</option>
+                                        <option value="3">Urgent</option>
+                                    </select>
+                                </p>
+                                <p id="hibou_message_subject">
+                                    <label for="hibou_message_subject">Subject</label>
+                                    <input type="text" class="hibou_message_subject form-control" name="hibou_message_subject"/>
+                                </p>
+                                <p>
+                                    <p>You can use <a href="https://www.markdownguide.org/cheat-sheet/" target="_blank">Markdown</a> for formatting.</p>
+                                    <textarea rows="5" class="hibou_message_body form-control" name="hibou_message_body"/>
+                                </p>
+                                <button type="submit" class="hibou_send_message btn btn-primary">Send</button>
+                            </div>
+                            <div class="hibou_message_response" style="display: none;">
+                                <a target="_blank">Click to view your message</a>
+                            </div>
+                        </div>
+                    </div>
+                    <t t-if="widget.expiration_reason == 'trial' || (! widget.expiration_reason) || widget.expired || widget.expiring">
+                        <a class="button-quote-link" target="_blank">
+                            <div class="o_mail_preview">
+                                <div class="o_preview_info">
+                                    <div class="o_preview_title">
+                                        <span class="o_preview_name hibou_professional_help">
+                                            See pricing and get a Quote
+                                        </span>
+                                    </div>
+                                    <div>
+                                        <p>Click here to review Hibou's pricing and start a new Professional Subscription.</p>
+                                    </div>
+                                </div>
+                            </div>
+                        </a>
+                        <div class="o_mail_preview subscription_form">
+                            <div class="o_preview_info">
+                                <div class="o_preview_title">
+                                    <p>
+                                        <span t-if="widget.expiration_reason == 'trial'">You are on a trial of Hibou Professional.<br/></span>
+                                        If you have a subscription code, please enter it here.
+                                    </p>
+                                </div>
+                                <div>
+                                    <input type="text" name="hibou_professional_code form-control" class="hibou_professional_code"/>
+                                    <button type="submit" class="update_subscription btn btn-primary">Update Subscription</button>
+                                </div>
+                            </div>
+                        </div>
+                    </t>
+                    <div t-if="widget.is_admin" class="o_mail_preview message_preferences_form">
+                        <div class="o_preview_info">
+                            <div class="o_preview_title">
+                                <p>
+                                    You can send messages (tickets, project tasks, etc.) directly to Hibou using this dropdown.<br/><br/>Select which users can send messages.
+                                </p>
+                            </div>
+                            <div>
+                                <p>
+                                    <input type="checkbox" t-att-checked="widget.allow_admin_message=='1' or None" name="hibou_allow_admin_message" class="hibou_allow_admin_message"/> Admin Users (like yourself)
+                                </p>
+                                <p>
+                                    <input type="checkbox" t-att-checked="widget.allow_message=='1' or None" name="hibou_allow_message" class="hibou_allow_message"/> All Internal Users
+                                </p>
+                                <button type="submit" class="update_message_preferences btn btn-secondary">Update Message Preferences</button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </li>
+    </t>
+</templates>
\ No newline at end of file
diff --git a/hibou_professional/views/webclient_templates.xml b/hibou_professional/views/webclient_templates.xml
new file mode 100644
index 00000000..aecb5ae6
--- /dev/null
+++ b/hibou_professional/views/webclient_templates.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <template id="assets_backend" name="Hibou Professional" inherit_id="web.assets_backend" priority='15'>
+        <xpath expr="//script[last()]" position="after">
+            <script type="text/javascript" src="/hibou_professional/static/src/js/core.js"></script>
+        </xpath>
+        <xpath expr="//link[last()]" position="after">
+            <link rel="stylesheet" type="text/css" href="/hibou_professional/static/src/css/web.css"/>
+        </xpath>
+    </template>
+</odoo>
\ No newline at end of file
diff --git a/hr_commission/__init__.py b/hr_commission/__init__.py
new file mode 100644
index 00000000..09434554
--- /dev/null
+++ b/hr_commission/__init__.py
@@ -0,0 +1,3 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from . import models
diff --git a/hr_commission/__manifest__.py b/hr_commission/__manifest__.py
new file mode 100644
index 00000000..dabe560a
--- /dev/null
+++ b/hr_commission/__manifest__.py
@@ -0,0 +1,27 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+{
+    'name': 'Hibou Commissions',
+    'author': 'Hibou Corp. <hello@hibou.io>',
+    'version': '13.0.1.0.1',
+    'category': 'Accounting/Commissions',
+    'license': 'OPL-1',
+    'website': 'https://hibou.io/',
+    'depends': [
+        # 'account_invoice_margin',  # optional
+        'hibou_professional',
+        'hr_contract',
+    ],
+    'data': [
+        'security/commission_security.xml',
+        'security/ir.model.access.csv',
+        'views/account_views.xml',
+        'views/commission_views.xml',
+        'views/hr_views.xml',
+        'views/partner_views.xml',
+        'views/res_config_settings_views.xml',
+    ],
+    'installable': True,
+    'application': True,
+    'auto_install': False,
+ }
diff --git a/hr_commission/models/__init__.py b/hr_commission/models/__init__.py
new file mode 100755
index 00000000..d739b6ed
--- /dev/null
+++ b/hr_commission/models/__init__.py
@@ -0,0 +1,8 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from . import account
+from . import commission
+from . import hr
+from . import partner
+from . import res_company
+from . import res_config_settings
diff --git a/hr_commission/models/account.py b/hr_commission/models/account.py
new file mode 100644
index 00000000..819c69d3
--- /dev/null
+++ b/hr_commission/models/account.py
@@ -0,0 +1,50 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo import api, fields, models
+
+
+class AccountMove(models.Model):
+    _inherit = 'account.move'
+
+    commission_ids = fields.One2many(comodel_name='hr.commission', inverse_name='source_move_id', string='Commissions')
+    commission_count = fields.Integer(string='Number of Commissions', compute='_compute_commission_count')
+
+    @api.depends('state', 'commission_ids')
+    def _compute_commission_count(self):
+        for move in self:
+            move.commission_count = len(move.commission_ids)
+        return True
+
+    def open_commissions(self):
+        return {
+            'type': 'ir.actions.act_window',
+            'name': 'Invoice Commissions',
+            'res_model': 'hr.commission',
+            'view_mode': 'tree,form',
+            'context': {'search_default_source_move_id': self[0].id}
+        }
+
+    def post(self):
+        res = super(AccountMove, self).post()
+        invoices = self.filtered(lambda m: m.is_invoice())
+        if invoices:
+            self.env['hr.commission'].invoice_validated(invoices)
+        return res
+
+    def action_invoice_paid(self):
+        res = super(AccountMove, self).action_invoice_paid()
+        self.env['hr.commission'].invoice_paid(self)
+        return res
+
+    def amount_for_commission(self):
+        # TODO Should toggle in Config Params
+        if hasattr(self, 'margin') and self.company_id.commission_amount_type == 'on_invoice_margin':
+            sign = -1 if self.type in ['in_refund', 'out_refund'] else 1
+            return self.margin * sign
+        return self.amount_total_signed
+
+    def action_cancel(self):
+        res = super(AccountMove, self).action_cancel()
+        for move in self:
+            move.sudo().commission_ids.unlink()
+        return res
diff --git a/hr_commission/models/commission.py b/hr_commission/models/commission.py
new file mode 100644
index 00000000..3a491080
--- /dev/null
+++ b/hr_commission/models/commission.py
@@ -0,0 +1,329 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo import api, fields, models
+from odoo.tools import float_is_zero
+from odoo.exceptions import UserError
+
+
+class Commission(models.Model):
+    _name = 'hr.commission'
+    _description = 'Commission'
+    _order = 'id desc'
+
+    state = fields.Selection([
+        ('draft', 'New'),
+        ('done', 'Confirmed'),
+        ('paid', 'Paid'),
+        ('cancel', 'Cancelled'),
+        ], 'Status', default='draft')
+    employee_id = fields.Many2one('hr.employee', required=1)
+    user_id = fields.Many2one('res.users', related='employee_id.user_id')
+    source_move_id = fields.Many2one('account.move')
+    contract_id = fields.Many2one('hr.contract')
+    structure_id = fields.Many2one('hr.commission.structure')
+    rate_type = fields.Selection([
+        ('normal', 'Normal'),
+        ('structure', 'Structure'),
+        ('admin', 'Admin'),
+        ('manual', 'Manual'),
+        ], 'Rate Type', default='normal')
+    rate = fields.Float('Rate')
+    base_total = fields.Float('Base Total')
+    base_amount = fields.Float(string='Base Amount')
+    amount = fields.Float(string='Amount')
+    move_id = fields.Many2one('account.move', ondelete='set null')
+    move_date = fields.Date(related='move_id.date', store=True)
+    company_id = fields.Many2one('res.company', 'Company', required=True,
+                                 default=lambda s: s.env['res.company']._company_default_get('hr.commission'))
+    memo = fields.Char(string='Memo')
+    accounting_date = fields.Date('Force Accounting Date',
+                                  help="Choose the accounting date at which you want to value the commission "
+                                       "moves created by the commission instead of the default one.")
+    payment_id = fields.Many2one('hr.commission.payment', string='Commission Payment', ondelete='set null')
+
+    @api.depends('employee_id', 'source_move_id')
+    def name_get(self):
+        res = []
+        for commission in self:
+            name = ''
+            if commission.source_move_id:
+                name += commission.source_move_id.name
+            if commission.employee_id:
+                if name:
+                    name += ' - ' + commission.employee_id.name
+                else:
+                    name += commission.employee_id.name
+            res.append((commission.id, name))
+        return res
+
+    @api.onchange('rate_type')
+    def _onchange_rate_type(self):
+        for commission in self.filtered(lambda c: c.rate_type == 'manual'):
+            commission.rate = 100.0
+
+    @api.onchange('source_move_id', 'contract_id', 'rate_type', 'base_amount', 'rate')
+    def _compute_amount(self):
+        for commission in self:
+            # Determine rate (if needed)
+            if commission.structure_id and commission.rate_type == 'structure':
+                line = commission.structure_id.line_ids.filtered(lambda l: l.employee_id == commission.employee_id)
+                commission.rate = line.get_rate()
+            elif commission.contract_id and commission.rate_type != 'manual':
+                if commission.rate_type == 'normal':
+                    commission.rate = commission.contract_id.commission_rate
+                else:
+                    commission.rate = commission.contract_id.admin_commission_rate
+
+            rounding = 2
+            if commission.source_move_id:
+                rounding = commission.source_move_id.company_currency_id.rounding
+                commission.base_total = commission.source_move_id.amount_total_signed
+                commission.base_amount = commission.source_move_id.amount_for_commission()
+
+            amount = (commission.base_amount * commission.rate) / 100.0
+            if float_is_zero(amount, precision_rounding=rounding):
+                amount = 0.0
+            commission.amount = amount
+
+
+    @api.model
+    def create(self, values):
+        res = super(Commission, self).create(values)
+        res._compute_amount()
+        if res.amount == 0.0 and res.state == 'draft':
+            res.state = 'done'
+        return res
+
+    def unlink(self):
+        if self.filtered(lambda c: c.move_id):
+            raise UserError('You cannot delete a commission when it has an accounting entry.')
+        return super(Commission, self).unlink()
+
+    def _filter_source_moves_for_creation(self, moves):
+        return moves.filtered(lambda i: i.user_id and not i.commission_ids)
+
+    @api.model
+    def _commissions_to_confirm(self, moves):
+        commissions = moves.mapped('commission_ids')
+        return commissions.filtered(lambda c: c.state != 'cancel' and not c.move_id)
+
+    @api.model
+    def invoice_validated(self, moves):
+        employee_obj = self.env['hr.employee'].sudo()
+        commission_obj = self.sudo()
+        for move in self._filter_source_moves_for_creation(moves):
+            move_amount = move.amount_for_commission()
+
+            # Does the invoice have a commission structure?
+            partner = move.partner_id
+            commission_structure = partner.commission_structure_id
+            while not commission_structure and partner:
+                partner = partner.parent_id
+                commission_structure = partner.commission_structure_id
+
+            if commission_structure:
+                commission_structure.create_for_source_move(move, move_amount)
+            else:
+                employee = employee_obj.search([('user_id', '=', move.user_id.id)], limit=1)
+                contract = employee.contract_id
+                if all((employee, contract)):
+                    move.commission_ids += commission_obj.create({
+                        'employee_id': employee.id,
+                        'contract_id': contract.id,
+                        'source_move_id': move.id,
+                        'base_amount': move_amount,
+                        'rate_type': 'normal',
+                        'company_id': move.company_id.id,
+                    })
+
+                # Admin/Coach commission.
+                employee = employee.coach_id
+                contract = employee.contract_id
+                if all((employee, contract)):
+                    move.commission_ids += commission_obj.create({
+                        'employee_id': employee.id,
+                        'contract_id': contract.id,
+                        'source_move_id': move.id,
+                        'base_amount': move_amount,
+                        'rate_type': 'admin',
+                        'company_id': move.company_id.id,
+                    })
+
+            if move.commission_ids and move.company_id.commission_type == 'on_invoice':
+                commissions = self._commissions_to_confirm(move)
+                commissions.sudo().action_confirm()
+
+        return True
+
+    @api.model
+    def invoice_paid(self, moves):
+        commissions = self._commissions_to_confirm(moves)
+        commissions.sudo().action_confirm()
+        return True
+
+    def action_confirm(self):
+        move_obj = self.env['account.move'].sudo()
+
+        for commission in self:
+            if commission.state == 'cancel':
+                continue
+            if commission.move_id or commission.amount == 0.0:
+                commission.write({'state': 'done'})
+                continue
+
+            journal = commission.company_id.commission_journal_id
+            if not journal or not journal.default_debit_account_id or not journal.default_credit_account_id:
+                raise UserError('Commission Journal not configured.')
+
+            liability_account = commission.company_id.commission_liability_id
+            if not liability_account:
+                liability_account = commission.employee_id.address_home_id.property_account_payable_id
+            if not liability_account:
+                raise UserError('Commission liability account must be configured if employee\'s don\'t have AP setup.')
+
+            date = commission.source_move_id.date if commission.source_move_id else fields.Date.context_today(commission)
+
+            # Already paid.
+            payments = commission.source_move_id._get_reconciled_payments()
+            if payments:
+                date = max(payments.mapped('payment_date'))
+            if commission.accounting_date:
+                date = commission.accounting_date
+
+            ref = 'Commission for ' + commission.name_get()[0][1]
+            if commission.memo:
+                ref += ' :: ' + commission.memo
+
+            move = move_obj.create({
+                'date': date,
+                'ref': ref,
+                'journal_id': journal.id,
+                'type': 'entry',
+                'line_ids': [
+                    (0, 0, {
+                        'name': ref,
+                        'partner_id': commission.employee_id.address_home_id.id,
+                        'account_id': liability_account.id,
+                        'credit': commission.amount if commission.amount > 0.0 else 0.0,
+                        'debit': 0.0 if commission.amount > 0.0 else -commission.amount,
+                    }),
+                    (0, 0, {
+                        'name': ref,
+                        'partner_id': commission.employee_id.address_home_id.id,
+                        'account_id': journal.default_credit_account_id.id if commission.amount > 0.0 else journal.default_debit_account_id.id,
+                        'credit': 0.0 if commission.amount > 0.0 else -commission.amount,
+                        'debit': commission.amount if commission.amount > 0.0 else 0.0,
+                    }),
+                ],
+            })
+            move.post()
+            commission.write({'state': 'done', 'move_id': move.id})
+        return True
+
+    def action_mark_paid(self):
+        if self.filtered(lambda c: c.state != 'done'):
+            raise UserError('You cannot mark a commission "paid" if it is not already "done".')
+        if not self:
+            raise UserError('You must have at least one "done" commission.')
+        payments = self._mark_paid()
+        action = self.env.ref('hr_commission.action_hr_commission_payment').read()[0]
+        action['res_ids'] = payments.ids
+        return action
+
+    def _mark_paid(self):
+        employees = self.mapped('employee_id')
+        payments = self.env['hr.commission.payment']
+        for employee in employees:
+            commissions = self.filtered(lambda c: c.employee_id == employee)
+            min_date = False
+            max_date = False
+            for commission in commissions:
+                if not min_date or (commission.move_date and min_date > commission.move_date):
+                    min_date = commission.move_date
+                if not max_date or (commission.move_date and max_date < commission.move_date):
+                    max_date = commission.move_date
+            payment = payments.create({
+                'employee_id': employee.id,
+                'name': ('Commissions %s - %s' % (min_date, max_date)),
+                'date': fields.Date.today(),
+            })
+            payments += payment
+            commissions.write({'state': 'paid', 'payment_id': payment.id})
+        return payments
+
+    def action_cancel(self):
+        for commission in self:
+            if commission.move_id:
+                commission.move_id.write({'state': 'draft'})
+                commission.move_id.unlink()
+            commission.write({'state': 'cancel'})
+        return True
+
+    def action_draft(self):
+        for commission in self.filtered(lambda c: c.state == 'cancel'):
+            commission.write({'state': 'draft'})
+
+
+class CommissionPayment(models.Model):
+    _name = 'hr.commission.payment'
+    _description = 'Commission Payment'
+    _order = 'id desc'
+
+    name = fields.Char(string='Name')
+    employee_id = fields.Many2one('hr.employee', required=1)
+    user_id = fields.Many2one('res.users', related='employee_id.user_id')
+    date = fields.Date(string='Date')
+    commission_ids = fields.One2many('hr.commission', 'payment_id', string='Paid Commissions', readonly=True)
+    commission_count = fields.Integer(string='Commission Count', compute='_compute_commission_stats', store=True)
+    commission_amount = fields.Float(string='Commission Amount', compute='_compute_commission_stats', store=True)
+
+    @api.depends('commission_ids')
+    def _compute_commission_stats(self):
+        for payment in self:
+            payment.commission_count = len(payment.commission_ids)
+            payment.commission_amount = sum(payment.commission_ids.mapped('amount'))
+
+
+class CommissionStructure(models.Model):
+    _name = 'hr.commission.structure'
+    _description = 'Commission Structure'
+    _order = 'id desc'
+
+    name = fields.Char(string='Name')
+    line_ids = fields.One2many('hr.commission.structure.line', 'structure_id', string='Lines')
+
+    def create_for_source_move(self, move, amount):
+        self.ensure_one()
+        commission_obj = self.env['hr.commission'].sudo()
+
+        for line in self.line_ids:
+            employee = line.employee_id
+            rate = line.get_rate()
+            if all((employee, rate)):
+                contract = False
+                if not line.rate:
+                    # The rate must have come from the contract.
+                    contract = employee.contract_id
+                move.commission_ids += commission_obj.create({
+                    'employee_id': employee.id,
+                    'structure_id': self.id,
+                    'source_move_id': move.id,
+                    'base_amount': amount,
+                    'rate_type': 'structure',
+                    'contract_id': contract.id if contract else False,
+                    'company_id': move.company_id.id,
+                })
+
+
+class CommissionStructureLine(models.Model):
+    _name = 'hr.commission.structure.line'
+    _description = 'Commission Structure Line'
+
+    structure_id = fields.Many2one('hr.commission.structure', string='Structure', required=True)
+    employee_id = fields.Many2one('hr.employee', string='Employee', required=True)
+    rate = fields.Float(string='Commission %', default=0.0, help='Leave 0.0 to use the employee\'s current contract rate.')
+
+    def get_rate(self):
+        if not self.rate:
+            return self.employee_id.contract_id.commission_rate
+        return self.rate
diff --git a/hr_commission/models/hr.py b/hr_commission/models/hr.py
new file mode 100644
index 00000000..4047ee34
--- /dev/null
+++ b/hr_commission/models/hr.py
@@ -0,0 +1,11 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo import api, fields, models
+
+
+class Contract(models.Model):
+    _inherit = 'hr.contract'
+
+    commission_rate = fields.Float(string='Commission %', default=0.0)
+    admin_commission_rate = fields.Float(string='Admin Commission %', default=0.0)
+
diff --git a/hr_commission/models/partner.py b/hr_commission/models/partner.py
new file mode 100644
index 00000000..b88149ad
--- /dev/null
+++ b/hr_commission/models/partner.py
@@ -0,0 +1,9 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo import fields, models
+
+
+class Partner(models.Model):
+    _inherit = 'res.partner'
+
+    commission_structure_id = fields.Many2one('hr.commission.structure', string='Commission Structure')
diff --git a/hr_commission/models/res_company.py b/hr_commission/models/res_company.py
new file mode 100644
index 00000000..26a2acb4
--- /dev/null
+++ b/hr_commission/models/res_company.py
@@ -0,0 +1,18 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo import fields, models
+
+
+class ResCompany(models.Model):
+    _inherit = 'res.company'
+
+    commission_journal_id = fields.Many2one('account.journal', string='Commission Journal')
+    commission_liability_id = fields.Many2one('account.account', string='Commission Liability Account')
+    commission_type = fields.Selection([
+        ('on_invoice', 'On Invoice Validation'),
+        ('on_invoice_paid', 'On Invoice Paid'),
+    ], string='Pay Commission', default='on_invoice_paid')
+    commission_amount_type = fields.Selection([
+        ('on_invoice_margin', 'On Invoice Margin'),
+        ('on_invoice_total', 'On Invoice Total'),
+    ], string='Commission Base', default='on_invoice_margin')
diff --git a/hr_commission/models/res_config_settings.py b/hr_commission/models/res_config_settings.py
new file mode 100644
index 00000000..d09b5b38
--- /dev/null
+++ b/hr_commission/models/res_config_settings.py
@@ -0,0 +1,12 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo import fields, models
+
+
+class ResConfigSettings(models.TransientModel):
+    _inherit = 'res.config.settings'
+
+    commission_journal_id = fields.Many2one(related='company_id.commission_journal_id', readonly=False)
+    commission_liability_id = fields.Many2one(related='company_id.commission_liability_id', readonly=False)
+    commission_type = fields.Selection(related='company_id.commission_type', readonly=False)
+    commission_amount_type = fields.Selection(related='company_id.commission_amount_type', readonly=False)
diff --git a/hr_commission/security/commission_security.xml b/hr_commission/security/commission_security.xml
new file mode 100644
index 00000000..844471ff
--- /dev/null
+++ b/hr_commission/security/commission_security.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="0">
+
+        <record id="hr_commission_rule" model="ir.rule">
+            <field name="name">Commission User</field>
+            <field name="model_id" ref="model_hr_commission"/>
+            <field name="domain_force">[('user_id', '=', user.id)]</field>
+            <field name="groups" eval="[(4, ref('base.group_user'))]"/>
+        </record>
+
+        <record id="hr_commission_rule_manager" model="ir.rule">
+            <field name="name">Commission Manager</field>
+            <field name="model_id" ref="model_hr_commission"/>
+            <field name="domain_force">[(1, '=', 1)]</field>
+            <field name="groups" eval="[(4, ref('account.group_account_manager'))]"/>
+        </record>
+
+        <record id="hr_commission_payment_rule" model="ir.rule">
+            <field name="name">Commission Payment User</field>
+            <field name="model_id" ref="model_hr_commission_payment"/>
+            <field name="domain_force">[('user_id', '=', user.id)]</field>
+            <field name="groups" eval="[(4, ref('base.group_user'))]"/>
+        </record>
+
+        <record id="hr_commission_payment_rule_manager" model="ir.rule">
+            <field name="name">Commission Payment Manager</field>
+            <field name="model_id" ref="model_hr_commission_payment"/>
+            <field name="domain_force">[(1, '=', 1)]</field>
+            <field name="groups" eval="[(4, ref('account.group_account_manager'))]"/>
+        </record>
+
+    </data>
+</odoo>
diff --git a/hr_commission/security/ir.model.access.csv b/hr_commission/security/ir.model.access.csv
new file mode 100644
index 00000000..59b621a1
--- /dev/null
+++ b/hr_commission/security/ir.model.access.csv
@@ -0,0 +1,9 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_commission_user,commission user,model_hr_commission,base.group_user,1,0,0,0
+access_commission_manager,commission manager,model_hr_commission,account.group_account_manager,1,1,1,1
+access_commission_payment_user,commission payment user,model_hr_commission_payment,base.group_user,1,0,0,0
+access_commission_payment_manager,commission payment manager,model_hr_commission_payment,account.group_account_manager,1,1,1,1
+access_commission_structure_user,commission structure user,model_hr_commission_structure,base.group_user,1,0,0,0
+access_commission_structure_manager,commission structure manager,model_hr_commission_structure,account.group_account_manager,1,1,1,1
+access_commission_structure_line_user,commission structure line user,model_hr_commission_structure_line,base.group_user,1,0,0,0
+access_commission_structure_line_manager,commission structure line manager,model_hr_commission_structure_line,account.group_account_manager,1,1,1,1
diff --git a/hr_commission/static/description/icon.png b/hr_commission/static/description/icon.png
new file mode 100644
index 00000000..f4d8b501
Binary files /dev/null and b/hr_commission/static/description/icon.png differ
diff --git a/hr_commission/tests/__init__.py b/hr_commission/tests/__init__.py
new file mode 100755
index 00000000..4745f69f
--- /dev/null
+++ b/hr_commission/tests/__init__.py
@@ -0,0 +1,3 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from . import test_commission
diff --git a/hr_commission/tests/test_commission.py b/hr_commission/tests/test_commission.py
new file mode 100644
index 00000000..f28d983a
--- /dev/null
+++ b/hr_commission/tests/test_commission.py
@@ -0,0 +1,232 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo.tests import common
+
+# TODO Tests won't pass without `sale`
+#   Tests should be refactored to not build sale orders
+#   to invoice, just create invoices directly.
+
+
+class TestCommission(common.TransactionCase):
+    # TODO refactor tests to not require sale.order
+
+    def setUp(self):
+        super().setUp()
+        self.user = self.browse_ref('base.user_demo')
+        self.employee = self.browse_ref('hr.employee_qdp')  # This is the employee associated with above user.
+
+    def _createUser(self):
+        return self.env['res.users'].create({
+            'name': 'Coach',
+            'email': 'coach',
+        })
+
+    def _createEmployee(self, user):
+        return self.env['hr.employee'].create({
+            'birthday': '1985-03-14',
+            'country_id': self.ref('base.us'),
+            'department_id': self.ref('hr.dep_rd'),
+            'gender': 'male',
+            'name': 'Jared',
+            'address_home_id': user.partner_id.id,
+            'user_id': user.id,
+        })
+
+    def _createContract(self, employee, commission_rate, admin_commission_rate=0.0):
+        return self.env['hr.contract'].create({
+            'date_start': '2016-01-01',
+            'date_end': '2030-12-31',
+            'name': 'Contract for tests',
+            'wage': 1000.0,
+            # 'type_id': self.ref('hr_contract.hr_contract_type_emp'),
+            'employee_id': employee.id,
+            'resource_calendar_id': self.ref('resource.resource_calendar_std'),
+            'commission_rate': commission_rate,
+            'admin_commission_rate': admin_commission_rate,
+            'state': 'open',  # if not "Running" then no automatic selection when Payslip is created in 11.0
+        })
+
+    def _createInvoiceableSaleOrder(self, user):
+        product = self.env.ref('sale.advance_product_0')
+        partner = self.env.ref('base.res_partner_12')
+        sale = self.env['sale.order'].create({
+            'partner_id': partner.id,
+            'user_id': user.id,
+            'order_line': [(0, 0, {
+                'name': 'test deposit',
+                'product_id': product.id,
+                'product_uom_qty': 1.0,
+                'product_uom': product.uom_id.id,
+                'price_unit': 5.0,
+            })]
+        })
+        self.assertEqual(sale.user_id, user)
+        sale.action_confirm()
+        self.assertTrue(sale.state in ('sale', 'done'))
+        self.assertEqual(sale.invoice_status, 'to invoice')
+        return sale
+
+    def test_commission(self):
+        # find and configure company commissions journal
+        commission_journal = self.env['account.journal'].search([('type', '=', 'general')], limit=1)
+        self.assertTrue(commission_journal)
+        expense_account = self.env.ref('l10n_generic_coa.1_expense')
+        commission_journal.default_debit_account_id = expense_account
+        commission_journal.default_credit_account_id = expense_account
+        self.env.user.company_id.commission_journal_id = commission_journal
+
+        coach = self._createEmployee(self.browse_ref('base.user_root'))
+        coach_contract = self._createContract(coach, 12.0, admin_commission_rate=2.0)
+        user = self.user
+        emp = self.employee
+        emp.address_home_id = user.partner_id  # Important field for payables.
+        emp.coach_id = coach
+
+        contract = self._createContract(emp, 5.0)
+
+        so = self._createInvoiceableSaleOrder(user)
+        inv = so._create_invoices()
+        self.assertFalse(inv.commission_ids, 'Commissions exist when invoice is created.')
+        inv.action_post()  # validate
+        self.assertEqual(inv.state, 'posted')
+        self.assertEqual(inv.invoice_payment_state, 'not_paid')
+        self.assertTrue(inv.commission_ids, 'Commissions not created when invoice is validated.')
+
+        user_commission = inv.commission_ids.filtered(lambda c: c.employee_id.id == emp.id)
+        self.assertEqual(len(user_commission), 1, 'Incorrect commission count %d (expect 1)' % len(user_commission))
+        self.assertEqual(user_commission.state, 'draft', 'Commission is not draft.')
+        self.assertFalse(user_commission.move_id, 'Commission has existing journal entry.')
+
+        # Amounts
+        commission_rate = contract.commission_rate
+        self.assertEqual(commission_rate, 5.0)
+        expected = (inv.amount_for_commission() * commission_rate) / 100.0
+        actual = user_commission.amount
+        self.assertAlmostEqual(actual, expected, int(inv.company_currency_id.rounding))
+
+        # Pay.
+        pay_journal = self.env['account.journal'].search([('type', '=', 'bank')], limit=1)
+        payment = self.env['account.payment'].create({
+            'payment_type': 'inbound',
+            'payment_method_id': self.env.ref('account.account_payment_method_manual_in').id,
+            'partner_type': 'customer',
+            'partner_id': inv.partner_id.id,
+            'amount': inv.amount_residual,
+            'currency_id': inv.currency_id.id,
+            'journal_id': pay_journal.id,
+        })
+        payment.post()
+
+        receivable_line = payment.move_line_ids.filtered('credit')
+        inv.js_assign_outstanding_line(receivable_line.id)
+        self.assertEqual(inv.invoice_payment_state, 'paid', 'Invoice is not paid.')
+
+        user_commission = inv.commission_ids.filtered(lambda c: c.employee_id.id == emp.id)
+        self.assertEqual(user_commission.state, 'done', 'Commission is not done.')
+        self.assertTrue(user_commission.move_id, 'Commission didn\'t create a journal entry.')
+        inv.company_currency_id.rounding
+
+        # Coach/Admin commissions
+        coach_commission = inv.commission_ids.filtered(lambda c: c.employee_id.id == coach.id)
+        self.assertEqual(len(coach_commission), 1, 'Incorrect commission count %d (expect 1)' % len(coach_commission))
+
+        commission_rate = coach_contract.admin_commission_rate
+        expected = (inv.amount_for_commission() * commission_rate) / 100.0
+        actual = coach_commission.amount
+        self.assertAlmostEqual(
+            actual,
+            expected,
+            int(inv.company_currency_id.rounding))
+
+        # Use the "Mark Paid" button
+        result_action = user_commission.action_mark_paid()
+        self.assertEqual(user_commission.state, 'paid')
+        self.assertTrue(user_commission.payment_id)
+
+    def test_commission_on_invoice(self):
+        # Set to be On Invoice instead of On Invoice Paid
+        self.env.user.company_id.commission_type = 'on_invoice'
+
+        # find and configure company commissions journal
+        commission_journal = self.env['account.journal'].search([('type', '=', 'general')], limit=1)
+        self.assertTrue(commission_journal)
+        expense_account = self.env.ref('l10n_generic_coa.1_expense')
+        commission_journal.default_debit_account_id = expense_account
+        commission_journal.default_credit_account_id = expense_account
+        self.env.user.company_id.commission_journal_id = commission_journal
+
+
+        coach = self._createEmployee(self.browse_ref('base.user_root'))
+        coach_contract = self._createContract(coach, 12.0, admin_commission_rate=2.0)
+        user = self.user
+        emp = self.employee
+        emp.address_home_id = user.partner_id  # Important field for payables.
+        emp.coach_id = coach
+
+        contract = self._createContract(emp, 5.0)
+
+        so = self._createInvoiceableSaleOrder(user)
+        inv = so._create_invoices()
+        self.assertFalse(inv.commission_ids, 'Commissions exist when invoice is created.')
+        inv.action_post()  # validate
+        self.assertEqual(inv.state, 'posted')
+        self.assertTrue(inv.commission_ids, 'Commissions not created when invoice is validated.')
+
+        user_commission = inv.commission_ids.filtered(lambda c: c.employee_id.id == emp.id)
+        self.assertEqual(len(user_commission), 1, 'Incorrect commission count %d (expect 1)' % len(user_commission))
+        self.assertEqual(user_commission.state, 'done', 'Commission is not done.')
+        self.assertTrue(user_commission.move_id, 'Commission missing journal entry.')
+
+        # Use the "Mark Paid" button
+        user_commission.action_mark_paid()
+        self.assertEqual(user_commission.state, 'paid')
+
+    def test_commission_structure(self):
+        # Set to be On Invoice instead of On Invoice Paid
+        self.env.user.company_id.commission_type = 'on_invoice'
+
+        # find and configure company commissions journal
+        commission_journal = self.env['account.journal'].search([('type', '=', 'general')], limit=1)
+        self.assertTrue(commission_journal)
+        expense_account = self.env.ref('l10n_generic_coa.1_expense')
+        commission_journal.default_debit_account_id = expense_account
+        commission_journal.default_credit_account_id = expense_account
+        self.env.user.company_id.commission_journal_id = commission_journal
+
+
+        coach = self._createEmployee(self.browse_ref('base.user_root'))
+        coach_contract = self._createContract(coach, 12.0, admin_commission_rate=2.0)
+        user = self.user
+        emp = self.employee
+        emp.address_home_id = user.partner_id  # Important field for payables.
+        emp.coach_id = coach
+
+        contract = self._createContract(emp, 5.0)
+
+        so = self._createInvoiceableSaleOrder(user)
+
+        # Create and set commission structure
+        commission_structure = self.env['hr.commission.structure'].create({
+            'name': 'Test Structure',
+            'line_ids': [
+                (0, 0, {'employee_id': emp.id, 'rate': 13.0}),
+                (0, 0, {'employee_id': coach.id, 'rate': 0.0}),  # This means it will use the coach's contract normal rate
+            ],
+        })
+        so.partner_id.commission_structure_id = commission_structure
+
+        inv = so._create_invoices()
+        self.assertFalse(inv.commission_ids, 'Commissions exist when invoice is created.')
+        inv.action_post()  # validate
+        self.assertEqual(inv.state, 'posted')
+        self.assertTrue(inv.commission_ids, 'Commissions not created when invoice is validated.')
+
+        user_commission = inv.commission_ids.filtered(lambda c: c.employee_id.id == emp.id)
+        self.assertEqual(len(user_commission), 1, 'Incorrect commission count %d (expect 1)' % len(user_commission))
+        self.assertEqual(user_commission.state, 'done', 'Commission is not done.')
+        self.assertEqual(user_commission.rate, 13.0)
+
+        coach_commission = inv.commission_ids.filtered(lambda c: c.employee_id.id == coach.id)
+        self.assertEqual(len(coach_commission), 1, 'Incorrect commission count %d (expect 1)' % len(coach_commission))
+        self.assertEqual(coach_commission.state, 'done', 'Commission is not done.')
+        self.assertEqual(coach_commission.rate, 12.0, 'Commission rate should be the contract rate.')
diff --git a/hr_commission/views/account_views.xml b/hr_commission/views/account_views.xml
new file mode 100644
index 00000000..5caf5cd3
--- /dev/null
+++ b/hr_commission/views/account_views.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="view_move_form_inherit" model="ir.ui.view">
+        <field name="name">account.move.form.inherit</field>
+        <field name="model">account.move</field>
+        <field name="inherit_id" ref="account.view_move_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//div[@name='button_box']" position="inside">
+                <button class="oe_stat_button" name="open_commissions" icon="fa-money" type="object"
+                        attrs="{'invisible': [('commission_count', '=', 0)]}">
+                    <field name="commission_count" string="Commissions" widget="statinfo"/>
+                </button>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
\ No newline at end of file
diff --git a/hr_commission/views/commission_views.xml b/hr_commission/views/commission_views.xml
new file mode 100644
index 00000000..887cbbe8
--- /dev/null
+++ b/hr_commission/views/commission_views.xml
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="view_hr_commission_form" model="ir.ui.view">
+        <field name="name">hr.commission.form</field>
+        <field name="model">hr.commission</field>
+        <field name="arch" type="xml">
+            <form string="Commission" class="oe_form_nomargin">
+                <header>
+                    <button name="action_confirm" string="Confirm" class="btn-primary" type="object" attrs="{'invisible': [('state', '!=', 'draft')]}"/>
+                    <button name="action_draft" string="Set Draft" class="btn-default" type="object" attrs="{'invisible': [('state', '!=', 'cancel')]}"/>
+                    <button name="action_mark_paid" string="Mark Paid" class="btn-default" type="object" attrs="{'invisible': [('state', '!=', 'done')]}"/>
+                    <button name="action_cancel" string="Cancel" class="btn-default" type="object" attrs="{'invisible': [('state', '=', 'cancel')]}"/>
+                    <field name="state" widget="statusbar" on_change="1" modifiers="{'readonly': true}"/>
+                </header>
+                <sheet>
+                    <div class="oe_button_box" name="button_box">
+                    </div>
+                    <div class="oe_title">
+                    </div>
+                    <group>
+                        <group>
+                            <field name="employee_id" modifiers="{'readonly': [('state', '!=', 'draft')]}"/>
+                            <field name="contract_id" domain="[('employee_id', '=', employee_id)]" modifiers="{'readonly': [('state', '!=', 'draft')]}"/>
+                            <field name="structure_id" modifiers="{'readonly': [('state', '!=', 'draft')]}"/>
+                            <field name="source_move_id" modifiers="{'readonly': [('state', '!=', 'draft')]}"/>
+                            <field name="company_id" groups="base.group_multi_company" modifiers="{'readonly': [('state', '!=', 'draft')]}"/>
+                            <field name="memo" modifiers="{'readonly': [('state', 'not in', ('draft', 'done'))]}"/>
+                        </group>
+                        <group>
+                            <field name="rate_type" modifiers="{'readonly': [('state', '!=', 'draft')]}"/>
+                            <field name="rate" attrs="{'readonly': [('contract_id', '!=', False), ('rate_type', '!=', 'manual')]}"/>
+                            <field name="base_total" modifiers="{'readonly': [('state', '!=', 'draft')]}"/>
+                            <field name="base_amount" modifiers="{'readonly': [('state', '!=', 'draft')]}"/>
+                            <field name="amount" readonly="1" force_save="1"/>
+                            <field name="move_date" readonly="1" attrs="{'invisible': [('move_date', '=', False)]}"/>
+                            <field name="accounting_date"
+                                   attrs="{'invisible': ['|', ('rate_type', '!=', 'manual'), ('move_date', '!=', False)], 'readonly': [('state', '!=', 'draft')]}"/>
+                            <field name="move_id" attrs="{'invisible': [('move_id', '=', False)], 'readonly': [('state', '!=', 'draft')]}"/>
+                            <field name="payment_id" attrs="{'invisible': [('payment_id', '=', False)]}" readonly="1"/>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="view_hr_commission_tree" model="ir.ui.view">
+        <field name="name">hr.commission.tree</field>
+        <field name="model">hr.commission</field>
+        <field name="arch" type="xml">
+            <tree decoration-info="state == 'draft'" decoration-muted="state == 'cancel'">
+                <field name="create_date"/>
+                <field name="source_move_id"/>
+                <field name="employee_id"/>
+                <field name="contract_id"/>
+                <field name="base_total" string="Invoice Total" sum="Invoice Total"/>
+                <field name="base_amount" string="Margin" sum="Margin Total"/>
+                <field name="amount" string="Commission" sum="Commission Total"/>
+                <field name="state"/>
+                <field name="move_date"/>
+                <field name="company_id" groups="base.group_multi_company"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_hr_commission_pivot" model="ir.ui.view">
+        <field name="name">hr.commission.pivot</field>
+        <field name="model">hr.commission</field>
+        <field name="arch" type="xml">
+            <pivot string="Commissions">
+                <field name="create_date" type="row" interval="week"/>
+                <field name="state" type="row"/>
+                <field name="employee_id" type="col"/>
+                <field name="amount" type="measure"/>
+            </pivot>
+        </field>
+    </record>
+
+    <record id="view_hr_commission_pivot_graph" model="ir.ui.view">
+        <field name="name">hr.commission.graph</field>
+        <field name="model">hr.commission</field>
+        <field name="arch" type="xml">
+            <graph string="Commissions" stacked="True">
+                <field name="create_date" type="row" interval="week"/>
+                <field name="state" type="row"/>
+                <field name="amount" type="measure"/>
+            </graph>
+        </field>
+    </record>
+
+    <record id="view_hr_commission_search" model="ir.ui.view">
+        <field name="name">hr.commission.search</field>
+        <field name="model">hr.commission</field>
+        <field name="arch" type="xml">
+            <search string="Search Commission">
+                <field name="source_move_id"/>
+                <field name="employee_id"/>
+                <field name="contract_id"/>
+                <separator/>
+                <filter string="New" name="new" domain="[('state', '=', 'draft')]"/>
+                <filter string="Confirmed" name="confirmed" domain="[('state', '=', 'done')]"/>
+                <filter string="Paid" name="paid" domain="[('state', '=', 'paid')]"/>
+                <filter string="Cancelled" name="cancelled" domain="[('state', '=', 'cancel')]"/>
+                <group expand="0" name="group_by" string="Group By">
+                    <filter name="group_state" string="Status" domain="[]" context="{'group_by': 'state'}"/>
+                    <filter name="group_employee" string="Employee" domain="[]" context="{'group_by': 'employee_id'}"/>
+                    <filter name="group_invoice" string="Invoice" domain="[]" context="{'group_by': 'source_move_id'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="action_hr_commission" model="ir.actions.act_window">
+        <field name="name">Commissions</field>
+        <field name="res_model">hr.commission</field>
+        <field name="view_mode">tree,form,pivot,graph</field>
+    </record>
+
+    <menuitem
+        action="action_hr_commission"
+        id="menu_action_account_commission_root"
+        parent="account.menu_finance_receivables"
+        sequence="5"
+        />
+
+    <menuitem
+        action="action_hr_commission"
+        id="menu_action_account_commission_form"
+        parent="menu_action_account_commission_root"
+        sequence="5"
+        />
+
+    <menuitem
+        action="action_hr_commission"
+        id="menu_action_account_commission_form"
+        parent="account.menu_finance_entries"
+        sequence="90"
+        />
+
+    <menuitem
+        action="action_hr_commission"
+        id="menu_action_account_commission_form2"
+        parent="menu_action_account_commission_form"
+        sequence="90"
+        />
+
+    <record id="action_commission_mark_paid" model="ir.actions.server">
+        <field name="name">Mark Paid</field>
+        <field name="type">ir.actions.server</field>
+        <field name="state">code</field>
+        <field name="model_id" ref="hr_commission.model_hr_commission"/>
+        <field name="binding_model_id" ref="hr_commission.model_hr_commission"/>
+        <field name="code">
+action = records.action_mark_paid()
+        </field>
+    </record>
+
+    <!-- Commission Payments -->
+    <record id="view_hr_commission_payment_form" model="ir.ui.view">
+        <field name="name">hr.commission.payment.form</field>
+        <field name="model">hr.commission.payment</field>
+        <field name="arch" type="xml">
+            <form string="Commission Payment">
+                <header/>
+                <sheet>
+                    <div class="oe_button_box" name="button_box"/>
+                    <h1><field name="name" placeholder="Commission Payment Description"/></h1>
+                    <group>
+                        <group>
+                            <field name="date"/>
+                            <field name="employee_id" readonly="1"/>
+                            <field name="commission_count"/>
+                            <field name="commission_amount"/>
+                        </group>
+                        <group>
+                            <field name="commission_ids" nolabel="1" readonly="1">
+                                <tree>
+                                    <field name="source_move_id"/>
+                                    <field name="amount"/>
+                                    <field name="move_date"/>
+                                </tree>
+                            </field>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="view_hr_commission_payment_tree" model="ir.ui.view">
+        <field name="name">hr.commission.payment.tree</field>
+        <field name="model">hr.commission.payment</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="date"/>
+                <field name="employee_id"/>
+                <field name="name"/>
+                <field name="commission_count" sum="Commission Count Total"/>
+                <field name="commission_amount" sum="Commission Amount Total"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_hr_commission_payment_search" model="ir.ui.view">
+        <field name="name">hr.commission.payment.search</field>
+        <field name="model">hr.commission.payment</field>
+        <field name="arch" type="xml">
+            <search string="Search Commission Payment">
+                <field name="employee_id"/>
+                <group expand="0" name="group_by" string="Group By">
+                    <filter name="group_employee" string="Employee" domain="[]" context="{'group_by': 'employee_id'}"/>
+                    <filter name="group_date" string="Date" domain="[]" context="{'group_by': 'date'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="action_hr_commission_payment" model="ir.actions.act_window">
+        <field name="name">Commission Payments</field>
+        <field name="res_model">hr.commission.payment</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem
+        action="action_hr_commission_payment"
+        id="menu_action_account_commission_payment_form"
+        parent="menu_action_account_commission_root"
+        sequence="10"
+        />
+
+    <menuitem
+        action="action_hr_commission_payment"
+        id="menu_action_account_commission_payment_form"
+        parent="menu_action_account_commission_form"
+        sequence="100"
+        />
+
+    <!-- Commission Structure -->
+    <record id="view_hr_commission_structure_form" model="ir.ui.view">
+        <field name="name">hr.commission.structure.form</field>
+        <field name="model">hr.commission.structure</field>
+        <field name="arch" type="xml">
+            <form string="Commission Structure" class="oe_form_nomargin">
+                <header/>
+                <sheet>
+                    <div class="oe_button_box" name="button_box"/>
+                    <div class="oe_title">
+                        <field name="name"/>
+                    </div>
+                    <group>
+                        <field name="line_ids" nolabel="1">
+                            <tree editable="bottom">
+                                <field name="structure_id" invisible="1"/>
+                                <field name="employee_id"/>
+                                <field name="rate"/>
+                            </tree>
+                        </field>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+</odoo>
diff --git a/hr_commission/views/hr_views.xml b/hr_commission/views/hr_views.xml
new file mode 100644
index 00000000..6977afa2
--- /dev/null
+++ b/hr_commission/views/hr_views.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="hr_contract_view_form_inherit" model="ir.ui.view">
+        <field name="name">hr.contract.form.inherit</field>
+        <field name="model">hr.contract</field>
+        <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//group/group" position="inside">
+                <field name="commission_rate"/>
+                <field name="admin_commission_rate"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
\ No newline at end of file
diff --git a/hr_commission/views/partner_views.xml b/hr_commission/views/partner_views.xml
new file mode 100644
index 00000000..23fcc43d
--- /dev/null
+++ b/hr_commission/views/partner_views.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="res_partner_view_form_inherit" model="ir.ui.view">
+        <field name="name">res.parter.view.form.inherit</field>
+        <field name="model">res.partner</field>
+        <field name="inherit_id" ref="base.view_partner_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='property_account_payable_id']" position="after">
+                <field name="commission_structure_id"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
\ No newline at end of file
diff --git a/hr_commission/views/res_config_settings_views.xml b/hr_commission/views/res_config_settings_views.xml
new file mode 100644
index 00000000..645c8f06
--- /dev/null
+++ b/hr_commission/views/res_config_settings_views.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.account</field>
+        <field name="model">res.config.settings</field>
+        <field name="priority" eval="50"/>
+        <field name="inherit_id" ref="account.res_config_settings_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//div[@id='invoicing_settings']" position="after">
+                <h2>Commissions</h2>
+                <div class="row mt16 o_settings_container" id="commission_settings" groups="account.group_account_user">
+                    <div class="col-xs-12 col-md-6 o_setting_box" title="These taxes are set in any new product created.">
+                        <div class="o_setting_left_pane"/>
+                        <div class="o_setting_right_pane">
+                            <span class="fa fa-lg fa-building-o" title="Values set here are company-specific." groups="base.group_multi_company"/>
+                            <div class="text-muted">
+                                Commission journal default accounts can be thought of as the 'expense' side of the commission. If a Liability account
+                                is not chosen, then the employee's home address partner's Account Payable will be used instead.
+                            </div>
+                            <div class="content-group">
+                                <div class="row mt16">
+                                    <label string="Journal" for="commission_journal_id" class="col-md-3 o_light_label"/>
+                                    <field name="commission_journal_id" domain="[('company_id', '=', company_id)]"/>
+                                </div>
+                                <div class="row">
+                                    <label string="Liability Account" for="commission_liability_id" class="col-md-3 o_light_label"/>
+                                    <field name="commission_liability_id" domain="[('company_id', '=', company_id)]"/>
+                                </div>
+                                <div class="row">
+                                    <label string="Pay Commission" for="commission_type" class="col-md-3 o_light_label"/>
+                                    <field name="commission_type"/>
+                                </div>
+                                <div class="row">
+                                    <label string="Commission Base" for="commission_amount_type" class="col-md-3 o_light_label"/>
+                                    <field name="commission_amount_type"/>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
\ No newline at end of file
diff --git a/hr_expense_change/__init__.py b/hr_expense_change/__init__.py
new file mode 100644
index 00000000..40272379
--- /dev/null
+++ b/hr_expense_change/__init__.py
@@ -0,0 +1 @@
+from . import wizard
diff --git a/hr_expense_change/__manifest__.py b/hr_expense_change/__manifest__.py
new file mode 100644
index 00000000..a7543889
--- /dev/null
+++ b/hr_expense_change/__manifest__.py
@@ -0,0 +1,30 @@
+{
+    'name': 'HR Expense Change',
+    'author': 'Hibou Corp. <hello@hibou.io>',
+    'version': '13.0.1.0.0',
+    'category': 'Employees',
+    'sequence': 95,
+    'summary': 'Technical foundation for changing expenses.',
+    'description': """
+Technical foundation for changing expenses.
+
+Creates wizard and permissions for making expense changes that can be 
+handled by other individual modules.
+
+This module implements, as examples, how to change the Date fields.
+
+Abstractly, individual 'changes' should come from specific 'fields' or capability 
+modules that handle the consequences of changing that field in whatever state the 
+the invoice is currently in.
+
+    """,
+    'website': 'https://hibou.io/',
+    'depends': [
+        'hr_expense',
+    ],
+    'data': [
+        'wizard/expense_change_views.xml',
+    ],
+    'installable': True,
+    'application': False,
+}
diff --git a/hr_expense_change/tests/__init__.py b/hr_expense_change/tests/__init__.py
new file mode 100644
index 00000000..431d3587
--- /dev/null
+++ b/hr_expense_change/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_expense_change
diff --git a/hr_expense_change/tests/test_expense_change.py b/hr_expense_change/tests/test_expense_change.py
new file mode 100644
index 00000000..79cf06a7
--- /dev/null
+++ b/hr_expense_change/tests/test_expense_change.py
@@ -0,0 +1,20 @@
+from odoo.addons.hr_expense.tests.test_expenses import TestAccountEntry
+
+
+class TestAccountEntry(TestAccountEntry):
+
+    def test_expense_change_basic(self):
+        # posts expense and gets move ready at self.expense.account_move_id.id
+        self.test_account_entry()
+        self.assertEqual(self.expense.expense_line_ids.date, self.expense.account_move_id.date)
+
+        ctx = {'active_model': 'hr.expense', 'active_ids': self.expense.expense_line_ids.ids}
+        change = self.env['hr.expense.change'].with_context(ctx).create({})
+        self.assertEqual(change.date, self.expense.expense_line_ids.date)
+
+        change_date = '2018-01-01'
+        change.write({'date': change_date})
+
+        change.affect_change()
+        self.assertEqual(change_date, self.expense.expense_line_ids.date)
+        self.assertEqual(change_date, self.expense.account_move_id.date)
diff --git a/hr_expense_change/wizard/__init__.py b/hr_expense_change/wizard/__init__.py
new file mode 100644
index 00000000..72a7c8d3
--- /dev/null
+++ b/hr_expense_change/wizard/__init__.py
@@ -0,0 +1 @@
+from . import expense_change
diff --git a/hr_expense_change/wizard/expense_change.py b/hr_expense_change/wizard/expense_change.py
new file mode 100644
index 00000000..d3250352
--- /dev/null
+++ b/hr_expense_change/wizard/expense_change.py
@@ -0,0 +1,54 @@
+from odoo import api, fields, models, _
+from odoo.exceptions import UserError
+
+
+class ExpenseChangeWizard(models.TransientModel):
+    _name = 'hr.expense.change'
+    _description = 'Expense Change'
+
+    expense_id = fields.Many2one('hr.expense', string='Expense', readonly=True, required=True)
+    expense_company_id = fields.Many2one('res.company', related='expense_id.company_id')
+    date = fields.Date(string='Expense Date')
+
+    @api.model
+    def default_get(self, fields):
+        rec = super(ExpenseChangeWizard, self).default_get(fields)
+        context = dict(self._context or {})
+        active_model = context.get('active_model')
+        active_ids = context.get('active_ids')
+
+        # Checks on context parameters
+        if not active_model or not active_ids:
+            raise UserError(
+                _("Programmation error: wizard action executed without active_model or active_ids in context."))
+        if active_model != 'hr.expense':
+            raise UserError(_(
+                "Programmation error: the expected model for this action is 'hr.expense'. The provided one is '%d'.") % active_model)
+
+        # Checks on received expense records
+        expense = self.env[active_model].browse(active_ids)
+        if len(expense) != 1:
+            raise UserError(_("Expense Change expects only one expense."))
+        rec.update({
+            'expense_id': expense.id,
+            'date': expense.date,
+        })
+        return rec
+
+    def _new_expense_vals(self):
+        vals = {}
+        if self.expense_id.date != self.date:
+            vals['date'] = self.date
+        return vals
+
+    def affect_change(self):
+        self.ensure_one()
+        vals = self._new_expense_vals()
+        old_date = self.expense_id.date
+        if vals:
+            self.expense_id.write(vals)
+        if 'date' in vals and self.expense_id.sheet_id.account_move_id:
+            self.expense_id.sheet_id.account_move_id.write({'date': vals['date']})
+            self.expense_id.sheet_id.account_move_id.line_ids\
+                .filtered(lambda l: l.date_maturity == old_date).write({'date_maturity': vals['date']})
+        return True
diff --git a/hr_expense_change/wizard/expense_change_views.xml b/hr_expense_change/wizard/expense_change_views.xml
new file mode 100644
index 00000000..95250bc6
--- /dev/null
+++ b/hr_expense_change/wizard/expense_change_views.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="hr_expense_change_form" model="ir.ui.view">
+        <field name="name">Expense Change</field>
+        <field name="model">hr.expense.change</field>
+        <field name="arch" type="xml">
+            <form string="Expense Change">
+                <group>
+                    <group name="group_left">
+                        <field name="expense_id" invisible="1"/>
+                        <field name="expense_company_id" invisible="1"/>
+                        <field name="date"/>
+                    </group>
+                    <group name="group_right"/>
+                </group>
+                <footer>
+                    <button name="affect_change" string="Change" type="object" class="btn-primary"/>
+                    <button string="Cancel" class="btn-default" special="cancel"/>
+                </footer>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_view_hr_expense_change" model="ir.actions.act_window">
+        <field name="name">Expense Change Wizard</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">hr.expense.change</field>
+        <field name="view_mode">form</field>
+        <field name="target">new</field>
+    </record>
+
+    <!-- Add Button to Existing Forms -->
+    <record id="hr_expense_view_form_inherit" model="ir.ui.view">
+        <field name="name">hr.expense.form.inherit</field>
+        <field name="model">hr.expense</field>
+        <field name="inherit_id" ref="hr_expense.hr_expense_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='state']" position="before">
+                <button name="%(action_view_hr_expense_change)d" string="Change"
+                        type="action" class="btn-secondary"
+                        attrs="{'invisible': [('state', 'in', ('draft', 'refused'))]}"
+                        context="{'default_expense_id': active_id}"
+                        groups="account.group_account_manager" />
+            </xpath>
+       </field>
+    </record>
+
+    <record id="view_hr_expense_sheet_form_inherit" model="ir.ui.view">
+        <field name="name">hr.expense.sheet.form.inherit</field>
+        <field name="model">hr.expense.sheet</field>
+        <field name="inherit_id" ref="hr_expense.view_hr_expense_sheet_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='expense_line_ids']/tree" position="inside">
+                <field name="id" invisible="1"/>
+                <button name="%(action_view_hr_expense_change)d" string="Change" icon="fa-exchange"
+                        type="action"
+                        attrs="{'invisible': [('state', 'in', ('draft', 'refused'))]}"
+                        context="{'default_expense_id': id}"
+                        groups="account.group_account_manager" />
+            </xpath>
+       </field>
+    </record>
+
+</odoo>
\ No newline at end of file
diff --git a/hr_payroll_batch_error_skip/__init__.py b/hr_payroll_batch_error_skip/__init__.py
new file mode 100755
index 00000000..40272379
--- /dev/null
+++ b/hr_payroll_batch_error_skip/__init__.py
@@ -0,0 +1 @@
+from . import wizard
diff --git a/hr_payroll_batch_error_skip/__manifest__.py b/hr_payroll_batch_error_skip/__manifest__.py
new file mode 100755
index 00000000..cd4cc810
--- /dev/null
+++ b/hr_payroll_batch_error_skip/__manifest__.py
@@ -0,0 +1,17 @@
+{
+    'name': 'Payroll Batch Work Entry Errork SKIP',
+    'description': 'This module bypasses a blocking error on payroll batch runs. '
+                   'If your business does not depend on the stock functionality '
+                   '(e.g. you use Timesheet and salary but not the stock work schedule '
+                   'calculations), this will alleviate your blocking issues.',
+    'version': '13.0.1.0.0',
+    'website': 'https://hibou.io/',
+    'author': 'Hibou Corp. <hello@hibou.io>',
+    'license': 'AGPL-3',
+    'category': 'Human Resources',
+    'data': [
+    ],
+    'depends': [
+        'hr_payroll',
+    ],
+}
diff --git a/hr_payroll_batch_error_skip/wizard/__init__.py b/hr_payroll_batch_error_skip/wizard/__init__.py
new file mode 100644
index 00000000..8d73dcf7
--- /dev/null
+++ b/hr_payroll_batch_error_skip/wizard/__init__.py
@@ -0,0 +1 @@
+from . import hr_payroll_payslips_by_employees
diff --git a/hr_payroll_batch_error_skip/wizard/hr_payroll_payslips_by_employees.py b/hr_payroll_batch_error_skip/wizard/hr_payroll_payslips_by_employees.py
new file mode 100644
index 00000000..93672ef4
--- /dev/null
+++ b/hr_payroll_batch_error_skip/wizard/hr_payroll_payslips_by_employees.py
@@ -0,0 +1,16 @@
+import logging
+from odoo import models
+from odoo.exceptions import UserError
+
+_logger = logging.getLogger(__name__)
+
+
+class HrPayslipEmployees(models.TransientModel):
+    _inherit = 'hr.payslip.employees'
+
+    def _check_undefined_slots(self, work_entries, payslip_run):
+        try:
+            super()._check_undefined_slots(work_entries, payslip_run)
+        except UserError as e:
+            _logger.info('Caught user error when checking for undefined slots: ' + str(e))
+
diff --git a/hr_payroll_commission/__init__.py b/hr_payroll_commission/__init__.py
new file mode 100644
index 00000000..09434554
--- /dev/null
+++ b/hr_payroll_commission/__init__.py
@@ -0,0 +1,3 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from . import models
diff --git a/hr_payroll_commission/__manifest__.py b/hr_payroll_commission/__manifest__.py
new file mode 100644
index 00000000..7ac30f0c
--- /dev/null
+++ b/hr_payroll_commission/__manifest__.py
@@ -0,0 +1,29 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+{
+    'name': 'Commissions in Payslips',
+    'author': 'Hibou Corp.',
+    'version': '13.0.1.0.0',
+    'license': 'OPL-1',
+    'category': 'Accounting/Commissions',
+    'sequence': 95,
+    'summary': 'Reimburse Commissions in Payslips',
+    'description': """
+Reimburse Commissions in Payslips
+    """,
+    'depends': [
+        'hr_commission',
+        'hr_payroll',
+    ],
+    'data': [
+        'views/hr_commission_views.xml',
+        'views/hr_payslip_views.xml',
+        'data/hr_payroll_commission_data.xml',
+    ],
+    'demo': [
+        'data/hr_payroll_commission_demo.xml',
+    ],
+    'installable': True,
+    'application': False,
+    'auto_install': True,
+}
diff --git a/hr_payroll_commission/data/hr_payroll_commission_data.xml b/hr_payroll_commission/data/hr_payroll_commission_data.xml
new file mode 100644
index 00000000..a666f821
--- /dev/null
+++ b/hr_payroll_commission/data/hr_payroll_commission_data.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <!-- Salary Other Input -->
+    <record id="commission_other_input" model="hr.payslip.input.type">
+        <field name="name">Commissions</field>
+        <field name="code">COMMISSION</field>
+    </record>
+
+</odoo>
diff --git a/hr_payroll_commission/data/hr_payroll_commission_demo.xml b/hr_payroll_commission/data/hr_payroll_commission_demo.xml
new file mode 100644
index 00000000..77e8ccfa
--- /dev/null
+++ b/hr_payroll_commission/data/hr_payroll_commission_demo.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="hr_salary_rule_commission" model="hr.salary.rule">
+        <field name="condition_select">python</field>
+        <field name="condition_python">
+result = inputs.COMMISSION.amount > 0.0 if inputs.COMMISSION else False
+        </field>
+        <field name="amount_select">code</field>
+        <field name="amount_python_compute">
+result = inputs.COMMISSION.amount if inputs.COMMISSION else 0
+        </field>
+        <field name="code">COMMISSION</field>
+        <field name="category_id" ref="hr_payroll.BASIC"/>
+        <field name="name">Commissions</field>
+        <field name="sequence" eval="190"/>
+        <field name="struct_id" ref="hr_payroll.structure_002"/>
+    </record>
+
+</odoo>
diff --git a/hr_payroll_commission/models/__init__.py b/hr_payroll_commission/models/__init__.py
new file mode 100644
index 00000000..ba3bcc23
--- /dev/null
+++ b/hr_payroll_commission/models/__init__.py
@@ -0,0 +1,4 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from . import hr_commission
+from . import hr_payslip
diff --git a/hr_payroll_commission/models/hr_commission.py b/hr_payroll_commission/models/hr_commission.py
new file mode 100644
index 00000000..3cd127ff
--- /dev/null
+++ b/hr_payroll_commission/models/hr_commission.py
@@ -0,0 +1,13 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo import fields, models, _
+
+
+class CommissionPayment(models.Model):
+    _inherit = 'hr.commission.payment'
+
+    pay_in_payslip = fields.Boolean(string="Reimburse In Next Payslip")
+    payslip_id = fields.Many2one('hr.payslip', string="Payslip", readonly=True)
+
+    def action_report_in_next_payslip(self):
+        self.filtered(lambda p: not p.payslip_id).write({'pay_in_payslip': True})
diff --git a/hr_payroll_commission/models/hr_payslip.py b/hr_payroll_commission/models/hr_payslip.py
new file mode 100644
index 00000000..510afdd7
--- /dev/null
+++ b/hr_payroll_commission/models/hr_payslip.py
@@ -0,0 +1,63 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo import api, fields, models, _
+
+
+class HrPayslip(models.Model):
+    _inherit = 'hr.payslip'
+
+    commission_payment_ids = fields.One2many(
+        'hr.commission.payment', 'payslip_id', string='Commissions',
+        help="Commissions to reimburse to employee.",
+        states={'draft': [('readonly', False)], 'verify': [('readonly', False)]})
+    commission_count = fields.Integer(compute='_compute_commission_count')
+
+    @api.depends('commission_payment_ids.commission_ids', 'commission_payment_ids.payslip_id')
+    def _compute_commission_count(self):
+        for payslip in self:
+            payslip.commission_count = len(payslip.mapped('commission_payment_ids.commission_ids'))
+
+    @api.onchange('input_line_ids')
+    def _onchange_input_line_ids(self):
+        commission_type = self.env.ref('hr_payroll_commission.commission_other_input', raise_if_not_found=False)
+        if not self.input_line_ids.filtered(lambda line: line.input_type_id == commission_type):
+            self.commission_payment_ids.write({'payslip_id': False})
+
+    @api.onchange('employee_id', 'struct_id', 'contract_id', 'date_from', 'date_to')
+    def _onchange_employee(self):
+        res = super()._onchange_employee()
+        if self.state == 'draft':
+            self.commission_payment_ids = self.env['hr.commission.payment'].search([
+                ('employee_id', '=', self.employee_id.id),
+                ('pay_in_payslip', '=', True),
+                ('payslip_id', '=', False)])
+            self._onchange_commission_payment_ids()
+        return res
+
+    @api.onchange('commission_payment_ids')
+    def _onchange_commission_payment_ids(self):
+        commission_type = self.env.ref('hr_payroll_commission.commission_other_input', raise_if_not_found=False)
+        if not commission_type:
+            return
+
+        total = sum(self.commission_payment_ids.mapped('commission_amount'))
+        if not total:
+            return
+
+        lines_to_keep = self.input_line_ids.filtered(lambda x: x.input_type_id != commission_type)
+        input_lines_vals = [(5, 0, 0)] + [(4, line.id, False) for line in lines_to_keep]
+        input_lines_vals.append((0, 0, {
+            'amount': total,
+            'input_type_id': commission_type.id,
+        }))
+        self.update({'input_line_ids': input_lines_vals})
+
+    def open_commissions(self):
+        self.ensure_one()
+        return {
+            'type': 'ir.actions.act_window',
+            'name': _('Reimbursed Commissions'),
+            'res_model': 'hr.commission',
+            'view_mode': 'tree,form',
+            'domain': [('id', 'in', self.mapped('commission_payment_ids.commission_ids').ids)],
+        }
diff --git a/hr_payroll_commission/static/description/icon.png b/hr_payroll_commission/static/description/icon.png
new file mode 100644
index 00000000..9ccbaed5
Binary files /dev/null and b/hr_payroll_commission/static/description/icon.png differ
diff --git a/hr_payroll_commission/tests/__init__.py b/hr_payroll_commission/tests/__init__.py
new file mode 100755
index 00000000..0ce84cbf
--- /dev/null
+++ b/hr_payroll_commission/tests/__init__.py
@@ -0,0 +1,3 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from . import test_payslip_commission
diff --git a/hr_payroll_commission/tests/test_payslip_commission.py b/hr_payroll_commission/tests/test_payslip_commission.py
new file mode 100644
index 00000000..0e1dcc17
--- /dev/null
+++ b/hr_payroll_commission/tests/test_payslip_commission.py
@@ -0,0 +1,37 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from datetime import date, timedelta
+
+from odoo.addons.hr_commission.tests import test_commission
+
+
+class TestCommissionPayslip(test_commission.TestCommission):
+
+    def test_commission(self):
+        super().test_commission()
+        commission_type = self.env.ref('hr_payroll_commission.commission_other_input')
+        payslip = self.env['hr.payslip'].create({
+            'name': 'test slip',
+            'employee_id': self.employee.id,
+            'date_from': date.today() - timedelta(days=1),
+            'date_to': date.today() + timedelta(days=14),
+        })
+        payslip._onchange_employee()
+        self.assertFalse(payslip.commission_payment_ids)
+
+        # find unpaid commission payments from super().test_commission()
+        commission_payments = self.env['hr.commission.payment'].search([
+            ('employee_id', '=', self.employee.id),
+        ])
+        self.assertTrue(commission_payments)
+
+        # press the button to pay it via payroll
+        commission_payments.action_report_in_next_payslip()
+
+        payslip._onchange_employee()
+        # has attached commission payments
+        self.assertTrue(payslip.commission_payment_ids)
+        commission_input_lines = payslip.input_line_ids.filtered(lambda l: l.input_type_id == commission_type)
+        self.assertTrue(commission_input_lines)
+        self.assertEqual(sum(commission_input_lines.mapped('amount')),
+                         sum(commission_payments.mapped('commission_amount')))
diff --git a/hr_payroll_commission/views/hr_commission_views.xml b/hr_payroll_commission/views/hr_commission_views.xml
new file mode 100644
index 00000000..cbc1cb27
--- /dev/null
+++ b/hr_payroll_commission/views/hr_commission_views.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="view_hr_commission_payment_form_inherit" model="ir.ui.view">
+        <field name="name">hr.expense.sheet.view.form.payroll</field>
+        <field name="model">hr.commission.payment</field>
+        <field name="inherit_id" ref="hr_commission.view_hr_commission_payment_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='employee_id']" position="after">
+                <field name="pay_in_payslip" attrs="{'invisible': ['|', ('pay_in_payslip', '=', False), ('payslip_id', '!=', False)]}"/>
+                <field name="payslip_id" attrs="{'invisible':[('payslip_id','=',False)]}"/>
+            </xpath>
+            <xpath expr="//form/header" position="inside">
+                <button name="action_report_in_next_payslip" type="object"
+                        string="Report in Next Payslip"
+                        groups="account.group_account_manager"
+                        attrs="{'invisible': ['|', ('pay_in_payslip', '=', True), ('payslip_id', '!=', False)]}"
+                        class="oe_highlight"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/hr_payroll_commission/views/hr_payslip_views.xml b/hr_payroll_commission/views/hr_payslip_views.xml
new file mode 100644
index 00000000..aa3717fb
--- /dev/null
+++ b/hr_payroll_commission/views/hr_payslip_views.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="hr_payslip_view_form_inherit" model="ir.ui.view">
+        <field name="name">hr.payslip.view.form.inherit</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="//div[@name='button_box']" position="inside">
+                <button class="oe_stat_button" name="open_commissions" type="object" icon="fa-dollar" attrs="{'invisible': [('commission_count', '=', 0)]}">
+                    <field string="Commissions" name="commission_count" widget="statinfo"/>
+                </button>
+            </xpath>
+            <xpath expr="//field[@name='number']" position="after">
+                <field name="commission_payment_ids" invisible="1"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/hr_payroll_gamification/__init__.py b/hr_payroll_gamification/__init__.py
new file mode 100644
index 00000000..0650744f
--- /dev/null
+++ b/hr_payroll_gamification/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/hr_payroll_gamification/__manifest__.py b/hr_payroll_gamification/__manifest__.py
new file mode 100755
index 00000000..19f976d5
--- /dev/null
+++ b/hr_payroll_gamification/__manifest__.py
@@ -0,0 +1,20 @@
+{
+    'name': 'Payroll Gamification',
+    'description': 'Payroll Gamification',
+    'version': '13.0.1.0.1',
+    'website': 'https://hibou.io/',
+    'author': 'Hibou Corp. <hello@hibou.io>',
+    'license': 'AGPL-3',
+    'category': 'Human Resources',
+    'data': [
+        'data/payroll_data.xml',
+        'views/gamification_views.xml',
+    ],
+    'demo': [
+        'data/payroll_demo.xml',
+    ],
+    'depends': [
+        'hr_gamification',
+        'hr_payroll',
+    ],
+}
diff --git a/hr_payroll_gamification/data/payroll_data.xml b/hr_payroll_gamification/data/payroll_data.xml
new file mode 100644
index 00000000..f4ac1ed8
--- /dev/null
+++ b/hr_payroll_gamification/data/payroll_data.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <!-- Salary Other Input -->
+    <record id="badge_other_input" model="hr.payslip.input.type">
+        <field name="name">Badges</field>
+        <field name="code">BADGES</field>
+    </record>
+
+</odoo>
\ No newline at end of file
diff --git a/hr_payroll_gamification/data/payroll_demo.xml b/hr_payroll_gamification/data/payroll_demo.xml
new file mode 100644
index 00000000..f5e955a2
--- /dev/null
+++ b/hr_payroll_gamification/data/payroll_demo.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="hr_salary_rule_gamification" model="hr.salary.rule">
+        <field name="condition_select">python</field>
+        <field name="condition_python">result = inputs.BADGES.amount > 0.0 if inputs.BADGES else False</field>
+        <field name="amount_select">code</field>
+        <field name="amount_python_compute">result = inputs.BADGES.amount if inputs.BADGES else 0</field>
+        <field name="code">BADGES</field>
+        <field name="category_id" ref="hr_payroll.BASIC"/>
+        <field name="name">Badges</field>
+        <field name="sequence" eval="90"/>
+        <field name="struct_id" ref="hr_payroll.structure_002"/>
+    </record>
+
+</odoo>
diff --git a/hr_payroll_gamification/models/__init__.py b/hr_payroll_gamification/models/__init__.py
new file mode 100644
index 00000000..4ce66a41
--- /dev/null
+++ b/hr_payroll_gamification/models/__init__.py
@@ -0,0 +1,2 @@
+from . import gamification
+from . import payroll
diff --git a/hr_payroll_gamification/models/gamification.py b/hr_payroll_gamification/models/gamification.py
new file mode 100644
index 00000000..ac1538b7
--- /dev/null
+++ b/hr_payroll_gamification/models/gamification.py
@@ -0,0 +1,12 @@
+from odoo import api, fields, models
+
+
+class GamificationBadge(models.Model):
+    _inherit = 'gamification.badge'
+
+    payroll_type = fields.Selection([
+        ('', 'None'),
+        ('fixed', 'Fixed'),
+        ('period', 'Granted in Pay Period'),
+    ], string='Payroll Type')
+    payroll_amount = fields.Float(string='Payroll Amount', digits=(10, 4))
diff --git a/hr_payroll_gamification/models/payroll.py b/hr_payroll_gamification/models/payroll.py
new file mode 100644
index 00000000..567f9652
--- /dev/null
+++ b/hr_payroll_gamification/models/payroll.py
@@ -0,0 +1,40 @@
+from odoo import api, fields, models
+
+
+class Payslip(models.Model):
+    _inherit = 'hr.payslip'
+
+    @api.onchange('employee_id', 'struct_id', 'contract_id', 'date_from', 'date_to')
+    def _onchange_employee(self):
+        res = super()._onchange_employee()
+        if self.state == 'draft':
+            self._input_badges()
+        return res
+
+    def _input_badges(self):
+        badge_type = self.env.ref('hr_payroll_gamification.badge_other_input', raise_if_not_found=False)
+        if not badge_type:
+            return
+
+        amount = self._get_input_badges()
+        if not amount:
+            return
+
+        lines_to_keep = self.input_line_ids.filtered(lambda x: x.input_type_id != badge_type)
+        input_lines_vals = [(5, 0, 0)] + [(4, line.id, False) for line in lines_to_keep]
+        input_lines_vals.append((0, 0, {
+            'amount': amount,
+            'input_type_id': badge_type,
+        }))
+        self.update({'input_line_ids': input_lines_vals})
+
+    def _get_input_badges(self):
+        amount = 0.0
+        for bu in self.employee_id.badge_ids.filtered(lambda bu: bu.badge_id.payroll_type == 'fixed'):
+            amount += bu.badge_id.payroll_amount
+        for bu in self.employee_id.badge_ids.filtered(lambda bu: (
+                bu.badge_id.payroll_type == 'period'
+                and self.date_from <= bu.create_date.date() <= self.date_to
+        )):
+            amount += bu.badge_id.payroll_amount
+        return amount
diff --git a/hr_payroll_gamification/tests/__init__.py b/hr_payroll_gamification/tests/__init__.py
new file mode 100755
index 00000000..ce4bbfce
--- /dev/null
+++ b/hr_payroll_gamification/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_payroll_badge
diff --git a/hr_payroll_gamification/tests/test_payroll_badge.py b/hr_payroll_gamification/tests/test_payroll_badge.py
new file mode 100644
index 00000000..ae996fb0
--- /dev/null
+++ b/hr_payroll_gamification/tests/test_payroll_badge.py
@@ -0,0 +1,122 @@
+from odoo.tests import common
+from odoo import fields
+from datetime import date
+
+
+class TestPayroll(common.TransactionCase):
+
+    def setUp(self):
+        super(TestPayroll, self).setUp()
+        self.wage = 21.50
+        self.employee = self.env['hr.employee'].create({
+            'birthday': '1985-03-14',
+            'country_id': self.ref('base.us'),
+            'department_id': self.ref('hr.dep_rd'),
+            'gender': 'male',
+            'name': 'Jared',
+            'user_id': self.env.user.id,
+        })
+        self.contract = self.env['hr.contract'].create({
+            'name': 'test',
+            'employee_id': self.employee.id,
+            'type_id': self.ref('hr_contract.hr_contract_type_emp'),
+            'struct_id': self.ref('hr_payroll.structure_base'),
+            'resource_calendar_id': self.ref('resource.resource_calendar_std'),
+            'wage': self.wage,
+            'date_start': '2018-01-01',
+            'state': 'open',
+            'schedule_pay': 'monthly',
+        })
+
+    def test_badge_amounts(self):
+        badge = self.env['gamification.badge'].create({
+            'name': 'test',
+        })
+        badge.payroll_amount = 5.0
+
+    def test_badge_payroll(self):
+        additional_wage = 5.0
+        additional_wage_period = 15.0
+        payslip = self.env['hr.payslip'].create({
+            'employee_id': self.employee.id,
+            'contract_id': self.contract.id,
+            'date_from': '2018-01-01',
+            'date_to': '2018-01-31',
+        })
+        self.assertEqual(payslip._get_input_badges(self.contract, date(2018, 1, 1), date(2018, 1, 31)), 0.0)
+        payslip.compute_sheet()
+        basic = payslip.details_by_salary_rule_category.filtered(lambda l: l.code == 'GROSS')
+        self.assertTrue(basic)
+        self.assertEqual(basic.total, self.wage)
+
+        badge = self.env['gamification.badge'].create({
+            'name': 'test',
+            'payroll_type': 'fixed',
+            'payroll_amount': additional_wage,
+        })
+
+        badge_user = self.env['gamification.badge.user'].create({
+            'badge_id': badge.id,
+            'employee_id': self.employee.id,
+            'user_id': self.env.user.id,
+        })
+
+        badge_period = self.env['gamification.badge'].create({
+            'name': 'test period',
+            'payroll_type': 'period',
+            'payroll_amount': additional_wage_period,
+        })
+
+        # Need a specific 'create_date' to test.
+        badge_user_period = self.env['gamification.badge.user'].create({
+            'badge_id': badge_period.id,
+            'employee_id': self.employee.id,
+            'user_id': self.env.user.id,
+        })
+        self.env.cr.execute('update gamification_badge_user set create_date = \'2018-02-10\' where id = %d;' % (badge_user_period.id, ))
+        badge_user_period = self.env['gamification.badge.user'].browse(badge_user_period.id)
+
+        self.assertEqual(self.employee.badge_ids, badge_user + badge_user_period)
+
+        # Includes only one badge
+        payslip = self.env['hr.payslip'].create({
+            'employee_id': self.employee.id,
+            'date_from': '2018-01-01',
+            'date_to': '2018-01-31',
+        })
+        # This is crazy, but...
+        res = payslip.onchange_employee_id(date(2018, 1, 1), date(2018, 1, 31), employee_id=self.employee.id, contract_id=self.contract.id)
+        del res['value']['line_ids']
+        res['value']['input_line_ids'] = [(0, 0, l) for l in res['value']['input_line_ids']]
+        res['value']['worked_days_line_ids'] = [(0, 0, l) for l in res['value']['worked_days_line_ids']]
+        payslip.write(res['value'])
+        self.assertTrue(payslip.input_line_ids)
+        payslip.compute_sheet()
+
+        self.assertEqual(payslip._get_input_badges(self.contract, date(2018, 1, 1), date(2018, 1, 31)), additional_wage)
+
+        basic = payslip.details_by_salary_rule_category.filtered(lambda l: l.code == 'GROSS')
+        self.assertTrue(basic)
+        self.assertEqual(basic.total, self.wage + additional_wage)
+
+        # Include both Badges
+        payslip = self.env['hr.payslip'].create({
+            'employee_id': self.employee.id,
+            'date_from': '2018-02-01',
+            'date_to': '2018-02-25',  # Feb...
+        })
+        # This is crazy, but...
+        res = payslip.onchange_employee_id(date(2018, 2, 1), date(2018, 2, 25), employee_id=self.employee.id,
+                                           contract_id=self.contract.id)
+        del res['value']['line_ids']
+        res['value']['input_line_ids'] = [(0, 0, l) for l in res['value']['input_line_ids']]
+        res['value']['worked_days_line_ids'] = [(0, 0, l) for l in res['value']['worked_days_line_ids']]
+        payslip.write(res['value'])
+        self.assertTrue(payslip.input_line_ids)
+        payslip.compute_sheet()
+
+        self.assertEqual(payslip._get_input_badges(self.contract, date(2018, 2, 1), date(2018, 2, 25)), additional_wage + additional_wage_period)
+
+        basic = payslip.details_by_salary_rule_category.filtered(lambda l: l.code == 'GROSS')
+        self.assertTrue(basic)
+        self.assertEqual(basic.total, self.wage + additional_wage + additional_wage_period)
diff --git a/hr_payroll_gamification/views/gamification_views.xml b/hr_payroll_gamification/views/gamification_views.xml
new file mode 100644
index 00000000..17fe63a8
--- /dev/null
+++ b/hr_payroll_gamification/views/gamification_views.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="badge_form_view_inherit" model="ir.ui.view">
+        <field name="name">gamification.badge.form.inherit</field>
+        <field name="model">gamification.badge</field>
+        <field name="priority">20</field>
+        <field name="inherit_id" ref="gamification.badge_form_view"/>
+        <field name="arch" type="xml">
+            <xpath expr="//sheet" position="inside">
+                <group string="Payroll">
+                    <group>
+                        <field name="payroll_type"/>
+                        <field name="payroll_amount" attrs="{'invisible': [('payroll_type', '=', False)]}"/>
+                    </group>
+                </group>
+            </xpath>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/hr_payroll_overtime/__init__.py b/hr_payroll_overtime/__init__.py
new file mode 100644
index 00000000..0650744f
--- /dev/null
+++ b/hr_payroll_overtime/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/hr_payroll_overtime/__manifest__.py b/hr_payroll_overtime/__manifest__.py
new file mode 100644
index 00000000..99e48601
--- /dev/null
+++ b/hr_payroll_overtime/__manifest__.py
@@ -0,0 +1,19 @@
+{
+    'name': 'Payroll Overtime',
+    'description': 'Provide mechanisms to calculate overtime.',
+    'version': '13.0.1.0.1',
+    'website': 'https://hibou.io/',
+    'author': 'Hibou Corp. <hello@hibou.io>',
+    'license': 'AGPL-3',
+    'category': 'Human Resources',
+    'data': [
+        'security/ir.model.access.csv',
+        'data/overtime_data.xml',
+        'views/hr_work_entry_views.xml',
+        'views/resource_calendar_views.xml',
+    ],
+    'depends': [
+        'hr_payroll',
+        'hr_work_entry',
+    ],
+}
diff --git a/hr_payroll_overtime/data/overtime_data.xml b/hr_payroll_overtime/data/overtime_data.xml
new file mode 100644
index 00000000..9316f1ab
--- /dev/null
+++ b/hr_payroll_overtime/data/overtime_data.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <data noupdate="1">
+        <record id="work_entry_overtime_type" model="hr.work.entry.overtime.type">
+            <field name="name">Default Rules</field>
+            <field name="hours_per_week">40.0</field>
+            <field name="multiplier">1.5</field>
+        </record>
+    </data>
+
+</odoo>
\ No newline at end of file
diff --git a/hr_payroll_overtime/models/__init__.py b/hr_payroll_overtime/models/__init__.py
new file mode 100644
index 00000000..3fcc81d4
--- /dev/null
+++ b/hr_payroll_overtime/models/__init__.py
@@ -0,0 +1,3 @@
+from . import hr_payslip
+from . import hr_work_entry
+from . import resource_calendar
diff --git a/hr_payroll_overtime/models/hr_payslip.py b/hr_payroll_overtime/models/hr_payslip.py
new file mode 100644
index 00000000..4e482bf9
--- /dev/null
+++ b/hr_payroll_overtime/models/hr_payslip.py
@@ -0,0 +1,96 @@
+from collections import defaultdict
+from odoo import models
+from odoo.exceptions import UserError
+
+
+class HRPayslip(models.Model):
+    _inherit = 'hr.payslip'
+
+    def aggregate_overtime(self, work_data, day_week_start=None):
+        """
+
+        :param work_data: list(tuple(iso_date, list(tuple(hr.work.entry.type(), hours, original_record))
+        :param day_week_start: day of the week to start (otherwise employee's resource calendar start day of week)
+        :return: dict(hr.work.entry.type(): list(days_worked, hours_worked, ))
+        """
+        if not day_week_start:
+            if self.employee_id.resource_calendar_id.day_week_start:
+                day_week_start = self.employee_id.resource_calendar_id.day_week_start
+            else:
+                day_week_start = '1'
+        day_week_start = int(day_week_start)
+        if day_week_start < 1 or day_week_start > 7:
+            day_week_start = 1
+
+        def _adjust_week(isodate):
+            if isodate[2] < day_week_start:
+                return (isodate[0], isodate[1] + 1, isodate[2])
+            return isodate
+
+        result = defaultdict(lambda: [0.0, 0.0, 1.0])
+        day_hours = defaultdict(float)
+        week_hours = defaultdict(float)
+        iso_days = set()
+        try:
+            for iso_date, entries in work_data:
+                iso_date = _adjust_week(iso_date)
+                for work_type, hours, _ in entries:
+                    self._aggregate_overtime_add_work_type_hours(work_type, hours, iso_date, result, iso_days, day_hours, week_hours)
+        except RecursionError:
+            raise UserError('RecursionError raised.  Ensure you have not overtime loops, you should have an '
+                            'end work type that does not have any "overtime" version, and would be considered '
+                            'the "highest overtime" work type and rate.')
+
+        return result
+
+    def _aggregate_overtime_add_work_type_hours(self, work_type, hours, iso_date, working_aggregation, iso_days, day_hours, week_hours):
+        """
+        :param work_type: work type of hours being added
+        :param hours: hours being added
+        :param iso_date: date hours were worked
+        :param working_aggregation: dict of work type hours as they are processed
+        :param iso_days: set of iso days already seen
+        :param day_hours: hours worked on iso dates already processed
+        :param week_hours: hours worked on iso week already processed
+        :return:
+        """
+        week = iso_date[1]
+        if work_type.overtime_work_type_id and work_type.overtime_type_id:
+            ot_h_w = work_type.overtime_type_id.hours_per_week
+            ot_h_d = work_type.overtime_type_id.hours_per_day
+
+            regular_hours = hours
+            # adjust the hours based on overtime conditions
+            if ot_h_d and (day_hours[iso_date] + hours) > ot_h_d:
+                # daily overtime in effect
+                remaining_hours = max(ot_h_d - day_hours[iso_date], 0.0)
+                regular_hours = min(remaining_hours, hours)
+            elif ot_h_w:
+                # not daily, but weekly limits....
+                remaining_hours = max(ot_h_w - week_hours[week], 0.0)
+                regular_hours = min(remaining_hours, hours)
+            ot_hours = hours - regular_hours
+            if regular_hours:
+                if iso_date not in iso_days:
+                    iso_days.add(iso_date)
+                    working_aggregation[work_type][0] += 1.0
+                working_aggregation[work_type][1] += regular_hours
+                day_hours[iso_date] += regular_hours
+                week_hours[week] += regular_hours
+            if ot_hours:
+                # we need to save this because it won't be set once it reenter, we won't know what the original
+                # overtime multiplier was
+                working_aggregation[work_type.overtime_work_type_id][2] = work_type.overtime_type_id.multiplier
+                if work_type == work_type.overtime_work_type_id:
+                    # trivial infinite recursion
+                    raise UserError('Work type %s (id %s) must not have itself as its next overtime type.' % (work_type.name, work_type.id))
+                self._aggregate_overtime_add_work_type_hours(work_type.overtime_work_type_id, ot_hours, iso_date,
+                                                             working_aggregation, iso_days, day_hours, week_hours)
+        else:
+            # No overtime, just needs added to set
+            if iso_date not in iso_days:
+                iso_days.add(iso_date)
+                working_aggregation[work_type][0] += 1.0
+            working_aggregation[work_type][1] += hours
+            day_hours[iso_date] += hours
+            week_hours[week] += hours
diff --git a/hr_payroll_overtime/models/hr_work_entry.py b/hr_payroll_overtime/models/hr_work_entry.py
new file mode 100644
index 00000000..bef38a6c
--- /dev/null
+++ b/hr_payroll_overtime/models/hr_work_entry.py
@@ -0,0 +1,21 @@
+from odoo import fields, models
+
+
+class HRWorkEntryType(models.Model):
+    _inherit = 'hr.work.entry.type'
+
+    overtime_work_type_id = fields.Many2one('hr.work.entry.type', string='Overtime Work Type')
+    overtime_type_id = fields.Many2one('hr.work.entry.overtime.type', string='Overtime Rules')
+
+
+class HRWorkEntryOvertime(models.Model):
+    _name = 'hr.work.entry.overtime.type'
+    _description = 'Overtime Rules'
+
+    name = fields.Char(string='Name')
+    hours_per_day = fields.Float(string='Hours/Day',
+                                 help='Number of hours worked in a single day to trigger overtime.')
+    hours_per_week = fields.Float(string='Hours/Week',
+                                  help='Number of hours worked in a week to trigger overtime.')
+    multiplier = fields.Float(string='Multiplier',
+                              help='Rate for when overtime is reached.')
diff --git a/hr_payroll_overtime/models/resource_calendar.py b/hr_payroll_overtime/models/resource_calendar.py
new file mode 100644
index 00000000..f1010164
--- /dev/null
+++ b/hr_payroll_overtime/models/resource_calendar.py
@@ -0,0 +1,15 @@
+from odoo import fields, models
+
+
+class ResourceCalendar(models.Model):
+    _inherit = 'resource.calendar'
+
+    day_week_start = fields.Selection([
+        ('1', 'Monday'),
+        ('2', 'Tuesday'),
+        ('3', 'Wednesday'),
+        ('4', 'Thursday'),
+        ('5', 'Friday'),
+        ('6', 'Saturday'),
+        ('7', 'Sunday'),
+    ], string='Day Week Starts', required=True, default='1')
diff --git a/hr_payroll_overtime/security/ir.model.access.csv b/hr_payroll_overtime/security/ir.model.access.csv
new file mode 100644
index 00000000..722691ff
--- /dev/null
+++ b/hr_payroll_overtime/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_work_entry_overtime_type,access_hr_work_entry_overtime_type,model_hr_work_entry_overtime_type,base.group_user,1,0,0,0
+manage_hr_work_entry_overtime_type,manage_hr_work_entry_overtime_type,model_hr_work_entry_overtime_type,hr_payroll.group_hr_payroll_manager,1,1,1,1
diff --git a/hr_payroll_overtime/tests/__init__.py b/hr_payroll_overtime/tests/__init__.py
new file mode 100644
index 00000000..304ffd07
--- /dev/null
+++ b/hr_payroll_overtime/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_overtime
diff --git a/hr_payroll_overtime/tests/test_overtime.py b/hr_payroll_overtime/tests/test_overtime.py
new file mode 100644
index 00000000..6c5cf9c3
--- /dev/null
+++ b/hr_payroll_overtime/tests/test_overtime.py
@@ -0,0 +1,362 @@
+from odoo.tests import common
+from odoo.exceptions import UserError
+
+
+class TestOvertime(common.TransactionCase):
+
+    def setUp(self):
+        super().setUp()
+        self.overtime_rules = self.env['hr.work.entry.overtime.type'].create({
+            'name': 'Test',
+            'hours_per_week': 40.0,
+            'multiplier': 1.5,
+        })
+        self.work_type_overtime = self.env['hr.work.entry.type'].create({
+            'name': 'Test Overtime',
+            'code': 'TEST_OT'
+        })
+        self.work_type = self.env['hr.work.entry.type'].create({
+            'name': 'Test',
+            'code': 'TEST',
+            'overtime_type_id': self.overtime_rules.id,
+            'overtime_work_type_id': self.work_type_overtime.id,
+        })
+        self.employee = self.env.ref('hr.employee_hne')
+        self.payslip = self.env['hr.payslip'].create({
+            'name': 'test slip',
+            'employee_id': self.employee.id,
+            'date_from': '2020-06-11',
+            'date_to': '2020-06-15',
+        })
+
+    def test_02_overtime_aggregation(self):
+        # 38 hours in 1 week
+        work_data = [
+            ((2020, 24, 1), [
+                (self.work_type, 4.0, None),
+                (self.work_type, 4.0, None),
+            ]),
+            ((2020, 24, 2), [
+                (self.work_type, 4.0, None),
+                (self.work_type, 6.0, None),
+            ]),
+            ((2020, 24, 3), [
+                (self.work_type, 4.0, None),
+                (self.work_type, 6.0, None),
+            ]),
+            ((2020, 24, 4), [
+                (self.work_type, 4.0, None),
+                (self.work_type, 6.0, None),
+            ]),
+        ]
+        result_data = self.payslip.aggregate_overtime(work_data)
+        self.assertTrue(self.work_type in result_data)
+        self.assertTrue(self.work_type_overtime not in result_data)
+        self.assertEqual(result_data[self.work_type][0], 4)
+        self.assertEqual(result_data[self.work_type][1], 38.0)
+
+        # 48 hours in 1 week
+        work_data += [
+            ((2020, 24, 5), [
+                (self.work_type, 10.0, None),
+            ]),
+        ]
+        result_data = self.payslip.aggregate_overtime(work_data)
+        self.assertTrue(self.work_type in result_data)
+        self.assertEqual(result_data[self.work_type][0], 5)
+        self.assertEqual(result_data[self.work_type][1], 40.0)
+        self.assertTrue(self.work_type_overtime in result_data)
+        self.assertEqual(result_data[self.work_type_overtime][0], 0)
+        self.assertEqual(result_data[self.work_type_overtime][1], 8.0)
+
+        # 52 hours in 1 week
+        work_data += [
+            ((2020, 24, 6), [
+                (self.work_type, 4.0, None),
+            ]),
+        ]
+        result_data = self.payslip.aggregate_overtime(work_data)
+        self.assertTrue(self.work_type in result_data)
+        self.assertEqual(result_data[self.work_type][0], 5)
+        self.assertEqual(result_data[self.work_type][1], 40.0)
+        self.assertTrue(self.work_type_overtime in result_data)
+        self.assertEqual(result_data[self.work_type_overtime][0], 1)
+        self.assertEqual(result_data[self.work_type_overtime][1], 12.0)
+
+        # reset and make two weeks
+        # 38 hours in 1 week x 2
+        input_work_data = [
+            ((2020, 24, 1), [
+                (self.work_type, 4.0, None),
+                (self.work_type, 4.0, None),
+            ]),
+            ((2020, 24, 2), [
+                (self.work_type, 4.0, None),
+                (self.work_type, 6.0, None),
+            ]),
+            ((2020, 24, 3), [
+                (self.work_type, 4.0, None),
+                (self.work_type, 6.0, None),
+            ]),
+            ((2020, 24, 4), [
+                (self.work_type, 4.0, None),
+                (self.work_type, 6.0, None),
+            ]),
+        ]
+        work_data = []
+        for data in input_work_data:
+            work_data.append(data)
+            work_data.append(((data[0][0], data[0][1]+1, data[0][2]), data[1]))
+
+        result_data = self.payslip.aggregate_overtime(work_data)
+        self.assertTrue(self.work_type in result_data)
+        self.assertTrue(self.work_type_overtime not in result_data)
+        self.assertEqual(result_data[self.work_type][0], 8)
+        self.assertEqual(result_data[self.work_type][1], 76.0)
+
+        # 48 hours in 1 week, 38 hours in 1 week
+        work_data += [
+            ((2020, 24, 5), [
+                (self.work_type, 4.0, None),
+                (self.work_type, 6.0, None),
+            ]),
+        ]
+        result_data = self.payslip.aggregate_overtime(work_data)
+        self.assertTrue(self.work_type in result_data)
+        self.assertEqual(result_data[self.work_type][0], 9)
+        self.assertEqual(result_data[self.work_type][1], 78.0)
+        self.assertTrue(self.work_type_overtime in result_data)
+        self.assertEqual(result_data[self.work_type_overtime][0], 0)
+        self.assertEqual(result_data[self.work_type_overtime][1], 8.0)
+
+        # 52 hours in 1 week, 38 hours in 1 week
+        work_data += [
+            ((2020, 24, 6), [
+                (self.work_type, 4.0, None),
+            ]),
+        ]
+        result_data = self.payslip.aggregate_overtime(work_data)
+        self.assertTrue(self.work_type in result_data)
+        self.assertEqual(result_data[self.work_type][0], 9)
+        self.assertEqual(result_data[self.work_type][1], 78.0)
+        self.assertTrue(self.work_type_overtime in result_data)
+        self.assertEqual(result_data[self.work_type_overtime][0], 1)
+        self.assertEqual(result_data[self.work_type_overtime][1], 12.0)
+
+    def test_03_overtime_aggregation_week_start(self):
+        self.employee.resource_calendar_id.day_week_start = '7'
+        self.test_02_overtime_aggregation()
+
+    def test_10_overtime_aggregation_daily(self):
+        self.overtime_rules.hours_per_day = 8.0
+        self.overtime_rules.multiplier_per_day = 1.5
+        # 38 hours in 1 week
+        work_data = [
+            ((2020, 24, 1), [
+                (self.work_type, 4.0, None),
+                (self.work_type, 4.0, None),
+            ]),
+            ((2020, 24, 2), [
+                (self.work_type, 4.0, None),
+                (self.work_type, 6.0, None),
+            ]),
+            ((2020, 24, 3), [
+                (self.work_type, 4.0, None),
+                (self.work_type, 6.0, None),
+            ]),
+            ((2020, 24, 4), [
+                (self.work_type, 4.0, None),
+                (self.work_type, 6.0, None),
+            ]),
+        ]
+        result_data = self.payslip.aggregate_overtime(work_data)
+        self.assertTrue(self.work_type in result_data)
+        self.assertEqual(result_data[self.work_type][0], 4)
+        self.assertEqual(result_data[self.work_type][1], 32.0)
+        self.assertTrue(self.work_type_overtime in result_data)
+        self.assertEqual(result_data[self.work_type_overtime][0], 0)
+        self.assertEqual(result_data[self.work_type_overtime][1], 6.0)
+
+        # 48 hours in 1 week
+        work_data += [
+            ((2020, 24, 5), [
+                (self.work_type, 10.0, None),
+            ]),
+        ]
+        result_data = self.payslip.aggregate_overtime(work_data)
+        self.assertTrue(self.work_type in result_data)
+        self.assertEqual(result_data[self.work_type][0], 5)
+        self.assertEqual(result_data[self.work_type][1], 40.0)
+        self.assertTrue(self.work_type_overtime in result_data)
+        self.assertEqual(result_data[self.work_type_overtime][0], 0)
+        self.assertEqual(result_data[self.work_type_overtime][1], 8.0)
+
+        # 52 hours in 1 week
+        work_data += [
+            ((2020, 24, 6), [
+                (self.work_type, 4.0, None),
+            ]),
+        ]
+        result_data = self.payslip.aggregate_overtime(work_data)
+        self.assertTrue(self.work_type in result_data)
+        self.assertEqual(result_data[self.work_type][0], 5)
+        self.assertEqual(result_data[self.work_type][1], 40.0)
+        self.assertTrue(self.work_type_overtime in result_data)
+        self.assertEqual(result_data[self.work_type_overtime][0], 1)
+        self.assertEqual(result_data[self.work_type_overtime][1], 12.0)
+
+        # reset and make two weeks
+        # 38 hours in 1 week x 2
+        input_work_data = [
+            ((2020, 24, 1), [
+                (self.work_type, 4.0, None),
+                (self.work_type, 4.0, None),
+            ]),
+            ((2020, 24, 2), [
+                (self.work_type, 4.0, None),
+                (self.work_type, 6.0, None),
+            ]),
+            ((2020, 24, 3), [
+                (self.work_type, 4.0, None),
+                (self.work_type, 6.0, None),
+            ]),
+            ((2020, 24, 4), [
+                (self.work_type, 4.0, None),
+                (self.work_type, 6.0, None),
+            ]),
+        ]
+        work_data = []
+        for data in input_work_data:
+            work_data.append(data)
+            work_data.append(((data[0][0], data[0][1]+1, data[0][2]), data[1]))
+
+        result_data = self.payslip.aggregate_overtime(work_data)
+        self.assertTrue(self.work_type in result_data)
+        self.assertTrue(self.work_type_overtime in result_data)
+        self.assertEqual(result_data[self.work_type][0], 8)
+        self.assertEqual(result_data[self.work_type][1], 64.0)
+        self.assertEqual(result_data[self.work_type_overtime][0], 0)
+        self.assertEqual(result_data[self.work_type_overtime][1], 12.0)
+
+        # 48 hours in 1 week, 38 hours in 1 week
+        work_data += [
+            ((2020, 24, 5), [
+                (self.work_type, 4.0, None),
+                (self.work_type, 6.0, None),
+            ]),
+        ]
+        result_data = self.payslip.aggregate_overtime(work_data)
+        self.assertTrue(self.work_type in result_data)
+        self.assertEqual(result_data[self.work_type][0], 9)
+        self.assertEqual(result_data[self.work_type][1], 70.0)
+        self.assertTrue(self.work_type_overtime in result_data)
+        self.assertEqual(result_data[self.work_type_overtime][0], 0)
+        self.assertEqual(result_data[self.work_type_overtime][1], 16.0)
+
+        # 52 hours in 1 week, 38 hours in 1 week
+        work_data += [
+            ((2020, 24, 6), [
+                (self.work_type, 4.0, None),
+            ]),
+        ]
+        result_data = self.payslip.aggregate_overtime(work_data)
+        self.assertTrue(self.work_type in result_data)
+        self.assertEqual(result_data[self.work_type][0], 9)
+        self.assertEqual(result_data[self.work_type][1], 70.0)
+        self.assertTrue(self.work_type_overtime in result_data)
+        self.assertEqual(result_data[self.work_type_overtime][0], 1)
+        self.assertEqual(result_data[self.work_type_overtime][1], 20.0)
+
+    def test_11_overtime_aggregation_daily_week_start(self):
+        self.employee.resource_calendar_id.day_week_start = '7'
+        self.test_10_overtime_aggregation_daily()
+
+    def test_12_recursive_daily(self):
+        # recursive will use a second overtime
+        self.work_type_overtime2 = self.env['hr.work.entry.type'].create({
+            'name': 'Test Overtime 2',
+            'code': 'TEST_OT2'
+        })
+        self.overtime_rules2 = self.env['hr.work.entry.overtime.type'].create({
+            'name': 'Test2',
+            'hours_per_week': 999.0,
+            'hours_per_day': 12.0,
+            'multiplier': 2.0,
+        })
+        self.overtime_rules.hours_per_day = 8.0
+        self.overtime_rules.multiplier_per_day = 1.5
+        self.work_type_overtime.overtime_type_id = self.overtime_rules2
+        self.work_type_overtime.overtime_work_type_id = self.work_type_overtime2
+
+        work_data = [
+            ((2020, 24, 1), [
+                # regular day
+                (self.work_type, 4.0, None),
+                (self.work_type, 4.0, None),
+            ]),
+            ((2020, 24, 2), [
+                # 2hr overtime
+                (self.work_type, 4.0, None),
+                (self.work_type, 6.0, None),
+            ]),
+            ((2020, 24, 3), [
+                # 4hr overtime
+                (self.work_type, 6.0, None),
+                (self.work_type, 6.0, None),
+            ]),
+            ((2020, 24, 4), [
+                # 4hr overtime
+                # 2hr overtime2
+                (self.work_type, 6.0, None),
+                (self.work_type, 8.0, None),
+            ]),
+        ]
+
+        result_data = self.payslip.aggregate_overtime(work_data)
+        self.assertTrue(self.work_type in result_data)
+        self.assertEqual(result_data[self.work_type][0], 4)
+        self.assertEqual(result_data[self.work_type][1], 32.0)
+        self.assertTrue(self.work_type_overtime in result_data)
+        self.assertEqual(result_data[self.work_type_overtime][0], 0)
+        self.assertEqual(result_data[self.work_type_overtime][1], 10.0)
+        self.assertTrue(self.work_type_overtime2 in result_data)
+        self.assertEqual(result_data[self.work_type_overtime2][0], 0)
+        self.assertEqual(result_data[self.work_type_overtime2][1], 2.0)
+
+    def test_13_recursive_infinite_trivial(self):
+        # recursive should will use a second overtime, but not this time!
+        self.overtime_rules.hours_per_day = 8.0
+        self.overtime_rules.multiplier_per_day = 1.5
+        self.work_type.overtime_type_id = self.overtime_rules
+        # overtime goes to itself
+        self.work_type.overtime_work_type_id = self.work_type
+
+        work_data = [
+            ((2020, 24, 2), [
+                # 2hr overtime
+                (self.work_type, 4.0, None),
+                (self.work_type, 6.0, None),
+            ]),
+        ]
+
+        with self.assertRaises(UserError):
+            result_data = self.payslip.aggregate_overtime(work_data)
+
+    def test_14_recursive_infinite_loop(self):
+        # recursive will use a second overtime, but not this time!
+        self.overtime_rules.hours_per_day = 8.0
+        self.overtime_rules.multiplier_per_day = 1.5
+        self.work_type_overtime.overtime_type_id = self.overtime_rules
+        # overtime goes back to worktype
+        self.work_type_overtime.overtime_work_type_id = self.work_type
+
+        work_data = [
+            ((2020, 24, 2), [
+                # 2hr overtime
+                (self.work_type, 4.0, None),
+                (self.work_type, 6.0, None),
+            ]),
+        ]
+
+        with self.assertRaises(UserError):
+            result_data = self.payslip.aggregate_overtime(work_data)
diff --git a/hr_payroll_overtime/views/hr_work_entry_views.xml b/hr_payroll_overtime/views/hr_work_entry_views.xml
new file mode 100644
index 00000000..cbdb58f3
--- /dev/null
+++ b/hr_payroll_overtime/views/hr_work_entry_views.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <!-- Work Entry Type -->
+    <record id="hr_work_entry_type_view_form_inherit" model="ir.ui.view">
+        <field name="name">hr.work.entry.type.form.inherit</field>
+        <field name="model">hr.work.entry.type</field>
+        <field name="inherit_id" ref="hr_work_entry.hr_work_entry_type_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//group[@name='main_group']" position="after">
+                <group name="overtime_group">
+                    <field name="overtime_work_type_id"
+                           domain="[('id', '!=', id)]"
+                           attrs="{'required': [('overtime_type_id', '!=', False)]}" />
+                    <field name="overtime_type_id"
+                           domain="[('id', '!=', id)]"
+                           attrs="{'required': [('overtime_work_type_id', '!=', False)]}" />
+                </group>
+            </xpath>
+        </field>
+    </record>
+    
+    <!-- Work Entry Overtime Type -->
+    <record id="hr_work_entry_overtime_type_tree" model="ir.ui.view">
+        <field name="name">hr.work.entry.overtime.type.tree</field>
+        <field name="model">hr.work.entry.overtime.type</field>
+        <field name="arch" type="xml">
+            <tree string="Overtime Rules" editable="bottom">
+                <field name="name"/>
+                <field name="hours_per_day"/>
+                <field name="hours_per_week"/>
+                <field name="multiplier"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="hr_work_entry_overtime_type_search" model="ir.ui.view">
+        <field name="name">hr.work.entry.overtime.type.search</field>
+        <field name="model">hr.work.entry.overtime.type</field>
+        <field name="arch" type="xml">
+            <search string="Overtime Rules Search">
+                <field name="name"/>
+            </search>
+        </field>
+    </record>
+
+    <record id="hr_work_entry_overtime_type_action_main" model="ir.actions.act_window">
+        <field name="name">Overtime Rules</field>
+        <field name="res_model">hr.work.entry.overtime.type</field>
+        <field name="view_mode">tree,form</field>
+        <field name="help" type="html">
+            <p>
+                No Overtime Rules
+            </p>
+        </field>
+    </record>
+
+    <menuitem id="hr_work_entry_overtime_type_menu_main" name="Overtime Rules"
+              action="hr_work_entry_overtime_type_action_main"
+              sequence="11" parent="hr_payroll.menu_hr_work_entry_confirguration"/>
+
+</odoo>
\ No newline at end of file
diff --git a/hr_payroll_overtime/views/resource_calendar_views.xml b/hr_payroll_overtime/views/resource_calendar_views.xml
new file mode 100644
index 00000000..444dcc16
--- /dev/null
+++ b/hr_payroll_overtime/views/resource_calendar_views.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="resource_calendar_form_inherit" model="ir.ui.view">
+        <field name="name">resource.calendar.form.inherit</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='tz']" position="after">
+                <field name="day_week_start"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
\ No newline at end of file
diff --git a/hr_payroll_payment/__manifest__.py b/hr_payroll_payment/__manifest__.py
index 15411b4a..5281bcac 100755
--- a/hr_payroll_payment/__manifest__.py
+++ b/hr_payroll_payment/__manifest__.py
@@ -38,6 +38,7 @@ Passes original Payroll Accounting tests and additional ones for gouping behavio
     'depends': [
         'hr_payroll_account',
         'account_batch_payment',
+        'hibou_professional',
     ],
     'data': [
         #'wizard/hr_payroll_register_payment_views.xml',
diff --git a/hr_payroll_payment/models/hr_payslip.py b/hr_payroll_payment/models/hr_payslip.py
index 2b961493..0de752a3 100644
--- a/hr_payroll_payment/models/hr_payslip.py
+++ b/hr_payroll_payment/models/hr_payslip.py
@@ -139,12 +139,13 @@ class HrPayslip(models.Model):
         #     in
         #     payslips_to_post}
         # Hibou Customization: group with journal itself so that journal behavior can be derived.
+        # Hibou Customization: prefer slip's `date` over end of month
         slip_mapped_data = {
-            slip.struct_id.journal_id: {fields.Date().end_of(slip.date_to, 'month'): self.env['hr.payslip']} for slip
+            slip.struct_id.journal_id: {slip.date or fields.Date().end_of(slip.date_to, 'month'): self.env['hr.payslip']} for slip
             in
             payslips_to_post}
         for slip in payslips_to_post:
-            slip_mapped_data[slip.struct_id.journal_id][fields.Date().end_of(slip.date_to, 'month')] |= slip
+            slip_mapped_data[slip.struct_id.journal_id][slip.date or fields.Date().end_of(slip.date_to, 'month')] |= slip
 
         for journal in slip_mapped_data:  # For each journal_id.
             """
diff --git a/hr_payslip_line_date/__init__.py b/hr_payslip_line_date/__init__.py
new file mode 100644
index 00000000..0650744f
--- /dev/null
+++ b/hr_payslip_line_date/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/hr_payslip_line_date/__manifest__.py b/hr_payslip_line_date/__manifest__.py
new file mode 100755
index 00000000..9864b715
--- /dev/null
+++ b/hr_payslip_line_date/__manifest__.py
@@ -0,0 +1,24 @@
+{
+    'name': 'Date on Payslip Lines',
+    'author': 'Hibou Corp. <hello@hibou.io>',
+    'license': 'AGPL-3',
+    'category': 'Human Resources',
+    'depends': ['hr_payroll_account'],
+    'version': '13.0.1.0.0',
+    'description': """
+Date on Payslip Lines
+=====================
+
+* Adds "Date Account" (date) field to payslip line from payslip
+* Adds group by date to Payslip Line search view
+* Allows filtering by "Date Account" for easy period reporting
+    """,
+
+    'auto_install': True,
+    'website': 'https://hibou.io/',
+    'data': [
+        'views/payslip_view.xml',
+        'views/payslip_menu.xml',
+    ],
+    'installable': True
+}
diff --git a/hr_payslip_line_date/models/__init__.py b/hr_payslip_line_date/models/__init__.py
new file mode 100755
index 00000000..305e17f9
--- /dev/null
+++ b/hr_payslip_line_date/models/__init__.py
@@ -0,0 +1 @@
+from . import payslip
diff --git a/hr_payslip_line_date/models/payslip.py b/hr_payslip_line_date/models/payslip.py
new file mode 100755
index 00000000..7b55423e
--- /dev/null
+++ b/hr_payslip_line_date/models/payslip.py
@@ -0,0 +1,7 @@
+from odoo import models, fields
+
+
+class PayslipLine(models.Model):
+    _inherit = 'hr.payslip.line'
+
+    date = fields.Date(string="Date Account", related='slip_id.date', store=True)
\ No newline at end of file
diff --git a/hr_payslip_line_date/payslip_view.xml b/hr_payslip_line_date/payslip_view.xml
new file mode 100755
index 00000000..790b5447
--- /dev/null
+++ b/hr_payslip_line_date/payslip_view.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="payslip_line_filter_date" model="ir.ui.view">
+        <field name="name">hr.payslip.line.select</field>
+        <field name="model">hr.payslip.line</field>
+        <field name="priority">20</field>
+        <field name="inherit_id" ref="hr_payroll.view_hr_payslip_line_filter"/>
+        <field name="arch" type="xml">
+        <data>
+            <xpath expr="//group" position="before">
+                <separator string="Date Account"/>
+                <filter name="this_week" string="This Week" domain="[('date', '&gt;=', (context_today() - datetime.timedelta(days=7)).strftime('%Y-%m-%d')), ('date', '&lt;', (context_today() - datetime.timedelta(days=0)).strftime('%Y-%m-%d'))]"/>
+                <filter name="last_week" string="Last Week" domain="[('date', '&gt;=', (context_today() - datetime.timedelta(days=14)).strftime('%Y-%m-%d')), ('date', '&lt;', (context_today() - datetime.timedelta(days=7)).strftime('%Y-%m-%d'))]"/>
+                <filter name="last_two_week" string="Two Weeks Ago" domain="[('date', '&gt;=', (context_today() - datetime.timedelta(days=21)).strftime('%Y-%m-%d')), ('date', '&lt;', (context_today() - datetime.timedelta(days=14)).strftime('%Y-%m-%d'))]"/>
+                <filter name="last_three_week" string="Three Weeks Ago" domain="[('date', '&gt;=', (context_today() - datetime.timedelta(days=28)).strftime('%Y-%m-%d')), ('date', '&lt;', (context_today() - datetime.timedelta(days=21)).strftime('%Y-%m-%d'))]"/>
+                <filter name="this_month" string="This Month" domain="[('date', '&gt;=', context_today().strftime('%Y-%m-01')), ('date', '&lt;=', (context_today().replace(day=28) + datetime.timedelta(days=4)).strftime('%Y-%m-01'))]"/>
+                <filter name="last_month" string="Last Month" domain="[('date', '&lt;', context_today().strftime('%Y-%m-01')), ('date', '&gt;=', (context_today().replace(day=1) - datetime.timedelta(days=1)).strftime('%Y-%m-01'))]"/>
+                <separator string="This Year"/>
+                <filter name="this_year_q1" string="This Year Q1" domain="[('date', '&gt;=', context_today().strftime('%Y-01-01')), ('date', '&lt;', context_today().strftime('%Y-04-01'))]" />
+                <filter name="this_year_q2" string="This Year Q2" domain="[('date', '&gt;=', context_today().strftime('%Y-04-01')), ('date', '&lt;', context_today().strftime('%Y-07-01'))]" />
+                <filter name="this_year_q3" string="This Year Q3" domain="[('date', '&gt;=', context_today().strftime('%Y-07-01')), ('date', '&lt;', context_today().strftime('%Y-10-01'))]" />
+                <filter name="this_year_q4" string="This Year Q4" domain="[('date', '&gt;=', context_today().strftime('%Y-10-01')), ('date', '&lt;=', context_today().strftime('%Y-12-31'))]" />
+                <separator string="Last Year"/>
+                <filter name="this_year_q1" string="Last Year Q1" domain="[('date', '&gt;=', (context_today() - datetime.timedelta(days=365)).strftime('%Y-01-01')), ('date', '&lt;', (context_today() - datetime.timedelta(days=365)).strftime('%Y-04-01'))]" />
+                <filter name="this_year_q2" string="Last Year Q2" domain="[('date', '&gt;=', (context_today() - datetime.timedelta(days=365)).strftime('%Y-04-01')), ('date', '&lt;', (context_today() - datetime.timedelta(days=365)).strftime('%Y-07-01'))]" />
+                <filter name="this_year_q3" string="Last Year Q3" domain="[('date', '&gt;=', (context_today() - datetime.timedelta(days=365)).strftime('%Y-07-01')), ('date', '&lt;', (context_today() - datetime.timedelta(days=365)).strftime('%Y-10-01'))]" />
+                <filter name="this_year_q4" string="Last Year Q4" domain="[('date', '&gt;=', (context_today() - datetime.timedelta(days=365)).strftime('%Y-10-01')), ('date', '&lt;=', (context_today() - datetime.timedelta(days=365)).strftime('%Y-12-31'))]" />
+            </xpath>
+            <xpath expr="//group" position="inside">
+                <filter string="Account Date" name="date" context="{'group_by':'date'}"/>
+            </xpath>
+        </data>
+        </field>
+    </record>
+</odoo>
diff --git a/hr_payslip_line_date/views/payslip_menu.xml b/hr_payslip_line_date/views/payslip_menu.xml
new file mode 100644
index 00000000..b1a3e6f7
--- /dev/null
+++ b/hr_payslip_line_date/views/payslip_menu.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<odoo>
+    
+    <act_window id="action_payslip"
+                name="Payslip List"
+                res_model="hr.payslip.line"
+                view_mode="tree,pivot" />
+    
+    <menuitem id="payslip_reporting_view"
+              name="Payslip Lines"
+              parent="hr_payroll.menu_hr_payroll_report"
+              action="action_payslip" />
+    
+</odoo>
\ No newline at end of file
diff --git a/hr_payslip_line_date/views/payslip_view.xml b/hr_payslip_line_date/views/payslip_view.xml
new file mode 100755
index 00000000..e36b50cd
--- /dev/null
+++ b/hr_payslip_line_date/views/payslip_view.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    
+    <record id="payslip_line_filter_date" model="ir.ui.view">
+        <field name="name">hr.payslip.line.select</field>
+        <field name="model">hr.payslip.line</field>
+        <field name="priority">20</field>
+        <field name="inherit_id" ref="hr_payroll.hr_payslip_line_view_search_register"/>
+        <field name="arch" type="xml">
+            <data>
+                <xpath expr="//filter[@name='last_month']" position="attributes">
+                    <attribute name="string">Last Month (Date From)</attribute>
+                </xpath>
+                <xpath expr="//filter[@name='last_quarter']" position="attributes">
+                    <attribute name="string">Last Quarter (Date From)</attribute>
+                </xpath>
+                <xpath expr="//group" position="before">
+                    <separator string="Date Account"/>
+                    <filter name="this_week" string="This Week" domain="[('date', '&gt;=', (context_today() - datetime.timedelta(days=7)).strftime('%Y-%m-%d')), ('date', '&lt;', (context_today() - datetime.timedelta(days=0)).strftime('%Y-%m-%d'))]"/>
+                    <filter name="last_week" string="Last Week" domain="[('date', '&gt;=', (context_today() - datetime.timedelta(days=14)).strftime('%Y-%m-%d')), ('date', '&lt;', (context_today() - datetime.timedelta(days=7)).strftime('%Y-%m-%d'))]"/>
+                    <filter name="last_two_week" string="Two Weeks Ago" domain="[('date', '&gt;=', (context_today() - datetime.timedelta(days=21)).strftime('%Y-%m-%d')), ('date', '&lt;', (context_today() - datetime.timedelta(days=14)).strftime('%Y-%m-%d'))]"/>
+                    <filter name="last_three_week" string="Three Weeks Ago" domain="[('date', '&gt;=', (context_today() - datetime.timedelta(days=28)).strftime('%Y-%m-%d')), ('date', '&lt;', (context_today() - datetime.timedelta(days=21)).strftime('%Y-%m-%d'))]"/>
+                    <filter name="this_month" string="This Month" domain="[('date', '&gt;=', context_today().strftime('%Y-%m-01')), ('date', '&lt;=', (context_today().replace(day=28) + datetime.timedelta(days=4)).strftime('%Y-%m-01'))]"/>
+                    <filter name="last_month" string="Last Month" domain="[('date', '&lt;', context_today().strftime('%Y-%m-01')), ('date', '&gt;=', (context_today().replace(day=1) - datetime.timedelta(days=1)).strftime('%Y-%m-01'))]"/>
+                    <separator string="This Year"/>
+                    <filter name="this_year_q1" string="This Year Q1" domain="[('date', '&gt;=', context_today().strftime('%Y-01-01')), ('date', '&lt;', context_today().strftime('%Y-04-01'))]" />
+                    <filter name="this_year_q2" string="This Year Q2" domain="[('date', '&gt;=', context_today().strftime('%Y-04-01')), ('date', '&lt;', context_today().strftime('%Y-07-01'))]" />
+                    <filter name="this_year_q3" string="This Year Q3" domain="[('date', '&gt;=', context_today().strftime('%Y-07-01')), ('date', '&lt;', context_today().strftime('%Y-10-01'))]" />
+                    <filter name="this_year_q4" string="This Year Q4" domain="[('date', '&gt;=', context_today().strftime('%Y-10-01')), ('date', '&lt;=', context_today().strftime('%Y-12-31'))]" />
+                    <separator string="Last Year"/>
+                    <filter name="this_year_q1" string="Last Year Q1" domain="[('date', '&gt;=', (context_today() - datetime.timedelta(days=365)).strftime('%Y-01-01')), ('date', '&lt;', (context_today() - datetime.timedelta(days=365)).strftime('%Y-04-01'))]" />
+                    <filter name="this_year_q2" string="Last Year Q2" domain="[('date', '&gt;=', (context_today() - datetime.timedelta(days=365)).strftime('%Y-04-01')), ('date', '&lt;', (context_today() - datetime.timedelta(days=365)).strftime('%Y-07-01'))]" />
+                    <filter name="this_year_q3" string="Last Year Q3" domain="[('date', '&gt;=', (context_today() - datetime.timedelta(days=365)).strftime('%Y-07-01')), ('date', '&lt;', (context_today() - datetime.timedelta(days=365)).strftime('%Y-10-01'))]" />
+                    <filter name="this_year_q4" string="Last Year Q4" domain="[('date', '&gt;=', (context_today() - datetime.timedelta(days=365)).strftime('%Y-10-01')), ('date', '&lt;=', (context_today() - datetime.timedelta(days=365)).strftime('%Y-12-31'))]" />
+                </xpath>
+                <xpath expr="//group" position="inside">
+                    <filter string="Account Date" name="date" context="{'group_by':'date'}"/>
+                </xpath>
+            </data>
+        </field>
+    </record>
+    
+    <record id="view_hr_payslip_line_tree_extend" model="ir.ui.view">
+        <field name="name">hr.payslip.line.tree.extend</field>
+        <field name="model">hr.payslip.line</field>
+        <field name="inherit_id" ref="hr_payroll.view_hr_payslip_line_tree" />
+        <field name="arch" type="xml">
+            
+            <xpath expr="//tree" position="attributes">
+                <attribute name="editable" />
+            </xpath>
+        
+            <xpath expr="//field[@name='sequence']" position="attributes">
+                <attribute name="invisible">True</attribute>
+            </xpath>
+            
+            <xpath expr="//field[@name='category_id']" position="before">
+                <field name="slip_id"/>
+            </xpath>
+            
+        </field>
+    </record>
+    
+</odoo>
diff --git a/hr_workers_comp/views/contract_views.xml b/hr_workers_comp/views/contract_views.xml
index 7795c04f..f4abc652 100644
--- a/hr_workers_comp/views/contract_views.xml
+++ b/hr_workers_comp/views/contract_views.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <record id="wc_code_view_tree" model="ir.ui.view">
+
+    <record model="ir.ui.view" id="hr_wc_code_tree_view">
         <field name="name">hr.wc_code.tree</field>
         <field name="model">hr.wc_code</field>
         <field name="arch" type="xml">
@@ -12,11 +13,11 @@
         </field>
     </record>
 
-    <record id="wc_code_view_form" model="ir.ui.view">
+    <record model="ir.ui.view" id="hr_wc_code_form_view">
         <field name="name">hr.wc_code.form</field>
         <field name="model">hr.wc_code</field>
         <field name="arch" type="xml">
-            <form string="Workers Compensation Code">
+            <form string="Workers Compensation Codes">
                 <sheet>
                     <group>
                         <group>
@@ -25,14 +26,14 @@
                             <field name="name"/>
                             <field name="rate"/>
                         </group>
-                        <group name="other"/>
+                        <group name="others"></group>
                     </group>
                 </sheet>
             </form>
         </field>
     </record>
 
-    <record id="wc_code_view_search" model="ir.ui.view">
+    <record id="hr_wc_code_view_search" model="ir.ui.view">
         <field name="name">hr.wc_code.search</field>
         <field name="model">hr.wc_code</field>
         <field name="arch" type="xml">
@@ -43,10 +44,9 @@
         </field>
     </record>
 
-    <record id="wc_code_action_main" model="ir.actions.act_window">
+    <record id="hr_wc_code_action_main" model="ir.actions.act_window">
         <field name="name">Workers Compensation Codes</field>
         <field name="res_model">hr.wc_code</field>
-        <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
         <field name="help" type="html">
             <p>
@@ -56,7 +56,7 @@
     </record>
 
     <menuitem id="wc_code_menu_main" name="Workers Comp. Codes"
-              action="wc_code_action_main"
+              action="hr_wc_code_action_main"
               sequence="20" parent="hr.menu_human_resources_configuration"/>
 
     <!-- Inherited -->
diff --git a/logging_json b/logging_json
new file mode 120000
index 00000000..a7b34d54
--- /dev/null
+++ b/logging_json
@@ -0,0 +1 @@
+./external/camptocamp-cloud-platform/logging_json
\ No newline at end of file
diff --git a/maintenance_purchase_detail/README.rst b/maintenance_purchase_detail/README.rst
new file mode 100644
index 00000000..0e081b44
--- /dev/null
+++ b/maintenance_purchase_detail/README.rst
@@ -0,0 +1,26 @@
+***********************************
+Hibou - Maintenance Purchase Detail
+***********************************
+
+Record purchase date and details on Equipments.
+
+For more information and add-ons, visit `Hibou.io <https://hibou.io/>`_.
+
+=============
+Main Features
+=============
+
+Adds the following fields to Maintenance Equipment:
+
+* Purchase Date
+* Purchase Condition (dropdown)
+* Purchase Note
+
+Additionally, adds a smart button to archive Equipments.
+
+=======
+License
+=======
+
+Please see `LICENSE <https://github.com/hibou-io/hibou-odoo-suite/blob/master/LICENSE>`_.
+Copyright Hibou Corp. 2018
\ No newline at end of file
diff --git a/maintenance_purchase_detail/__init__.py b/maintenance_purchase_detail/__init__.py
new file mode 100644
index 00000000..0650744f
--- /dev/null
+++ b/maintenance_purchase_detail/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/maintenance_purchase_detail/__manifest__.py b/maintenance_purchase_detail/__manifest__.py
new file mode 100644
index 00000000..5d6bce51
--- /dev/null
+++ b/maintenance_purchase_detail/__manifest__.py
@@ -0,0 +1,22 @@
+{
+    'name': 'Equipment Purchase Detail',
+    'version': '13.0.1.0.0',
+    'author': 'Hibou Corp. <hello@hibou.io>',
+    'category': 'Human Resources',
+    'summary': 'Record purchase date and details on Equipments.',
+    'description': """
+Equipment Purchase Detail
+=========================
+
+Adds fields for purchase date, and condition on the Equipment form.
+""",
+    'website': 'https://hibou.io/',
+    'depends': [
+        'maintenance',
+    ],
+    'data': [
+        'views/maintenance_views.xml',
+    ],
+    'installable': True,
+    'auto_install': False,
+}
diff --git a/maintenance_purchase_detail/models/__init__.py b/maintenance_purchase_detail/models/__init__.py
new file mode 100644
index 00000000..12bf298f
--- /dev/null
+++ b/maintenance_purchase_detail/models/__init__.py
@@ -0,0 +1 @@
+from . import maintenance
diff --git a/maintenance_purchase_detail/models/maintenance.py b/maintenance_purchase_detail/models/maintenance.py
new file mode 100644
index 00000000..cdf73d09
--- /dev/null
+++ b/maintenance_purchase_detail/models/maintenance.py
@@ -0,0 +1,13 @@
+from odoo import api, fields, models
+
+
+class MaintenanceEquipment(models.Model):
+    _inherit = 'maintenance.equipment'
+
+    purchase_date = fields.Date(string='Purchase Date')
+    purchase_condition = fields.Selection([
+                             ('new', 'New'),
+                             ('used', 'Used'),
+                             ('other', 'Other'),
+                         ], string='Purchase Condition')
+    purchase_note = fields.Text(string='Purchase Note')
diff --git a/maintenance_purchase_detail/views/maintenance_views.xml b/maintenance_purchase_detail/views/maintenance_views.xml
new file mode 100644
index 00000000..3a1bab21
--- /dev/null
+++ b/maintenance_purchase_detail/views/maintenance_views.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record model="ir.ui.view" id="hr_equipment_view_form_inherited">
+        <field name="name">equipment.form.inherited</field>
+        <field name="model">maintenance.equipment</field>
+        <field name="inherit_id" ref="maintenance.hr_equipment_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='warranty_date']" position="after">
+                <field name="purchase_date"/>
+                <field name="purchase_condition"/>
+                <field name="purchase_note"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/maintenance_repair/README.rst b/maintenance_repair/README.rst
new file mode 100644
index 00000000..1b2a6ab9
--- /dev/null
+++ b/maintenance_repair/README.rst
@@ -0,0 +1,33 @@
+**************************
+Hibou - Maintenance Repair
+**************************
+
+Keep track of parts required to repair equipment.
+
+For more information and add-ons, visit `Hibou.io <https://hibou.io/>`_.
+
+
+=============
+Main Features
+=============
+
+* Consume products on Maintenance Requests.
+* New Model: Maintenance Request Repair Line
+* New 'Parts' notebook tab on Maintenance Request form.
+* New Equipment Repair filter 'To Repair' to view maintenance requests with part line items that have not yet been consumed.
+* Tally for total cost of Parts.
+* Includes Employee permissions for managing maintenance request repair line items
+
+.. image:: https://user-images.githubusercontent.com/15882954/41262389-6665024a-6d95-11e8-9d94-236c635e1cf2.png
+    :alt: 'Equipment Request Detail'
+    :width: 988
+    :align: left
+
+
+=======
+License
+=======
+
+Please see `LICENSE <https://github.com/hibou-io/hibou-odoo-suite/blob/11.0/LICENSE>`_.
+
+Copyright Hibou Corp. 2018
diff --git a/maintenance_repair/__init__.py b/maintenance_repair/__init__.py
new file mode 100644
index 00000000..0650744f
--- /dev/null
+++ b/maintenance_repair/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/maintenance_repair/__manifest__.py b/maintenance_repair/__manifest__.py
new file mode 100644
index 00000000..f1109bed
--- /dev/null
+++ b/maintenance_repair/__manifest__.py
@@ -0,0 +1,25 @@
+{
+    'name': 'Equipment Repair',
+    'version': '13.0.1.0.0',
+    'author': 'Hibou Corp. <hello@hibou.io>',
+    'category': 'Human Resources',
+    'summary': 'Consume products on Maintenance Requests',
+    'description': """
+Equipment Repair
+================
+
+Keep track of parts required to repair equipment.
+""",
+    'website': 'https://hibou.io/',
+    'depends': [
+        'stock',
+        'maintenance_notebook',
+        'hr_department_project',
+    ],
+    'data': [
+        'security/ir.model.access.csv',
+        'views/maintenance_views.xml',
+    ],
+    'installable': True,
+    'auto_install': False,
+}
diff --git a/maintenance_repair/models/__init__.py b/maintenance_repair/models/__init__.py
new file mode 100644
index 00000000..12bf298f
--- /dev/null
+++ b/maintenance_repair/models/__init__.py
@@ -0,0 +1 @@
+from . import maintenance
diff --git a/maintenance_repair/models/maintenance.py b/maintenance_repair/models/maintenance.py
new file mode 100644
index 00000000..dc7ebade
--- /dev/null
+++ b/maintenance_repair/models/maintenance.py
@@ -0,0 +1,161 @@
+from odoo import api, fields, models, _
+from odoo.addons import decimal_precision as dp
+from odoo.exceptions import UserError, ValidationError
+
+
+class StockMove(models.Model):
+    _inherit = 'stock.move'
+
+    maintenance_request_id = fields.Many2one('maintenance.request')
+
+
+class MaintenanceTeam(models.Model):
+    _inherit = 'maintenance.team'
+
+    repair_location_id = fields.Many2one('stock.location', string='Default Repair Parts Source')
+    repair_location_dest_id = fields.Many2one('stock.location', string='Default Repair Parts Destination')
+
+
+class MaintenanceRequest(models.Model):
+    _inherit = 'maintenance.request'
+
+    maintenance_type = fields.Selection(selection_add=[('negligence', 'Negligence')])
+    repair_line_ids = fields.One2many('maintenance.request.repair.line', 'request_id', 'Parts', copy=True)
+    repair_status = fields.Selection([
+        ('repaired', 'Repaired'),
+        ('to repair', 'To Repair'),
+        ('no', 'Nothing to Repair')
+        ], string='Repair Status', compute='_get_repaired', store=True, readonly=True)
+    repair_location_id = fields.Many2one('stock.location', string='Source Location')
+    repair_location_dest_id = fields.Many2one('stock.location', string='Destination Location')
+    total_lst_price = fields.Float(string='Total Price', compute='_compute_repair_totals', stored=True)
+    total_standard_price = fields.Float(string='Total Est. Cost', compute='_compute_repair_totals', stored=True)
+    total_cost = fields.Float(string='Total Cost', compute='_compute_repair_totals', stored=True)
+
+    @api.depends('repair_line_ids.lst_price', 'repair_line_ids.standard_price', 'repair_line_ids.cost')
+    def _compute_repair_totals(self):
+        for repair in self:
+            repair.total_lst_price = sum(l.lst_price for l in repair.repair_line_ids)
+            repair.total_standard_price = sum(l.standard_price for l in repair.repair_line_ids)
+            repair.total_cost = sum(l.cost for l in repair.repair_line_ids)
+
+    @api.depends('repair_line_ids.state')
+    def _get_repaired(self):
+        for request in self:
+            if not request.repair_line_ids:
+                request.repair_status = 'no'
+            elif request.repair_line_ids.filtered(lambda l: l.state != 'done'):
+                request.repair_status = 'to repair'
+            else:
+                request.repair_status = 'repaired'
+
+    @api.onchange('maintenance_team_id')
+    def _onchange_maintenance_team(self):
+        for request in self:
+            if request.maintenance_team_id:
+                request.repair_location_id = request.maintenance_team_id.repair_location_id
+                request.repair_location_dest_id = request.maintenance_team_id.repair_location_dest_id
+
+
+    def action_complete_repair(self):
+        for request in self.filtered(lambda r: r.repair_status == 'to repair'):
+            request.repair_line_ids.action_complete()
+        return True
+
+class MaintenanceRequestRepairLine(models.Model):
+    _name = 'maintenance.request.repair.line'
+
+    request_id = fields.Many2one('maintenance.request', copy=False)
+    product_id = fields.Many2one('product.product', 'Product', required=True,
+                                 states={'done': [('readonly', True)]})
+    product_uom_qty = fields.Float('Quantity', default=1.0,
+                                   digits=dp.get_precision('Product Unit of Measure'), required=True,
+                                   states={'done': [('readonly', True)]})
+    product_uom_id = fields.Many2one('uom.uom', 'Product Unit of Measure', required=True,
+                                     states={'done': [('readonly', True)]})
+    state = fields.Selection([
+        ('draft', 'Draft'),
+        ('done', 'Done'),
+    ], string='State', copy=False, default='draft')
+    move_id = fields.Many2one('stock.move', string='Stock Move')
+    lst_price = fields.Float(string='Sale Price', states={'done': [('readonly', True)]})
+    standard_price = fields.Float(string='Est. Cost', states={'done': [('readonly', True)]})
+    cost = fields.Float(string='Cost', compute='_compute_actual_cost', stored=True)
+    
+    def unlink(self):
+        if self.filtered(lambda l: l.state == 'done'):
+            raise UserError(_('Only draft lines can be deleted.'))
+        return super(MaintenanceRequestRepairLine, self).unlink()
+
+    @api.onchange('product_id', 'product_uom_qty')
+    def onchange_product_id(self):
+        if self.product_id:
+            self.product_uom_id = self.product_id.uom_id
+            self.lst_price = self.product_id.lst_price * self.product_uom_qty
+            self.standard_price = self.product_id.standard_price * self.product_uom_qty
+
+    @api.depends('product_id', 'move_id')
+    def _compute_actual_cost(self):
+        for line in self:
+            if line.move_id:
+                line.cost = sum(abs(m.amount) for m in line.move_id.account_move_ids)
+            else:
+                line.cost = 0.0
+
+    def _repair_complete_stock_move_values(self):
+        values = {
+            'name': self.request_id.name,
+            'product_id': self.product_id.id,
+            'product_uom_qty': self.product_uom_qty,
+            'product_uom': self.product_uom_id.id,
+            'location_id': self.request_id.repair_location_id.id,
+            'location_dest_id': self.request_id.repair_location_dest_id.id,
+            'maintenance_request_id': self.request_id.id,
+            'origin': self.request_id.name,
+        }
+        # Optional modules for linking maintenance requests to projects, and stock moves to analytic accounts
+        if hasattr(self.request_id, 'project_id') and hasattr(self.env['stock.move'], 'analytic_account_id'):
+            values['analytic_account_id'] = self.request_id.project_id.analytic_account_id.id
+        return values
+
+    def action_complete(self):
+        # Create stock movements. - Inspired by mrp_repair
+        stock_move_model = self.env['stock.move']
+        for line in self.filtered(lambda l: not l.state == 'done'):
+            move = stock_move_model.create(self._repair_complete_stock_move_values())
+            move = move.sudo()
+            move._action_confirm()
+            move._action_assign()
+            if move.state != 'assigned':
+                raise ValidationError(_('Unable to reserve inventory.'))
+
+            move.quantity_done = line.product_uom_qty
+            move._action_done()
+            if move.state != 'done':
+                raise ValidationError(_('Unable to move inventory.'))
+
+            line.write({'move_id': move.id, 'state': 'done'})
+        return True
+
+
+class MaintenanceEquipment(models.Model):
+    _inherit = 'maintenance.equipment'
+
+    def _create_new_request(self, date):
+        # Added repair_location_id and repair_location_dest_id
+        # Cannot call super() because it does not return the object
+        self.ensure_one()
+        return self.env['maintenance.request'].create({
+            'name': _('Preventive Maintenance - %s') % self.name,
+            'request_date': date,
+            'schedule_date': date,
+            'category_id': self.category_id.id,
+            'equipment_id': self.id,
+            'maintenance_type': 'preventive',
+            'owner_user_id': self.owner_user_id.id,
+            'user_id': self.technician_user_id.id,
+            'maintenance_team_id': self.maintenance_team_id.id,
+            'duration': self.maintenance_duration,
+            'repair_location_id': self.maintenance_team_id.repair_location_id.id,
+            'repair_location_dest_id': self.maintenance_team_id.repair_location_dest_id.id
+        })
diff --git a/maintenance_repair/security/ir.model.access.csv b/maintenance_repair/security/ir.model.access.csv
new file mode 100644
index 00000000..26e989ac
--- /dev/null
+++ b/maintenance_repair/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_maintenance_request_repair_line","access maintenance.request.repair.line","model_maintenance_request_repair_line","base.group_user",1,1,1,1
\ No newline at end of file
diff --git a/maintenance_repair/tests/__init__.py b/maintenance_repair/tests/__init__.py
new file mode 100644
index 00000000..3820c3df
--- /dev/null
+++ b/maintenance_repair/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_maintenance_repair
diff --git a/maintenance_repair/tests/test_maintenance_repair.py b/maintenance_repair/tests/test_maintenance_repair.py
new file mode 100644
index 00000000..aa358fa7
--- /dev/null
+++ b/maintenance_repair/tests/test_maintenance_repair.py
@@ -0,0 +1,37 @@
+from odoo.tests import common
+
+
+class TestMaintenanceRepair(common.TransactionCase):
+    """Tests for repairs
+    """
+
+    def test_create(self):
+        equipment = self.env['maintenance.equipment'].create({
+            'name': 'Monitor',
+        })
+
+        loc_from = self.env.ref('stock.stock_location_stock')
+        loc_to = self.env.ref('stock.stock_location_output')
+        request = self.env['maintenance.request'].create({
+            'name': 'Repair Monitor',
+            'equipment_id': equipment.id,
+            'repair_location_id': loc_from.id,
+            'repair_location_dest_id': loc_to.id,
+        })
+        self.assertEqual(request.repair_status, 'no')
+
+        product_to_repair = self.env.ref('product.product_product_24_product_template').product_variant_id
+        line = self.env['maintenance.request.repair.line'].create({
+            'request_id': request.id,
+            'product_id': product_to_repair.id,
+            'product_uom_id': product_to_repair.uom_id.id,
+        })
+
+        self.assertEqual(request.repair_status, 'to repair')
+        line.action_complete()
+        self.assertEqual(request.repair_status, 'repaired')
+        self.assertEqual(line.state, 'done')
+        self.assertTrue(line.move_id, 'Expect a stock move to be done.')
+
+
+
diff --git a/maintenance_repair/views/maintenance_views.xml b/maintenance_repair/views/maintenance_views.xml
new file mode 100644
index 00000000..b875f5f5
--- /dev/null
+++ b/maintenance_repair/views/maintenance_views.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record model="ir.ui.view" id="maintenance_team_view_form_inherited">
+        <field name="name">maintenance.team.form.inherited</field>
+        <field name="model">maintenance.team</field>
+        <field name="inherit_id" ref="maintenance.maintenance_team_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='member_ids']" position="after">
+                <field name="repair_location_id"/>
+                <field name="repair_location_dest_id"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="hr_equipment_request_view_form_inherited">
+        <field name="name">equipment.request.form.inherited</field>
+        <field name="model">maintenance.request</field>
+        <field name="inherit_id" ref="maintenance.hr_equipment_request_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//button[@name='archive_equipment_request']" position="before">
+                <field name="repair_status" invisible="1"/>
+                <button type="object" name="action_complete_repair" string="Complete Repair" class="oe_highlight"
+                        attrs="{'invisible': [('repair_status', '!=', 'to repair')]}"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="hr_equipment_request_view_form_notebook_inherited">
+        <field name="name">equipment.request.form.notebook.inherited</field>
+        <field name="model">maintenance.request</field>
+        <field name="inherit_id" ref="maintenance_notebook.hr_equipment_request_view_form_notebook"/>
+        <field name="arch" type="xml">
+            <xpath expr="//notebook" position="inside">
+                <page string="Parts">
+                    <group>
+                        <group>
+                            <field name="repair_location_id"/>
+                            <field name="repair_status" invisible="1"/>
+                        </group>
+                        <group>
+                            <field name="repair_location_dest_id"/>
+                        </group>
+                    </group>
+
+                    <field name="repair_line_ids">
+                        <tree editable="bottom" string="Part Operations" colors="blue:state=='draft'">
+                            <field name="state" invisible="1"/>
+                            <field name="product_id" domain="[('type', 'in', ['product', 'consu'])]"/>
+                            <field name="product_uom_id"/>
+                            <field name="product_uom_qty"/>
+                            <field name="lst_price"/>
+                            <field name="standard_price" groups="account.group_account_user"/>
+                            <field name="cost" groups="account.group_account_user"/>
+                            <button type="object" name="action_complete" string="Complete" class="oe_highlight"
+                                    attrs="{'invisible': [('state', '=', 'done')]}"/>
+                        </tree>
+                    </field>
+
+                    <group>
+                        <group class="oe_subtotal_footer oe_right" name="repair_totals">
+                            <field name="total_lst_price" />
+                            <field name="total_standard_price" groups="account.group_account_user"/>
+                            <field name="total_cost" groups="account.group_account_user"/>
+                        </group>
+                    </group>
+                </page>
+            </xpath>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="hr_equipment_request_view_search_inherited">
+        <field name="name">equipment.request.search.inherited</field>
+        <field name="model">maintenance.request</field>
+        <field name="inherit_id" ref="maintenance.hr_equipment_request_view_search"/>
+        <field name="arch" type="xml">
+            <xpath expr="//filter[@name='done']" position="after">
+                <filter string="To Repair" name="to_repair" domain="[('repair_status', '=', 'to repair')]"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/maintenance_usage/__manifest__.py b/maintenance_usage/__manifest__.py
index 0687af86..8f0b3554 100644
--- a/maintenance_usage/__manifest__.py
+++ b/maintenance_usage/__manifest__.py
@@ -16,6 +16,7 @@ Create preventative maintenance requests based on usage.
     'website': 'https://hibou.io/',
     'depends': [
         'hr_maintenance',
+        'product',
     ],
     'data': [
         'security/ir.model.access.csv',
diff --git a/maintenance_usage/models/maintenance.py b/maintenance_usage/models/maintenance.py
index 60bad798..c0a785bd 100644
--- a/maintenance_usage/models/maintenance.py
+++ b/maintenance_usage/models/maintenance.py
@@ -56,7 +56,9 @@ class MaintenanceEquipment(models.Model):
         result = super(MaintenanceEquipment, self).write(values)
         return result
 
-    def _log_usage(self, values={}):
+    def _log_usage(self, values=None):
+        if not values:
+            values = {}
         values['equipment_id'] = self.id
         values['date'] = fields.Datetime.now()
         self.env['maintenance.usage.log'].create(values)
diff --git a/maintenance_usage/security/ir.model.access.csv b/maintenance_usage/security/ir.model.access.csv
index aea213d8..8c7451e1 100644
--- a/maintenance_usage/security/ir.model.access.csv
+++ b/maintenance_usage/security/ir.model.access.csv
@@ -1,3 +1,3 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"manage_maintenance_usage_log","manage maintenance.usage.log","model_maintenance_usage_log","stock.group_stock_manager",1,1,1,1
-"access_maintenance_usage_log","access maintenance.usage.log","model_maintenance_usage_log","base.group_user",1,0,1,0
\ No newline at end of file
+"manage_maintenance_usage_log","manage maintenance.usage.log","model_maintenance_usage_log","maintenance.group_equipment_manager",1,1,1,1
+"access_maintenance_usage_log","access maintenance.usage.log","model_maintenance_usage_log","base.group_user",1,0,1,0
diff --git a/monitoring_log_requests b/monitoring_log_requests
new file mode 120000
index 00000000..854c2986
--- /dev/null
+++ b/monitoring_log_requests
@@ -0,0 +1 @@
+./external/camptocamp-cloud-platform/monitoring_log_requests
\ No newline at end of file
diff --git a/monitoring_statsd b/monitoring_statsd
new file mode 120000
index 00000000..f73264ee
--- /dev/null
+++ b/monitoring_statsd
@@ -0,0 +1 @@
+./external/camptocamp-cloud-platform/monitoring_statsd
\ No newline at end of file
diff --git a/monitoring_status b/monitoring_status
new file mode 120000
index 00000000..db6885a8
--- /dev/null
+++ b/monitoring_status
@@ -0,0 +1 @@
+./external/camptocamp-cloud-platform/monitoring_status
\ No newline at end of file
diff --git a/mrp_bom_add/__init__.py b/mrp_bom_add/__init__.py
new file mode 100755
index 00000000..40272379
--- /dev/null
+++ b/mrp_bom_add/__init__.py
@@ -0,0 +1 @@
+from . import wizard
diff --git a/mrp_bom_add/__manifest__.py b/mrp_bom_add/__manifest__.py
new file mode 100755
index 00000000..2a9021ca
--- /dev/null
+++ b/mrp_bom_add/__manifest__.py
@@ -0,0 +1,27 @@
+{
+    'name': 'BoM Mass Add',
+    'author': 'Hibou Corp. <hello@hibou.io>',
+    'category': 'Hidden',
+    'version': '13.0.1.1.0',
+    'description':
+        """
+Bill of Materials Mass Component Adder
+======================================
+
+Helper to add all variants of a Product to a BoM filtered by the attributes on that product.
+Adds a button under BoM components named "Add Bulk".  This lets you select a product template 
+and add one BoM line for every variant of that product.
+
+Optionally you can choose to only add the variants that could be selected by the attributes 
+on the produced product itself.  You can also replace all of the lines for the slected product 
+to allow you to quickly re-configure qty or operation for bulk products.
+        """,
+    'depends': [
+        'mrp',
+        'sale',
+    ],
+    'auto_install': False,
+    'data': [
+        'wizard/mrp_bom_add_views.xml',
+    ],
+}
diff --git a/mrp_bom_add/tests/__init__.py b/mrp_bom_add/tests/__init__.py
new file mode 100644
index 00000000..334c6444
--- /dev/null
+++ b/mrp_bom_add/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_mrp_bom_add
diff --git a/mrp_bom_add/tests/test_mrp_bom_add.py b/mrp_bom_add/tests/test_mrp_bom_add.py
new file mode 100644
index 00000000..5b60917f
--- /dev/null
+++ b/mrp_bom_add/tests/test_mrp_bom_add.py
@@ -0,0 +1,137 @@
+from odoo.tests.common import TransactionCase
+
+
+class TestMRPBOMAdd(TransactionCase):
+
+    def setUp(self):
+        super(TestMRPBOMAdd, self).setUp()
+        self.attr1 = self.env['product.attribute'].create({
+            'name': 'Test Attr1',
+            'create_variant': 'always',
+            'type': 'radio',
+        })
+        self.attr1_val1 = self.env['product.attribute.value'].create({
+            'attribute_id': self.attr1.id,
+            'name': 'Test Attr1 Val1'
+        })
+        self.attr1_val2 = self.env['product.attribute.value'].create({
+            'attribute_id': self.attr1.id,
+            'name': 'Test Attr2 Val1'
+        })
+
+        self.attr2 = self.env['product.attribute'].create({
+            'name': 'Test Attr2',
+            'create_variant': 'always',
+            'type': 'radio',
+        })
+        self.attr2_val1 = self.env['product.attribute.value'].create({
+            'attribute_id': self.attr2.id,
+            'name': 'Test Attr2 Val1'
+        })
+        self.attr2_val2 = self.env['product.attribute.value'].create({
+            'attribute_id': self.attr2.id,
+            'name': 'Test Attr2 Val2'
+        })
+
+        # 2 variant product
+        self.manufacture = self.env['product.template'].create({
+            'name': 'Test Manufactured',
+            'attribute_line_ids': [
+                (0, 0, {
+                    'attribute_id': self.attr1.id,
+                    'value_ids': [(4, self.attr1_val1.id, 0)],
+                }),
+                (0, 0, {
+                    'attribute_id': self.attr2.id,
+                    'value_ids': [(4, self.attr2_val1.id, 0), (4, self.attr2_val2.id, 0)],
+                }),
+            ]
+        })
+
+        # 4 variant component
+        self.component = self.env['product.template'].create({
+            'name': 'Test Component',
+            'attribute_line_ids': [
+                (0, 0, {
+                    'attribute_id': self.attr1.id,
+                    'value_ids': [(4, self.attr1_val1.id, 0), (4, self.attr1_val2.id, 0)],
+                }),
+                (0, 0, {
+                    'attribute_id': self.attr2.id,
+                    'value_ids': [(4, self.attr2_val1.id, 0), (4, self.attr2_val2.id, 0)],
+                }),
+            ]
+        })
+        self.bom = self.env['mrp.bom'].create({
+            'product_tmpl_id': self.manufacture.id,
+            'product_qty': 1.0,
+            'product_uom_id': self.manufacture.uom_id.id,
+        })
+
+    def test_internals(self):
+        # Ensure BoM is empty
+        self.assertEqual(len(self.bom.bom_line_ids), 0)
+        wizard = self.env['mrp.bom.add'].create({
+            'bom_id': self.bom.id,
+        })
+        wizard.product_tmpl_id = self.component
+        self.assertEqual(wizard._compute_attribute_value_ids(),
+                         self.component.mapped('attribute_line_ids.value_ids'))
+        self.assertEqual(wizard._compute_product_ids(), self.component.product_variant_ids)
+        wizard.limit_possible = True
+        self.assertEqual(wizard._compute_attribute_value_ids(),
+                         self.manufacture.mapped('attribute_line_ids.value_ids'))
+
+    def test_main(self):
+        # Ensure BoM is empty
+        self.assertEqual(len(self.bom.bom_line_ids), 0)
+
+        wizard = self.env['mrp.bom.add'].create({
+            'bom_id': self.bom.id,
+        })
+        self.assertEqual(wizard.product_variant_count, 0)
+
+        wizard.product_tmpl_id = self.component
+        self.assertEqual(wizard.product_variant_count, 4)
+
+        wizard.add_variants()
+        self.assertEqual(len(self.bom.bom_line_ids), 4)
+
+    def test_limited(self):
+        # Ensure BoM is empty
+        self.assertEqual(len(self.bom.bom_line_ids), 0)
+
+        wizard = self.env['mrp.bom.add'].create({
+            'bom_id': self.bom.id,
+        })
+        self.assertEqual(wizard.product_variant_count, 0)
+
+        wizard.limit_possible = True
+        wizard.product_tmpl_id = self.component
+        self.assertEqual(wizard.product_variant_count, 2)
+
+        wizard.add_variants()
+        self.assertEqual(len(self.bom.bom_line_ids), 2)
+
+    def test_replace(self):
+        # Ensure BoM is empty
+        self.assertEqual(len(self.bom.bom_line_ids), 0)
+
+        wizard = self.env['mrp.bom.add'].create({
+            'bom_id': self.bom.id,
+        })
+
+        wizard.product_tmpl_id = self.component
+        self.assertEqual(wizard.product_variant_count, 4)
+
+        wizard.add_variants()
+        self.assertEqual(len(self.bom.bom_line_ids), 4)
+
+        # Additive
+        wizard.add_variants()
+        self.assertEqual(len(self.bom.bom_line_ids), 8)
+
+        # remove those 8 lines when adding new ones
+        wizard.replace_existing = True
+        wizard.add_variants()
+        self.assertEqual(len(self.bom.bom_line_ids), 4)
diff --git a/mrp_bom_add/wizard/__init__.py b/mrp_bom_add/wizard/__init__.py
new file mode 100644
index 00000000..f578190b
--- /dev/null
+++ b/mrp_bom_add/wizard/__init__.py
@@ -0,0 +1 @@
+from . import mrp_bom_add
diff --git a/mrp_bom_add/wizard/mrp_bom_add.py b/mrp_bom_add/wizard/mrp_bom_add.py
new file mode 100644
index 00000000..64a26bc8
--- /dev/null
+++ b/mrp_bom_add/wizard/mrp_bom_add.py
@@ -0,0 +1,86 @@
+from odoo import api, fields, models
+
+
+class ProgramOutputView(models.TransientModel):
+    _name = 'mrp.bom.add'
+    _description = 'BoM Add Wizard'
+
+    bom_id = fields.Many2one('mrp.bom', string='Bill of Materials')
+    bom_product_tmpl_id = fields.Many2one('product.template', string='BoM Product', related='bom_id.product_tmpl_id')
+    product_tmpl_id = fields.Many2one('product.template', string='Product')
+    product_variant_count = fields.Integer(string='Variant Count',
+                                           compute='_compute_variant_count')
+    limit_possible = fields.Boolean(string='Limit to possible variants',
+                                    help='Only add variants that can be selected by BoM Product')
+    replace_existing = fields.Boolean(string='Replace existing BoM lines for this template.')
+    existing_line_count = fields.Integer(string='Existing Lines',
+                                         help='Remove any existing lines for this Product Template.',
+                                         compute='_compute_variant_count')
+    product_qty = fields.Float(string='Quantity to Consume', default=1.0)
+    product_uom_id = fields.Many2one('uom.uom', string='Consume Unit of Measure')
+    bom_routing_id = fields.Many2one('mrp.routing', related='bom_id.routing_id')
+    operation_id = fields.Many2one('mrp.routing.workcenter', 'Consume in Operation')
+
+    @api.depends('product_tmpl_id', 'limit_possible')
+    def _compute_variant_count(self):
+        self.ensure_one()
+        if not self.product_tmpl_id or not self.bom_product_tmpl_id:
+            self.product_variant_count = 0
+            self.existing_line_count = 0
+        else:
+            products = self._compute_product_ids()
+            lines = self._compute_existing_line_ids()
+            self.product_variant_count = len(products)
+            self.existing_line_count = len(lines)
+
+    @api.onchange('product_tmpl_id')
+    def _onchange_default_product_uom(self):
+        if self.product_tmpl_id:
+            self.product_uom_id = self.product_tmpl_id.uom_id
+
+    def _compute_attribute_value_ids(self):
+        attr_val_ids = self.env['product.attribute.value']
+        other_val_ids = self.product_tmpl_id.mapped('attribute_line_ids.value_ids')
+        if not self.limit_possible:
+            return other_val_ids
+        main_product_value_ids = self.bom_product_tmpl_id.mapped('attribute_line_ids.value_ids')
+        return main_product_value_ids.filtered(lambda v: v in other_val_ids)
+
+    def _compute_product_ids(self):
+        values = self._compute_attribute_value_ids()
+        products = self.env['product.product']
+        for p in self.product_tmpl_id.product_variant_ids:
+            if not p.product_template_attribute_value_ids.mapped('product_attribute_value_id').filtered(lambda a: a not in values):
+                # This product's attribute values are in the values set.
+                products += p
+        return products
+
+    def _compute_existing_line_ids(self):
+        return self.bom_id.bom_line_ids.filtered(lambda l: l.product_id.product_tmpl_id == self.product_tmpl_id)
+
+    def add_variants(self):
+        if self.replace_existing:
+            lines = self._compute_existing_line_ids()
+            lines.unlink()
+
+        attribute_values = self._compute_attribute_value_ids()
+        products = self._compute_product_ids()
+        if not self.product_uom_id:
+            self.product_uom_id = self.product_tmpl_id.uom_id
+        lines = []
+        for p in products:
+            bom_product_template_attribute_values = self.bom_product_tmpl_id.attribute_line_ids\
+                .mapped('product_template_value_ids')
+            p_values = p.product_template_attribute_value_ids.mapped('product_attribute_value_id')
+            bom_product_template_attribute_value_ids = bom_product_template_attribute_values \
+                .filtered(lambda v: v.product_attribute_value_id in attribute_values and v.product_attribute_value_id in p_values)
+            lines.append((0, 0, {
+                'bom_id': self.bom_id.id,
+                'product_id': p.id,
+                'product_qty': self.product_qty,
+                'product_uom_id': self.product_uom_id.id,
+                'bom_product_template_attribute_value_ids': [(4, a.id, 0)
+                                                             for a in bom_product_template_attribute_value_ids],
+                'operation_id': self.operation_id.id,
+            }))
+        self.bom_id.write({'bom_line_ids': lines})
diff --git a/mrp_bom_add/wizard/mrp_bom_add_views.xml b/mrp_bom_add/wizard/mrp_bom_add_views.xml
new file mode 100644
index 00000000..f56037b3
--- /dev/null
+++ b/mrp_bom_add/wizard/mrp_bom_add_views.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="view_mrp_bom_add_form_view" model="ir.ui.view">
+        <field name="name">mrp.bom.add.form</field>
+        <field name="model">mrp.bom.add</field>
+        <field name="arch" type="xml">
+            <form string="Add to Bill of Materials">
+                <group>
+                     <group>
+                         <field name="bom_id" invisible="1"/>
+                         <field name="bom_product_tmpl_id" invisible="1"/>
+                         <field name="bom_routing_id" invisible="1"/>
+                         <field name="product_tmpl_id"/>
+                         <field name="limit_possible"/>
+                         <field name="product_variant_count"/>
+                         <field name="replace_existing"/>
+                         <field name="existing_line_count"/>
+                     </group>
+                     <group>
+                         <field name="product_qty"/>
+                         <field name="product_uom_id"/>
+                         <field name="operation_id" domain="[('routing_id', '=', bom_routing_id)]"/>
+                     </group>
+                </group>
+                <footer>
+                    <button string="Add" class="btn-primary" type="object" name="add_variants"/>
+                </footer>
+           </form>
+        </field>
+    </record>
+
+    <record id="action_mrp_bom_add" model="ir.actions.act_window">
+        <field name="name">Add to Bill of Materials</field>
+        <field name="res_model">mrp.bom.add</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="view_mrp_bom_add_form_view"/>
+        <field name="target">new</field>
+    </record>
+
+    <record id="mrp_bom_form_view_inherit" model="ir.ui.view">
+        <field name="name">mrp.bom.form.inherit</field>
+        <field name="model">mrp.bom</field>
+        <field name="inherit_id" ref="mrp.mrp_bom_form_view"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='bom_line_ids']" position="after">
+                <button string="Add Bulk" type="action" name="%(mrp_bom_add.action_mrp_bom_add)d" context="{'default_bom_id': id}"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
\ No newline at end of file
diff --git a/product_cores/__init__.py b/product_cores/__init__.py
new file mode 100644
index 00000000..09434554
--- /dev/null
+++ b/product_cores/__init__.py
@@ -0,0 +1,3 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from . import models
diff --git a/product_cores/__manifest__.py b/product_cores/__manifest__.py
new file mode 100755
index 00000000..e18a9624
--- /dev/null
+++ b/product_cores/__manifest__.py
@@ -0,0 +1,25 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+{
+    'name': 'Product Cores',
+    'author': 'Hibou Corp. <hello@hibou.io>',
+    'version': '13.0.1.0.0',
+    'category': 'Tools',
+    'license': 'OPL-1',
+    'summary': 'Charge customers core deposits.',
+    'description': """
+Charge customers core deposits.
+    """,
+    'website': 'https://hibou.io/',
+    'depends': [
+        'sale_stock',
+        'purchase',
+    ],
+    'data': [
+        'views/product_views.xml',
+        'views/purchase_views.xml',
+        'views/sale_views.xml',
+    ],
+    'installable': True,
+    'application': False,
+}
diff --git a/product_cores/models/__init__.py b/product_cores/models/__init__.py
new file mode 100644
index 00000000..b29ef4f6
--- /dev/null
+++ b/product_cores/models/__init__.py
@@ -0,0 +1,5 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from . import product
+from . import purchase
+from . import sale
diff --git a/product_cores/models/product.py b/product_cores/models/product.py
new file mode 100644
index 00000000..b88df8d9
--- /dev/null
+++ b/product_cores/models/product.py
@@ -0,0 +1,61 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo import api, fields, models
+
+
+class ProductTemplate(models.Model):
+    _inherit = 'product.template'
+
+    core_ok = fields.Boolean(string='Core')
+    product_core_service_id = fields.Many2one('product.product', string='Product Core Deposit',
+                                              compute='_compute_product_core_service',
+                                              inverse='_set_product_core_service')
+    product_core_id = fields.Many2one('product.product', string='Product Core',
+                                      compute='_compute_product_core',
+                                      inverse='_set_product_core')
+    product_core_validity = fields.Integer(string='Product Core Return Validity',
+                                           help='How long after a sale the core is eligible for return. (in days)')
+
+    @api.depends('product_variant_ids', 'product_variant_ids.product_core_service_id')
+    def _compute_product_core_service(self):
+        unique_variants = self.filtered(lambda template: len(template.product_variant_ids) == 1)
+        for template in unique_variants:
+            template.product_core_service_id = template.product_variant_ids.product_core_service_id
+        for template in (self - unique_variants):
+            template.product_core_service_id = False
+
+    @api.depends('product_variant_ids', 'product_variant_ids.product_core_id')
+    def _compute_product_core(self):
+        unique_variants = self.filtered(lambda template: len(template.product_variant_ids) == 1)
+        for template in unique_variants:
+            template.product_core_id = template.product_variant_ids.product_core_id
+        for template in (self - unique_variants):
+            template.product_core_id = False
+
+    def _set_product_core_service(self):
+        if len(self.product_variant_ids) == 1:
+            self.product_variant_ids.product_core_service_id = self.product_core_service_id
+
+    def _set_product_core(self):
+        if len(self.product_variant_ids) == 1:
+            self.product_variant_ids.product_core_id = self.product_core_id
+
+
+class ProductProduct(models.Model):
+    _inherit = 'product.product'
+
+    product_core_service_id = fields.Many2one('product.product', string='Product Core Deposit')
+    product_core_id = fields.Many2one('product.product', string='Product Core')
+
+    def get_purchase_core_service(self, vendor):
+        seller_line = self.seller_ids.filtered(lambda l: l.name == vendor and l.product_core_service_id)
+        # only want to return the first one
+        for l in seller_line:
+            return l.product_core_service_id
+        return seller_line
+
+
+class ProductSupplierinfo(models.Model):
+    _inherit = 'product.supplierinfo'
+
+    product_core_service_id = fields.Many2one('product.product', string='Product Core Deposit')
diff --git a/product_cores/models/purchase.py b/product_cores/models/purchase.py
new file mode 100644
index 00000000..8fef0a60
--- /dev/null
+++ b/product_cores/models/purchase.py
@@ -0,0 +1,64 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo import api, fields, models, _
+from odoo.exceptions import UserError
+
+
+class PurchaseOrder(models.Model):
+    _inherit = 'purchase.order'
+
+    def copy(self, default=None):
+        new_po = super(PurchaseOrder, self).copy(default=default)
+        for line in new_po.order_line.filtered(lambda l: l.product_id.core_ok and not l.core_line_id):
+            line.unlink()
+        return new_po
+
+
+class PurchaseOrderLine(models.Model):
+    _inherit = 'purchase.order.line'
+
+    core_line_id = fields.Many2one('purchase.order.line', string='Core Purchase Line', copy=False)
+
+    @api.model
+    def create(self, values):
+        res = super(PurchaseOrderLine, self).create(values)
+        other_product = res.product_id.get_purchase_core_service(res.order_id.partner_id)
+        if other_product:
+            values['product_id'] = other_product.id
+            values['name'] = other_product.name
+            values['price_unit'] = other_product.list_price
+            values['core_line_id'] = res.id
+            other_line = self.create(values)
+            other_line._compute_tax_id()
+        return res
+
+    def write(self, values):
+        res = super(PurchaseOrderLine, self).write(values)
+        if 'product_id' in values or 'product_qty' in values or 'product_uom' in values:
+            self.filtered(lambda l: not l.core_line_id)\
+                .mapped('order_id.order_line')\
+                .filtered('core_line_id')\
+                ._update_core_line()
+        return res
+
+    def unlink(self):
+        for line in self:
+            if line.core_line_id and line.core_line_id and not self.env.user.has_group('purchase.group_purchase_user'):
+                raise UserError(_('You cannot delete a core line while the original still exists.'))
+            # Unlink any linked core lines.
+            other_line = line.order_id.order_line.filtered(lambda l: l.core_line_id == line)
+            if other_line and other_line not in self:
+                other_line.write({'core_line_id': False})
+                other_line.unlink()
+        return super(PurchaseOrderLine, self).unlink()
+
+    def _update_core_line(self):
+        for line in self:
+            if line.core_line_id and line.core_line_id.product_id.get_purchase_core_service(line.order_id.partner_id):
+                line.update({
+                    'product_id': line.core_line_id.product_id.get_purchase_core_service(line.order_id.partner_id).id,
+                    'product_qty': line.core_line_id.product_qty,
+                    'product_uom': line.core_line_id.product_uom.id,
+                })
+            elif line.core_line_id:
+                line.unlink()
diff --git a/product_cores/models/sale.py b/product_cores/models/sale.py
new file mode 100644
index 00000000..327af418
--- /dev/null
+++ b/product_cores/models/sale.py
@@ -0,0 +1,68 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo import api, fields, models, _
+from odoo.exceptions import UserError
+
+
+class SaleOrder(models.Model):
+    _inherit = 'sale.order'
+
+    def copy(self, default=None):
+        new_so = super(SaleOrder, self).copy(default=default)
+        for line in new_so.order_line.filtered(lambda l: l.product_id.core_ok and not l.core_line_id):
+            line.unlink()
+        return new_so
+
+
+class SaleOrderLine(models.Model):
+    _inherit = 'sale.order.line'
+
+    core_line_id = fields.Many2one('sale.order.line', string='Core Sale Line', copy=False)
+
+    @api.model
+    def create(self, values):
+        res = super(SaleOrderLine, self).create(values)
+        if res.product_id.product_core_service_id:
+            other_product = res.product_id.product_core_service_id
+            values['product_id'] = other_product.id
+            values['name'] = other_product.name
+            values['price_unit'] = other_product.list_price
+            values['core_line_id'] = res.id
+            other_line = self.create(values)
+            other_line._compute_tax_id()
+        return res
+
+    def write(self, values):
+        res = super(SaleOrderLine, self).write(values)
+        if 'product_id' in values or 'product_uom_qty' in values or 'product_uom' in values:
+            for line in self.filtered(lambda l: not l.core_line_id):
+                line.mapped('order_id.order_line').filtered(lambda l: l.core_line_id == line)._update_core_line()
+        return res
+
+    def unlink(self):
+        for line in self:
+            if line.core_line_id and line.core_line_id and not self.env.user.has_group('sales_team.group_sale_manager'):
+                raise UserError(_('You cannot delete a core line while the original still exists.'))
+            # Unlink any linked core lines.
+            other_line = line.order_id.order_line.filtered(lambda l: l.core_line_id == line)
+            if other_line and other_line not in self:
+                other_line.write({'core_line_id': False})
+                other_line.unlink()
+        return super(SaleOrderLine, self).unlink()
+
+    def _update_core_line(self):
+        for line in self:
+            if line.core_line_id and line.core_line_id.product_id.product_core_service_id:
+                line.write({
+                    'product_id': line.core_line_id.product_id.product_core_service_id.id,
+                    'product_uom_qty': line.core_line_id.product_uom_qty,
+                    'product_uom': line.core_line_id.product_uom.id,
+                })
+            elif line.core_line_id:
+                line.unlink()
+
+    @api.depends('core_line_id.qty_delivered')
+    def _compute_qty_delivered(self):
+        super(SaleOrderLine, self)._compute_qty_delivered()
+        for line in self.filtered(lambda l: l.core_line_id):
+            line.qty_delivered = line.core_line_id.qty_delivered
diff --git a/product_cores/tests/__init__.py b/product_cores/tests/__init__.py
new file mode 100644
index 00000000..c6970af4
--- /dev/null
+++ b/product_cores/tests/__init__.py
@@ -0,0 +1,3 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from . import test_product_cores
diff --git a/product_cores/tests/test_product_cores.py b/product_cores/tests/test_product_cores.py
new file mode 100644
index 00000000..41edf769
--- /dev/null
+++ b/product_cores/tests/test_product_cores.py
@@ -0,0 +1,236 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo.tests import common, Form
+from odoo import fields
+
+
+class TestProductCores(common.TransactionCase):
+    def setUp(self):
+        super(TestProductCores, self).setUp()
+        self.customer = self.env.ref('base.res_partner_2')
+        self.vendor = self.env.ref('base.res_partner_12')
+        self.purchase_tax_physical = self.env['account.tax'].create({
+            'name': 'Purchase Tax Physical',
+            'type_tax_use': 'purchase',
+            'amount': 5.0,
+        })
+        self.purchase_tax_service = self.env['account.tax'].create({
+            'name': 'Purchase Tax Service',
+            'type_tax_use': 'purchase',
+            'amount': 1.0,
+        })
+        self.sale_tax_physical = self.env['account.tax'].create({
+            'name': 'Sale Tax Physical',
+            'type_tax_use': 'sale',
+            'amount': 5.0,
+        })
+        self.sale_tax_service = self.env['account.tax'].create({
+            'name': 'Sale Tax Service',
+            'type_tax_use': 'sale',
+            'amount': 1.0,
+        })
+        self.product = self.env['product.product'].create({
+            'name': 'Turbo',
+            'type': 'product',
+            'categ_id': self.env.ref('product.product_category_all').id,
+            'supplier_taxes_id': [(6, 0, [self.purchase_tax_physical.id])],
+            'taxes_id': [(6, 0, [self.sale_tax_physical.id])]
+        })
+        self.product_core_service = self.env['product.product'].create({
+            'name': 'Turbo Core Deposit',
+            'type': 'service',
+            'categ_id': self.env.ref('product.product_category_all').id,
+            'core_ok': True,
+            'service_type': 'manual',
+            'supplier_taxes_id': [(6, 0, [self.purchase_tax_service.id])],
+            'taxes_id': [(6, 0, [self.sale_tax_service.id])]
+        })
+        self.product_core = self.env['product.product'].create({
+            'name': 'Turbo Core',
+            'type': 'product',
+            'categ_id': self.env.ref('product.product_category_all').id,
+            'core_ok': True,
+        })
+        self.product.product_core_id = self.product_core
+        self.product.product_core_service_id = self.product_core_service
+
+    def test_01_purchase(self):
+        purchase = self.env['purchase.order'].create({
+            'partner_id': self.vendor.id,
+        })
+        test_qty = 2.0
+        po_line = self.env['purchase.order.line'].create({
+            'order_id': purchase.id,
+            'product_id': self.product.id,
+            'name': 'Test',
+            'date_planned': purchase.date_order,
+            'product_qty': test_qty,
+            'product_uom': self.product.uom_id.id,
+            'price_unit': 10.0,
+        })
+        # Compute taxes since it didn't come from being created
+        po_line._compute_tax_id()
+        # No service line should have been created.
+        self.assertEqual(len(purchase.order_line), 1)
+        po_line.unlink()
+
+        # Create a supplierinfo for this vendor with a core service product
+        self.env['product.supplierinfo'].create({
+            'name': self.vendor.id,
+            'price': 10.0,
+            'product_core_service_id': self.product_core_service.id,
+            'product_tmpl_id': self.product.product_tmpl_id.id,
+        })
+        po_line = self.env['purchase.order.line'].create({
+            'order_id': purchase.id,
+            'product_id': self.product.id,
+            'name': 'Test',
+            'date_planned': purchase.date_order,
+            'product_qty': test_qty,
+            'product_uom': self.product.uom_id.id,
+            'price_unit': 10.0,
+        })
+        po_line._compute_tax_id()
+        # Ensure second line was created
+        self.assertEqual(len(purchase.order_line), 2)
+        # Ensure second line has the same quantity
+        self.assertTrue(all(l.product_qty == test_qty for l in purchase.order_line))
+        po_line_service = purchase.order_line.filtered(lambda l: l.product_id == self.product_core_service)
+        self.assertTrue(po_line_service)
+        # Ensure correct taxes
+        self.assertEqual(po_line.taxes_id, self.purchase_tax_physical)
+        self.assertEqual(po_line_service.taxes_id, self.purchase_tax_service)
+
+        test_qty = 10.0
+        po_line.product_qty = test_qty
+        # Ensure second line has the same quantity
+        self.assertTrue(all(l.product_qty == test_qty for l in purchase.order_line))
+
+        purchase.button_confirm()
+        self.assertEqual(purchase.state, 'purchase')
+        self.assertEqual(len(purchase.picking_ids), 1)
+        purchase.picking_ids.button_validate()
+
+        # From purchase.tests.test_purchase_order_report in 13
+        f = Form(self.env['account.move'].with_context(default_type='in_invoice'))
+        f.partner_id = purchase.partner_id
+        f.purchase_id = purchase
+        vendor_bill = f.save()
+        self.assertEqual(len(vendor_bill.invoice_line_ids), 2)
+        vendor_bill.post()
+        purchase.flush()
+
+        # Duplicate PO
+        # Should not 'duplicate' the original service line
+        purchase2 = purchase.copy()
+        self.assertEqual(len(purchase2.order_line), 2)
+        po_line2 = purchase2.order_line.filtered(lambda l: l.product_id == self.product)
+        po_line_service2 = purchase2.order_line.filtered(lambda l: l.product_id == self.product_core_service)
+        self.assertTrue(po_line2)
+        self.assertTrue(po_line_service2)
+        # Should not be allowed to remove the service line.
+        # Managers can remove the service line.
+        # with self.assertRaises(UserError):
+        #     po_line_service2.unlink()
+        po_line2.unlink()
+        # Deleting the main product line should delete the service line
+        self.assertFalse(po_line2.exists())
+        self.assertFalse(po_line_service2.exists())
+
+    def test_02_sale(self):
+        # Need Inventory.
+        adjustment = self.env['stock.inventory'].create({
+            'name': 'Initial',
+            'product_ids': [(4, self.product.id)],
+        })
+        adjustment.action_start()
+        if not adjustment.line_ids:
+            adjustment_line = self.env['stock.inventory.line'].create({
+                'inventory_id': adjustment.id,
+                'product_id': self.product.id,
+                'location_id': self.env.ref('stock.warehouse0').lot_stock_id.id,
+            })
+        adjustment.line_ids.write({
+            # Maybe add Serial.
+            'product_qty': 20.0,
+        })
+        adjustment.action_validate()
+
+        sale = self.env['sale.order'].create({
+            'partner_id': self.customer.id,
+            'date_order': fields.Datetime.now(),
+            'picking_policy': 'direct',
+        })
+        test_qty = 2.0
+        so_line = self.env['sale.order.line'].create({
+            'order_id': sale.id,
+            'product_id': self.product.id,
+            'name': 'Test',
+            'product_uom_qty': test_qty,
+            'product_uom': self.product.uom_id.id,
+            'price_unit': 10.0,
+        })
+        # Compute taxes since it didn't come from being created
+        so_line._compute_tax_id()
+        # Ensure second line was created
+        self.assertEqual(len(sale.order_line), 2)
+        # Ensure second line has the same quantity
+        self.assertTrue(all(l.product_uom_qty == test_qty for l in sale.order_line))
+        so_line_service = sale.order_line.filtered(lambda l: l.product_id == self.product_core_service)
+        self.assertTrue(so_line_service)
+        # Ensure correct taxes
+        self.assertEqual(so_line.tax_id, self.sale_tax_physical)
+        self.assertEqual(so_line_service.tax_id, self.sale_tax_service)
+
+        test_qty = 1.0
+        so_line.product_uom_qty = test_qty
+        # Ensure second line has the same quantity
+        self.assertTrue(all(l.product_qty == test_qty for l in sale.order_line))
+
+        sale.action_confirm()
+        self.assertTrue(sale.state in ('sale', 'done'))
+        self.assertEqual(len(sale.picking_ids), 1)
+        self.assertEqual(len(sale.picking_ids.move_lines), 1)
+        self.assertEqual(sale.picking_ids.move_lines.product_id, self.product)
+        sale.picking_ids.action_assign()
+
+        self.assertEqual(so_line.product_uom_qty, sale.picking_ids.move_lines.reserved_availability)
+        res_dict = sale.picking_ids.button_validate()
+        wizard = self.env[(res_dict.get('res_model'))].browse(res_dict.get('res_id'))
+        wizard.process()
+        self.assertEqual(so_line.qty_delivered, so_line.product_uom_qty)
+
+        # Ensure all products are delivered.
+        self.assertTrue(all(l.product_qty == l.qty_delivered for l in sale.order_line))
+
+        # Duplicate SO
+        # Should not 'duplicate' the original service line
+        sale2 = sale.copy()
+        self.assertEqual(len(sale2.order_line), 2)
+        so_line2 = sale2.order_line.filtered(lambda l: l.product_id == self.product)
+        so_line_service2 = sale2.order_line.filtered(lambda l: l.product_id == self.product_core_service)
+        self.assertTrue(so_line2)
+        self.assertTrue(so_line_service2)
+        # Should not be allowed to remove the service line.
+        # Managers can remove the service line
+        # with self.assertRaises(UserError):
+        #     so_line_service2.unlink()
+        so_line2.unlink()
+        # Deleting the main product line should delete the service line
+        self.assertFalse(so_line2.exists())
+        self.assertFalse(so_line_service2.exists())
+
+        # Return the SO
+        self.assertEqual(len(sale.picking_ids), 1)
+        wiz = self.env['stock.return.picking'].with_context(active_model='stock.picking', active_id=sale.picking_ids.id).create({})
+        wiz._onchange_picking_id()
+        wiz.create_returns()
+        self.assertEqual(len(sale.picking_ids), 2)
+
+        return_picking = sale.picking_ids.filtered(lambda p: p.state != 'done')
+        self.assertTrue(return_picking)
+        res_dict = return_picking.button_validate()
+        wizard = self.env[(res_dict.get('res_model'))].browse(res_dict.get('res_id'))
+        wizard.process()
+
+        self.assertTrue(all(l.qty_delivered == 0.0 for l in sale.order_line))
diff --git a/product_cores/views/product_views.xml b/product_cores/views/product_views.xml
new file mode 100644
index 00000000..da7157d9
--- /dev/null
+++ b/product_cores/views/product_views.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="product_template_only_form_view_inherit" model="ir.ui.view">
+        <field name="name">product.template.product.form.inherit</field>
+        <field name="model">product.template</field>
+        <field name="inherit_id" ref="product.product_template_only_form_view"/>
+        <field name="arch" type="xml">
+            <xpath expr="//div[@name='options']" position="inside">
+                <div>
+                    <field name="core_ok"/>
+                    <label for="core_ok"/>
+                </div>
+            </xpath>
+            <xpath expr="//page[@name='inventory']" position="inside">
+                <group name="cores" string="Cores" attrs="{'invisible': [('product_variant_count', '&gt;', 1)]}">
+                    <field name="product_core_service_id" domain="[('product_tmpl_id.core_ok', '=', True)]" context="{'default_core_ok': True}"/>
+                    <field name="product_core_id" domain="[('product_tmpl_id.core_ok', '=', True)]" context="{'default_core_ok': True}"/>
+                    <field name="product_core_validity"/>
+                </group>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="product_normal_form_view_inherit" model="ir.ui.view">
+        <field name="name">product.product.form.inherit</field>
+        <field name="model">product.product</field>
+        <field name="inherit_id" ref="product.product_normal_form_view"/>
+        <field name="arch" type="xml">
+            <xpath expr="//div[@name='options']" position="inside">
+                <div>
+                    <field name="core_ok"/>
+                    <label for="core_ok"/>
+                </div>
+            </xpath>
+            <xpath expr="//page[@name='inventory']" position="inside">
+                <group name="cores" string="Cores">
+                    <field name="product_core_service_id" domain="[('product_tmpl_id.core_ok', '=', True)]" context="{'default_core_ok': True}"/>
+                    <field name="product_core_id" domain="[('product_tmpl_id.core_ok', '=', True)]" context="{'default_core_ok': True}"/>
+                    <field name="product_core_validity"/>
+                </group>
+            </xpath>
+        </field>
+    </record>
+
+    <!-- product.supplierinfo -->
+    <record id="product_supplierinfo_tree_view_inherit" model="ir.ui.view">
+        <field name="name">product.supplierinfo.tree.view.inherit</field>
+        <field name="model">product.supplierinfo</field>
+        <field name="inherit_id" ref="product.product_supplierinfo_tree_view"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='name']" position="after">
+                <field name="product_core_service_id"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="product_supplierinfo_form_view_inherit" model="ir.ui.view">
+        <field name="name">product.supplierinfo.form.view.inherit</field>
+        <field name="model">product.supplierinfo</field>
+        <field name="inherit_id" ref="product.product_supplierinfo_form_view"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='product_id']" position="after">
+                <field name="product_core_service_id"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/product_cores/views/purchase_views.xml b/product_cores/views/purchase_views.xml
new file mode 100644
index 00000000..63b8aec4
--- /dev/null
+++ b/product_cores/views/purchase_views.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="purchase_order_form_inherit" model="ir.ui.view">
+        <field name="name">purchase.order.form.inherit</field>
+        <field name="model">purchase.order</field>
+        <field name="inherit_id" ref="purchase.purchase_order_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='order_line']/tree" position="inside">
+                <field name="core_line_id" invisible="1"/>
+            </xpath>
+            <xpath expr="//field[@name='order_line']/form//field[@name='product_id']" position="after">
+                <field name="core_line_id" readonly="1" force_save="1"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/product_cores/views/sale_views.xml b/product_cores/views/sale_views.xml
new file mode 100644
index 00000000..6b2b88f7
--- /dev/null
+++ b/product_cores/views/sale_views.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="view_order_form_inherit" model="ir.ui.view">
+        <field name="name">sale.order.form.inherit</field>
+        <field name="model">sale.order</field>
+        <field name="inherit_id" ref="sale.view_order_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='order_line']/tree" position="inside">
+                <field name="core_line_id" invisible="1"/>
+            </xpath>
+            <xpath expr="//field[@name='order_line']/form//field[@name='product_id']" position="after">
+                <field name="core_line_id" readonly="1" force_save="1"/>
+            </xpath>
+            <xpath expr="//field[@name='order_line']/kanban/field[@name='product_id']" position="after">
+                <field name="core_line_id"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/project_stage/__init__.py b/project_stage/__init__.py
new file mode 100644
index 00000000..0650744f
--- /dev/null
+++ b/project_stage/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/project_stage/__manifest__.py b/project_stage/__manifest__.py
new file mode 100644
index 00000000..8582c36d
--- /dev/null
+++ b/project_stage/__manifest__.py
@@ -0,0 +1,21 @@
+{
+    'name': 'Project Stages',
+    'version': '13.0.1.0.1',
+    'author': 'Hibou Corp. <hello@hibou.io>',
+    'website': 'https://hibou.io/',
+    'license': 'AGPL-3',
+    'category': 'Tools',
+    'complexity': 'easy',
+    'description': """
+Adds stages to Projects themselves.
+    """,
+    'depends': [
+        'project',
+    ],
+    'data': [
+        'security/ir.model.access.csv',
+        'views/project_views.xml',
+    ],
+    'installable': True,
+    'auto_install': False,
+}
diff --git a/project_stage/models/__init__.py b/project_stage/models/__init__.py
new file mode 100644
index 00000000..351a3ad3
--- /dev/null
+++ b/project_stage/models/__init__.py
@@ -0,0 +1 @@
+from . import project
diff --git a/project_stage/models/project.py b/project_stage/models/project.py
new file mode 100644
index 00000000..82ad9f15
--- /dev/null
+++ b/project_stage/models/project.py
@@ -0,0 +1,27 @@
+from odoo import api, fields, models, SUPERUSER_ID
+
+
+class ProjectType(models.Model):
+    _name = 'project.type'
+    _description = 'Project Stage'
+    _order = 'sequence, id'
+
+    name = fields.Char(string='Stage Name', required=True, translate=True)
+    description = fields.Text(translate=True)
+    sequence = fields.Integer(default=1)
+    color = fields.Integer('Color Index')
+    fold = fields.Boolean(string='Folded in Kanban',
+        help='This stage is folded in the kanban view when there are no records in that stage to display.')
+
+
+class Project(models.Model):
+    _inherit = 'project.project'
+
+    stage_id = fields.Many2one('project.type', string='Stage',
+                               group_expand='_read_group_stage_ids', track_visibility='onchange', index=True)
+    stage_color = fields.Integer(related='stage_id.color')
+
+    @api.model
+    def _read_group_stage_ids(self, stages, domain, order):
+        stage_ids = stages._search([], order=order, access_rights_uid=SUPERUSER_ID)
+        return stages.browse(stage_ids)
diff --git a/project_stage/security/ir.model.access.csv b/project_stage/security/ir.model.access.csv
new file mode 100644
index 00000000..ebea85b2
--- /dev/null
+++ b/project_stage/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_project_type,access_project_type,model_project_type,base.group_user,1,0,0,0
+manage_project_type,manage_project_type,model_project_type,project.group_project_manager,1,1,1,1
\ No newline at end of file
diff --git a/project_stage/views/project_views.xml b/project_stage/views/project_views.xml
new file mode 100644
index 00000000..dad3f806
--- /dev/null
+++ b/project_stage/views/project_views.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="open_project_type_form" model="ir.actions.act_window">
+        <field name="name">Project Stages</field>
+        <field name="res_model">project.type</field>
+        <field name="view_mode">tree,kanban,form</field>
+        <field name="help" type="html">
+          <p class="oe_view_nocontent_create">
+            Click to add a stage in the project pipeline.
+          </p><p>
+            Define the steps that will be used by projects.
+          </p>
+        </field>
+    </record>
+
+    <menuitem action="open_project_type_form" id="menu_project_config_project_stage"
+              name="Project Stages"
+              parent="project.menu_project_config"
+              sequence="4"
+              groups="base.group_no_one"/>
+
+    <record id="view_project_type_kanban" model="ir.ui.view">
+        <field name="name">project.type.kanban</field>
+        <field name="model">project.type</field>
+        <field name="arch" type="xml">
+            <kanban class="o_kanban_mobile">
+                <field name="name"/>
+                <field name="fold"/>
+                <field name="description"/>
+                <templates>
+                    <t t-name="kanban-box">
+                        <div t-attf-class="oe_kanban_global_click">
+                            <div class="row">
+                                <div class="col-xs-12">
+                                    <strong><t t-esc="record.name.value"/></strong>
+                                </div>
+                            </div>
+                            <t t-if="record.description.value">
+                                <hr class="mt8 mb8"/>
+                                <t t-esc="record.description.value"/>
+                            </t>
+                        </div>
+                    </t>
+                </templates>
+            </kanban>
+        </field>
+    </record>
+
+    <record id="project_type_tree" model="ir.ui.view">
+        <field name="name">project.type.tree</field>
+        <field name="model">project.type</field>
+        <field name="arch" type="xml">
+            <tree string="Project Stage">
+                <field name="sequence" widget="handle"/>
+                <field name="name"/>
+                <field name="fold"/>
+                <field name="description"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="project_type_search" model="ir.ui.view">
+        <field name="name">project.type.search</field>
+        <field name="model">project.type</field>
+        <field name="arch" type="xml">
+            <search string="Project Stages">
+                <field name="name" string="Project Stages"/>
+            </search>
+        </field>
+    </record>
+
+    <record id="project_type_edit" model="ir.ui.view">
+        <field name="name">project.type.form</field>
+        <field name="model">project.type</field>
+        <field name="arch" type="xml">
+            <form string="Project Stage">
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                        </group>
+                        <group>
+                            <field name="fold"/>
+                            <field name="sequence" groups="base.group_no_one"/>
+                            <field name="color" groups="base.group_no_one"/>
+                        </group>
+                    </group>
+                    <group string="Stage Description and Tooltips">
+                        <p class="text-muted" colspan="2">
+                            You can also add a description to help your coworkers understand the meaning and purpose of the stage.
+                        </p>
+                        <field name="description" placeholder="Add a description..." nolabel="1" colspan="2"/>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <!-- Project -->
+    <record id="view_project_kanban_inherit" model="ir.ui.view">
+        <field name="name">project.project.kanban.inherit</field>
+        <field name="model">project.project</field>
+        <field name="inherit_id" ref="project.view_project_kanban"/>
+        <field name="arch" type="xml">
+            <!-- Add `o_kanban_small_column` to prevent strange wrapping -->
+            <xpath expr="//kanban" position="attributes">
+                <attribute name="class">o_kanban_small_column oe_background_grey o_kanban_dashboard o_project_kanban o_emphasize_colors</attribute>
+            </xpath>
+            <xpath expr="//kanban/field[@name='name']" position="after">
+                <field name="stage_id" options="{'group_by_tooltip': {'description': 'Stage Description'}}"/>
+                <field name="stage_color"/>
+            </xpath>
+            <xpath expr="//templates//span[@t-if='record.partner_id.value']" position="after">
+                <div t-if="record.stage_id.value" class="o_kanban_tags" style="margin-top: 5px;">
+                    <span t-attf-class="o_tag o_tag_color_#{record.stage_color.raw_value}" style="font-size: 110%;">
+                        <span style="width: 12px; height: 12px;"/>
+                        <em><t t-esc="record.stage_id.value"/></em>
+                    </span>
+                </div>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="edit_project_inherit" model="ir.ui.view">
+        <field name="name">project.project.form.inherit</field>
+        <field name="model">project.project</field>
+        <field name="inherit_id" ref="project.edit_project"/>
+        <field name="arch" type="xml">
+            <xpath expr="//form/sheet" position="before">
+                <header>
+                    <field name="stage_id" widget="statusbar" clickable="True" options="{'fold_field': 'fold'}"/>
+                </header>
+            </xpath>
+            <xpath expr="//field[@name='message_follower_ids']" position="after">
+                <field name="message_ids" widget="mail_thread"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="view_project_project_filter_inherit" model="ir.ui.view">
+        <field name="name">project.project.select.inherit</field>
+        <field name="model">project.project</field>
+        <field name="inherit_id" ref="project.view_project_project_filter"/>
+        <field name="arch" type="xml">
+            <xpath expr="//group" position="inside">
+                <filter string="Stage" name="group_stage" context="{'group_by': 'stage_id'}"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/project_task_line/__init__.py b/project_task_line/__init__.py
new file mode 100644
index 00000000..0650744f
--- /dev/null
+++ b/project_task_line/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/project_task_line/__manifest__.py b/project_task_line/__manifest__.py
new file mode 100644
index 00000000..17df456e
--- /dev/null
+++ b/project_task_line/__manifest__.py
@@ -0,0 +1,21 @@
+{
+    'name': 'Project Task Lines',
+    'version': '13.0.1.0.0',
+    'author': 'Hibou Corp. <hello@hibou.io>',
+    'website': 'https://hibou.io/',
+    'license': 'AGPL-3',
+    'category': 'Tools',
+    'complexity': 'easy',
+    'description': """
+Adds "todo" lines onto Project Tasks, and improves sub-tasks.
+    """,
+    'depends': [
+        'project',
+    ],
+    'data': [
+        'security/ir.model.access.csv',
+        'views/project_views.xml',
+    ],
+    'installable': True,
+    'auto_install': False,
+}
diff --git a/project_task_line/models/__init__.py b/project_task_line/models/__init__.py
new file mode 100644
index 00000000..351a3ad3
--- /dev/null
+++ b/project_task_line/models/__init__.py
@@ -0,0 +1 @@
+from . import project
diff --git a/project_task_line/models/project.py b/project_task_line/models/project.py
new file mode 100644
index 00000000..0d0f4ab7
--- /dev/null
+++ b/project_task_line/models/project.py
@@ -0,0 +1,42 @@
+from odoo import api, fields, models
+
+
+class ProjectTask(models.Model):
+    _inherit = 'project.task'
+
+    line_ids = fields.One2many('project.task.line', 'task_id', string='Todo List')
+    subtask_count_done = fields.Integer(compute='_compute_subtask_count', string="Sub-task Done count")
+
+    def _compute_subtask_count(self):
+        for task in self:
+            task.subtask_count = self.search_count([('id', 'child_of', task.id), ('id', '!=', task.id)])
+            if task.subtask_count:
+                task.subtask_count_done = self.search_count([('id', 'child_of', task.id), ('id', '!=', task.id),
+                                                             ('stage_id.fold', '=', True)])
+            else:
+                task.subtask_count_done = 0
+
+
+class ProjectTaskLine(models.Model):
+    _name = 'project.task.line'
+    _description = 'Task Todos'
+    _order = 'sequence, id asc'
+
+    task_id = fields.Many2one('project.task', required=True)
+    name = fields.Char(string='Name')
+    user_id = fields.Many2one('res.users', string='User')
+    sequence = fields.Integer(string='Sequence')
+    kanban_state = fields.Selection([
+        ('normal', 'Grey'),
+        ('done', 'Green'),
+        ('blocked', 'Red')], string='Kanban State',
+        copy=False, default='normal', required=True,
+        help="A task's kanban state indicates special situations affecting it:\n"
+             " * Grey is the default situation\n"
+             " * Red indicates something is preventing the progress of this task\n"
+             " * Green indicates the task is complete")
+
+    @api.onchange('kanban_state')
+    def _onchange_kanban_state(self):
+        if self.kanban_state == 'done':
+            self.user_id = self.env.user
diff --git a/project_task_line/security/ir.model.access.csv b/project_task_line/security/ir.model.access.csv
new file mode 100644
index 00000000..a4846d4f
--- /dev/null
+++ b/project_task_line/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_project_task_line","access_project_task_line","model_project_task_line","base.group_user",1,1,1,1
+"access_project_task_line_public","access_project_task_line public","model_project_task_line","base.group_public",1,0,0,0
\ No newline at end of file
diff --git a/project_task_line/views/project_views.xml b/project_task_line/views/project_views.xml
new file mode 100644
index 00000000..81bdf9a5
--- /dev/null
+++ b/project_task_line/views/project_views.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="view_task_form2_inherit" model="ir.ui.view">
+        <field name="name">project.task.form.inherit</field>
+        <field name="model">project.task</field>
+        <field name="inherit_id" ref="project.view_task_form2" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='subtask_count']" position="replace">
+                <div class="o_field_widget o_stat_info">
+                    <span class="o_stat_value"><field name="subtask_count_done" widget="statinfo" nolabel="1"/> / <field name="subtask_count" widget="statinfo" nolabel="1"/></span>
+                    <span class="o_stat_text">Sub-Tasks</span>
+                </div>
+            </xpath>
+            <xpath expr="//page[@name='description_page']" position="after">
+                <page name="task_lines" string="Todo List">
+                    <field name="line_ids" widget="one2many_list" context="{'default_task_id': id}">
+                        <tree>
+                            <field name="sequence" widget="handle"/>
+                            <field name="name"/>
+                            <field name="kanban_state" widget="state_selection" string="Status"/>
+                            <field name="user_id" string="Completed by" options="{'no_create': True, 'no_create_edit': True, 'no_open': True}"/>
+                        </tree>
+                    </field>
+                </page>
+            </xpath>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/rma/__init__.py b/rma/__init__.py
new file mode 100644
index 00000000..d62bb54d
--- /dev/null
+++ b/rma/__init__.py
@@ -0,0 +1,5 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from . import controllers
+from . import models
+from . import wizard
diff --git a/rma/__manifest__.py b/rma/__manifest__.py
new file mode 100644
index 00000000..8f5c7313
--- /dev/null
+++ b/rma/__manifest__.py
@@ -0,0 +1,32 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+{
+    'name': 'Hibou RMAs',
+    'version': '13.0.1.3.0',
+    'category': 'Warehouse',
+    'author': 'Hibou Corp.',
+    'license': 'OPL-1',
+    'website': 'https://hibou.io/',
+    'depends': [
+        'hibou_professional',
+        'stock',
+        'delivery',
+    ],
+    'demo': [
+        'demo/rma_demo.xml',
+    ],
+    'data': [
+        'data/cron_data.xml',
+        'data/ir_sequence_data.xml',
+        'security/ir.model.access.csv',
+        'security/rma_security.xml',
+        'views/account_views.xml',
+        'views/portal_templates.xml',
+        'views/rma_views.xml',
+        'views/stock_picking_views.xml',
+        'wizard/rma_lines_views.xml',
+    ],
+    'installable': True,
+    'application': True,
+    'auto_install': False,
+ }
diff --git a/rma/controllers/__init__.py b/rma/controllers/__init__.py
new file mode 100644
index 00000000..b4e3c98a
--- /dev/null
+++ b/rma/controllers/__init__.py
@@ -0,0 +1,4 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from . import main
+from . import portal
diff --git a/rma/controllers/main.py b/rma/controllers/main.py
new file mode 100644
index 00000000..4a87c318
--- /dev/null
+++ b/rma/controllers/main.py
@@ -0,0 +1,51 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo import http, exceptions
+from base64 import b64decode
+import hmac
+from hashlib import sha256
+from datetime import datetime
+from time import mktime
+
+
+def create_hmac(secret, a_attchment_id, e_expires):
+    return hmac.new(secret.encode(), str(str(a_attchment_id) + str(e_expires)).encode(), sha256).hexdigest()
+
+
+def check_hmac(secret, hash_, a_attachment_id, e_expires):
+    myh = hmac.new(secret.encode(), str(str(a_attachment_id) + str(e_expires)).encode(), sha256)
+    return hmac.compare_digest(str(hash_), myh.hexdigest())
+
+
+class RMAController(http.Controller):
+
+    @http.route(['/rma_label'], type='http', auth='public', website=True)
+    def index(self, *args, **request):
+        a_attachment_id = request.get('a')
+        e_expires = request.get('e')
+        hash = request.get('h')
+
+        if not all([a_attachment_id, e_expires, hash]):
+            return http.Response('Invalid Request', status=400)
+
+        now = datetime.utcnow()
+        now = int(mktime(now.timetuple()))
+
+        config = http.request.env['ir.config_parameter'].sudo()
+        secret = str(config.search([('key', '=', 'database.secret')], limit=1).value)
+
+        if not check_hmac(secret, hash, a_attachment_id, e_expires):
+            return http.Response('Invalid Request', status=400)
+
+        if now > int(e_expires):
+            return http.Response('Expired', status=404)
+
+        attachment = http.request.env['ir.attachment'].sudo().search([('id', '=', int(a_attachment_id))], limit=1)
+        if attachment:
+            data = attachment.datas
+            filename = attachment.name
+            mimetype = attachment.mimetype
+            return http.request.make_response(b64decode(data), [
+                ('Content-Type', mimetype),
+                ('Content-Disposition', 'attachment; filename="' + filename + '"')])
+        return http.Response('Invalid Attachment', status=404)
diff --git a/rma/controllers/portal.py b/rma/controllers/portal.py
new file mode 100644
index 00000000..f88c499c
--- /dev/null
+++ b/rma/controllers/portal.py
@@ -0,0 +1,137 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from collections import OrderedDict
+
+from odoo import http, fields
+from odoo.exceptions import AccessError, MissingError, ValidationError
+from odoo.http import request
+from odoo.tools.translate import _
+from odoo.addons.portal.controllers.portal import pager as portal_pager, CustomerPortal
+
+
+class CustomerPortal(CustomerPortal):
+
+    def _prepare_portal_layout_values(self):
+        values = super(CustomerPortal, self)._prepare_portal_layout_values()
+        values['rma_count'] = request.env['rma.rma'].search_count([
+        ])
+        return values
+
+    def _rma_get_page_view_values(self, rma, access_token, **kwargs):
+        values = {
+            'rma': rma,
+            'current_date': fields.Datetime.now(),
+        }
+        return self._get_page_view_values(rma, access_token, values, 'my_rma_history', True, **kwargs)
+
+    @http.route(['/my/rma', '/my/rma/page/<int:page>'], type='http', auth="user", website=True)
+    def portal_my_rma(self, page=1, date_begin=None, date_end=None, sortby=None, filterby=None, **kw):
+        values = self._prepare_portal_layout_values()
+        RMA = request.env['rma.rma']
+
+        domain = []
+        fields = ['name', 'create_date']
+
+        archive_groups = self._get_archive_groups('rma.rma', domain, fields)
+        if date_begin and date_end:
+            domain += [('create_date', '>', date_begin), ('create_date', '<=', date_end)]
+
+        searchbar_sortings = {
+            'date': {'label': _('Newest'), 'order': 'create_date desc, id desc'},
+            'name': {'label': _('Name'), 'order': 'name asc, id asc'},
+        }
+        # default sort by value
+        if not sortby:
+            sortby = 'date'
+        order = searchbar_sortings[sortby]['order']
+
+        searchbar_filters = {
+            'all': {'label': _('All'), 'domain': [('state', 'in', ['draft', 'confirmed', 'done', 'cancel'])]},
+            'draft': {'label': _('Draft'), 'domain': [('state', '=', 'draft')]},
+            'purchase': {'label': _('Confirmed'), 'domain': [('state', '=', 'confirmed')]},
+            'cancel': {'label': _('Cancelled'), 'domain': [('state', '=', 'cancel')]},
+            'done': {'label': _('Done'), 'domain': [('state', '=', 'done')]},
+        }
+        # default filter by value
+        if not filterby:
+            filterby = 'all'
+        domain += searchbar_filters[filterby]['domain']
+
+        # count for pager
+        rma_count = RMA.search_count(domain)
+        # make pager
+        pager = portal_pager(
+            url="/my/rma",
+            url_args={'date_begin': date_begin, 'date_end': date_end},
+            total=rma_count,
+            page=page,
+            step=self._items_per_page
+        )
+        # search the rmas to display, according to the pager data
+        rmas = RMA.search(
+            domain,
+            order=order,
+            limit=self._items_per_page,
+            offset=pager['offset']
+        )
+        request.session['my_rma_history'] = rmas.ids[:100]
+
+        rma_templates = request.env['rma.template'].sudo().search([('portal_ok', '=', True)])
+
+        values.update({
+            'request': request,
+            'date': date_begin,
+            'rma_list': rmas,
+            'rma_templates': rma_templates,
+            'page_name': 'rma',
+            'pager': pager,
+            'archive_groups': archive_groups,
+            'searchbar_sortings': searchbar_sortings,
+            'sortby': sortby,
+            'searchbar_filters': OrderedDict(sorted(searchbar_filters.items())),
+            'filterby': filterby,
+            'default_url': '/my/rma',
+        })
+        return request.render("rma.portal_my_rma", values)
+
+    @http.route(['/my/rma/<int:rma_id>'], type='http', auth="public", website=True)
+    def portal_my_rma_rma(self, rma_id=None, access_token=None, **kw):
+        try:
+            rma_sudo = self._document_check_access('rma.rma', rma_id, access_token=access_token)
+        except (AccessError, MissingError):
+            return request.redirect('/my')
+
+        values = self._rma_get_page_view_values(rma_sudo, access_token, **kw)
+        return request.render("rma.portal_my_rma_rma", values)
+
+    @http.route(['/my/rma/new/<int:rma_template_id>',
+                 '/my/rma/new/<int:rma_template_id>/res/<int:res_id>'], type='http', auth='public', website=True)
+    def portal_rma_new(self, rma_template_id=None, res_id=None, **kw):
+        if request.env.user.has_group('base.group_public'):
+            return request.redirect('/my')
+
+        rma_template = request.env['rma.template'].sudo().browse(rma_template_id)
+        if not rma_template.exists() or not rma_template.portal_ok:
+            return request.redirect('/my')
+
+        error = None
+        try:
+            if res_id:
+                # Even if res_id is not important to the RMA type, some sort of number
+                # should be submitted to indicate that a selection has occurred.
+                rma = rma_template._portal_try_create(request.env.user, res_id, **kw)
+                if rma:
+                    return request.redirect('/my/rma/' + str(rma.id))
+        except ValidationError as e:
+            error = e.name
+
+        template_name = rma_template._portal_template(res_id=res_id)
+        if not template_name:
+            return request.redirect('/my')
+        values = rma_template._portal_values(request.env.user, res_id=res_id)
+        values.update({
+            'request': request,
+            'error': error,
+            'current_date': fields.Datetime.now(),
+        })
+        return request.render(template_name, values)
diff --git a/rma/data/cron_data.xml b/rma/data/cron_data.xml
new file mode 100644
index 00000000..4843bf35
--- /dev/null
+++ b/rma/data/cron_data.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data noupdate="1">
+
+        <record model="ir.cron" id="rma_expire">
+            <field name="name">RMA 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_id" ref="model_rma_template"/>
+            <field name="state">code</field>
+            <field name="code">model._rma_expire()</field>
+        </record>
+
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/rma/data/ir_sequence_data.xml b/rma/data/ir_sequence_data.xml
new file mode 100644
index 00000000..b021bdee
--- /dev/null
+++ b/rma/data/ir_sequence_data.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+
+        <record id="seq_rma" model="ir.sequence">
+            <field name="name">RMA</field>
+            <field name="code">rma.rma</field>
+            <field name="prefix">RMA</field>
+            <field name="padding">3</field>
+            <field name="company_id" eval="False"/>
+        </record>
+
+    </data>
+</odoo>
diff --git a/rma/demo/rma_demo.xml b/rma/demo/rma_demo.xml
new file mode 100644
index 00000000..94f78e70
--- /dev/null
+++ b/rma/demo/rma_demo.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="template_missing_item" model="rma.template">
+        <field name="name">Missing Item</field>
+        <field name="valid_days" eval="10"/>
+        <field name="create_out_picking" eval="True"/>
+        <field name="out_type_id" ref="stock.picking_type_out"/>
+        <field name="out_location_id" ref="stock.stock_location_stock"/>
+        <field name="out_location_dest_id" ref="stock.stock_location_customers"/>
+        <field name="out_procure_method">make_to_stock</field>
+    </record>
+
+    <record id="rma_return_sequence" model="ir.sequence">
+        <field name="name">RMA Returns</field>
+        <field name="implementation">standard</field>
+        <field name="prefix">WH/RMA/</field>
+        <field name="padding" eval="5"/>
+        <field name="number_increment" eval="1"/>
+    </record>
+
+    <record id="picking_type_rma_return" model="stock.picking.type">
+        <field name="name">RMA Receipts</field>
+        <field name="sequence_code">WH/RMA</field>
+        <field name="sequence_id" ref="rma_return_sequence"/>
+        <field name="warehouse_id" ref="stock.warehouse0"/>
+        <field name="code">incoming</field>
+        <field name="show_operations" eval="False"/>
+        <field name="show_reserved" eval="True"/>
+        <field name="use_create_lots" eval="False"/>
+        <field name="use_existing_lots" eval="True"/>
+        <field name="default_location_dest_id" ref="stock.stock_location_stock"/>
+    </record>
+
+    <record id="template_picking_return" model="rma.template">
+        <field name="name">Picking Return</field>
+        <field name="usage">stock_picking</field>
+        <field name="valid_days" eval="10"/>
+        <field name="create_in_picking" eval="True"/>
+        <field name="in_type_id" ref="picking_type_rma_return"/>
+        <field name="in_location_id" ref="stock.stock_location_customers"/>
+        <field name="in_location_dest_id" ref="stock.stock_location_stock"/>
+        <field name="in_procure_method">make_to_stock</field>
+        <field name="in_require_return" eval="True"/>
+    </record>
+
+    <record id="template_rtv" model="rma.template">
+        <field name="name">Return To Vendor</field>
+        <field name="create_out_picking" eval="True"/>
+        <field name="out_type_id" ref="stock.picking_type_out"/>
+        <field name="out_location_id" ref="stock.stock_location_stock"/>
+        <field name="out_location_dest_id" ref="stock.stock_location_suppliers"/>
+        <field name="out_procure_method">make_to_stock</field>
+        <field name="invoice_done" eval="True"/>
+    </record>
+
+</odoo>
\ No newline at end of file
diff --git a/rma/migrations/13.0.1.2.0/post-migration.py b/rma/migrations/13.0.1.2.0/post-migration.py
new file mode 100644
index 00000000..d00872a4
--- /dev/null
+++ b/rma/migrations/13.0.1.2.0/post-migration.py
@@ -0,0 +1,11 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+def migrate(cr, installed_version):
+    # Provide defaults for RMAs that were created before these fields existed.
+    cr.execute('''
+UPDATE rma_rma as r
+SET initial_in_picking_carrier_id = t.in_carrier_id ,
+    initial_out_picking_carrier_id = t.out_carrier_id
+FROM rma_template as t
+WHERE r.template_id = t.id
+    ''')
diff --git a/rma/models/__init__.py b/rma/models/__init__.py
new file mode 100644
index 00000000..4577f1ec
--- /dev/null
+++ b/rma/models/__init__.py
@@ -0,0 +1,5 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from . import account
+from . import rma
+from . import stock_picking
diff --git a/rma/models/account.py b/rma/models/account.py
new file mode 100644
index 00000000..53d634b6
--- /dev/null
+++ b/rma/models/account.py
@@ -0,0 +1,13 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo import fields, models
+
+
+class AccountMove(models.Model):
+    _inherit = 'account.move'
+
+    rma_ids = fields.Many2many('rma.rma',
+                               'rma_invoice_rel',
+                               'invoice_id',
+                               'rma_id',
+                               string='RMAs')
diff --git a/rma/models/rma.py b/rma/models/rma.py
new file mode 100644
index 00000000..cdce249c
--- /dev/null
+++ b/rma/models/rma.py
@@ -0,0 +1,672 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo import api, fields, models, _
+from odoo.exceptions import UserError, ValidationError
+from ..controllers.main import create_hmac
+from datetime import timedelta, datetime
+from time import mktime
+
+
+class RMATemplate(models.Model):
+    _name = 'rma.template'
+    _description = 'RMA Template'
+
+    name = fields.Char(string='Name')
+    usage = fields.Selection([
+        ('stock_picking', 'Stock Picking'),
+    ], string='Applies To')
+    description = fields.Html(string='Internal Instructions')
+    customer_description = fields.Html(string='Customer Instructions')
+    valid_days = fields.Integer(string='Expire in Days')
+    automatic_expire = fields.Boolean('Automatic Expire',
+                                      help='RMAs with this template will automatically '
+                                           'expire when past their expiration date.')
+    invoice_done = fields.Boolean(string='Invoice on Completion')
+
+    create_in_picking = fields.Boolean(string='Create Inbound Picking')
+    create_out_picking = fields.Boolean(string='Create Outbound Picking')
+
+    in_type_id = fields.Many2one('stock.picking.type', string='Inbound Picking Type')
+    out_type_id = fields.Many2one('stock.picking.type', string='Outbound Picking Type')
+
+    in_location_id = fields.Many2one('stock.location', string='Inbound Source Location')
+    in_location_dest_id = fields.Many2one('stock.location', string='Inbound Destination Location')
+    in_carrier_id = fields.Many2one('delivery.carrier', string='Inbound Carrier')
+    in_require_return = fields.Boolean(string='Inbound Require return of picking')
+    in_procure_method = fields.Selection([
+        ('make_to_stock', 'Take from Stock'),
+        ('make_to_order', 'Apply Procurements')
+        ], string="Inbound Procurement Method", default='make_to_stock')
+    in_to_refund = fields.Boolean(string='Inbound Mark Refund')
+
+    out_location_id = fields.Many2one('stock.location', string='Outbound Source Location')
+    out_location_dest_id = fields.Many2one('stock.location', string='Outbound Destination Location')
+    out_carrier_id = fields.Many2one('delivery.carrier', string='Outbound Carrier')
+    out_require_return = fields.Boolean(string='Outbound Require picking to duplicate')
+    out_procure_method = fields.Selection([
+        ('make_to_stock', 'Take from Stock'),
+        ('make_to_order', 'Apply Procurements')
+        ], string="Outbound Procurement Method", default='make_to_stock')
+    out_to_refund = fields.Boolean(string='Outbound Mark Refund')
+    portal_ok = fields.Boolean(string='Allow on Portal')
+    company_id = fields.Many2one('res.company', 'Company')
+    responsible_user_ids = fields.Many2many('res.users', string='Responsible Users',
+                                            help='Users that get activities when creating RMA.')
+    next_rma_template_id = fields.Many2one('rma.template', string='Next RMA Template')
+
+    def _portal_try_create(self, request_user, res_id, **kw):
+        if self.usage == 'stock_picking':
+            prefix = 'move_'
+            move_map = {int(key[len(prefix):]): float(kw[key]) for key in kw if key.find(prefix) == 0 and kw[key]}
+            if move_map:
+                picking = self.env['stock.picking'].browse(res_id)
+                if picking.partner_id != request_user.partner_id:
+                    raise ValidationError('Invalid user for picking.')
+                lines = []
+                for move_id, qty in move_map.items():
+                    move = picking.move_lines.filtered(lambda l: l.id == move_id)
+                    if move:
+                        if not qty:
+                            continue
+                        if qty < 0.0 or move.quantity_done < qty:
+                            raise ValidationError('Invalid quantity.')
+                        lines.append((0, 0, {
+                            'product_id': move.product_id.id,
+                            'product_uom_id': move.product_uom.id,
+                            'product_uom_qty': qty,
+                        }))
+                if not lines:
+                    raise ValidationError('Missing product quantity.')
+                rma = self.env['rma.rma'].create({
+                    'name': _('New'),
+                    'stock_picking_id': picking.id,
+                    'template_id': self.id,
+                    'partner_id': request_user.partner_id.id,
+                    'partner_shipping_id': request_user.partner_id.id,
+                    'lines': lines,
+                })
+                return rma
+
+    def _portal_template(self, res_id=None):
+        if self.usage == 'stock_picking':
+            return 'rma.portal_new_stock_picking'
+
+    def _portal_values(self, request_user, res_id=None):
+        if self.usage == 'stock_picking':
+            picking = None
+            pickings = None
+            if res_id:
+                picking = self.env['stock.picking'].browse(res_id)
+                if picking.partner_id != request_user.partner_id:
+                    picking = None
+            else:
+                pickings = self.env['stock.picking'].search([('partner_id', '=', request_user.partner_id.id)], limit=100)
+            return {
+                'rma_template': self,
+                'pickings': pickings,
+                'picking': picking,
+            }
+
+    def _values_for_in_picking(self, rma):
+        return {
+            'origin': rma.name,
+            'partner_id': rma.partner_shipping_id.id,
+            'picking_type_id': self.in_type_id.id,
+            'location_id': self.in_location_id.id,
+            'location_dest_id': self.in_location_dest_id.id,
+            'carrier_id': rma.initial_in_picking_carrier_id.id,
+            'move_lines': [(0, None, {
+                'name': rma.name + ' IN: ' + l.product_id.name_get()[0][1],
+                'product_id': l.product_id.id,
+                'product_uom_qty': l.product_uom_qty,
+                'product_uom': l.product_uom_id.id,
+                'procure_method': self.in_procure_method,
+                'to_refund': self.in_to_refund,
+            }) for l in rma.lines.filtered(lambda l: l.product_id.type != 'service')],
+        }
+
+    def _values_for_out_picking(self, rma):
+        return {
+            'origin': rma.name,
+            'partner_id': rma.partner_shipping_id.id,
+            'picking_type_id': self.out_type_id.id,
+            'location_id': self.out_location_id.id,
+            'location_dest_id': self.out_location_dest_id.id,
+            'carrier_id': rma.initial_out_picking_carrier_id.id,
+            'move_lines': [(0, None, {
+                'name': rma.name + ' OUT: ' + l.product_id.name_get()[0][1],
+                'product_id': l.product_id.id,
+                'product_uom_qty': l.product_uom_qty,
+                'product_uom': l.product_uom_id.id,
+                'procure_method': self.out_procure_method,
+                'to_refund': self.out_to_refund,
+            }) for l in rma.lines.filtered(lambda l: l.product_id.type != 'service')],
+        }
+
+    def _schedule_responsible_activities(self, rma):
+        model_id = self.env['ir.model']._get(rma._name).id
+        activity_to_write = []
+        for user in self.responsible_user_ids:
+            if rma.with_user(user).check_access_rights('read', raise_exception=False):
+                activity_to_write.append((0, 0, {
+                    'res_id': rma.id,
+                    'res_model_id': model_id,
+                    'summary': 'Review New RMA',
+                    'activity_type_id': False,
+                    'user_id': user.id,
+                }))
+        if activity_to_write:
+            rma.write({
+                'activity_ids': activity_to_write,
+            })
+
+    def _rma_expire(self):
+        templates = self.sudo().search([('automatic_expire', '=', True)])
+        if not templates:
+            return True
+        rmas = self.env['rma.rma'].sudo().search([
+            ('template_id', 'in', templates.ids),
+            ('state', 'in', ('draft', 'confirmed',)),
+            ('validity_date', '<', fields.Datetime.now())
+        ])
+        if rmas:
+            return rmas._action_expire()
+        return True
+
+
+class RMATag(models.Model):
+    _name = "rma.tag"
+    _description = "RMA Tag"
+
+    name = fields.Char('Tag Name', required=True)
+    color = fields.Integer('Color Index')
+
+    _sql_constraints = [
+        ('name_uniq', 'unique (name)', "Tag name already exists !"),
+    ]
+
+
+class RMA(models.Model):
+    _name = 'rma.rma'
+    _inherit = ['portal.mixin', 'mail.thread', 'mail.activity.mixin']
+    _description = 'RMA'
+    _order = 'id desc'
+    _mail_post_access = 'read'
+
+    name = fields.Char(string='Number', copy=False)
+    state = fields.Selection([
+            ('draft', 'New'),
+            ('confirmed', 'Confirmed'),
+            ('done', 'Done'),
+            ('expired', 'Expired'),
+            ('cancel', 'Cancelled'),
+        ], string='State', default='draft', copy=False)
+    company_id = fields.Many2one('res.company', 'Company')
+    parent_id = fields.Many2one('rma.rma')
+    template_id = fields.Many2one('rma.template', string='Type', required=True)
+    template_create_in_picking = fields.Boolean(related='template_id.create_in_picking')
+    template_create_out_picking = fields.Boolean(related='template_id.create_out_picking')
+
+    stock_picking_id = fields.Many2one('stock.picking', string='Stock Picking')
+    stock_picking_rma_count = fields.Integer('Number of RMAs for this Picking', compute='_compute_stock_picking_rma_count')
+    partner_id = fields.Many2one('res.partner', string='Partner')
+    partner_shipping_id = fields.Many2one('res.partner', string='Shipping')
+    lines = fields.One2many('rma.line', 'rma_id', string='Lines')
+    tag_ids = fields.Many2many('rma.tag', 'rma_tags_rel', 'rma_id', 'tag_id', string='Tags')
+    description = fields.Html(string='Internal Instructions', related='template_id.description')
+    customer_description = fields.Html(string='Customer Instructions', related='template_id.customer_description')
+    template_usage = fields.Selection(string='Template Usage', related='template_id.usage')
+    validity_date = fields.Datetime(string='Expiration Date')
+    claim_number = fields.Char(string='Claim Number')
+    invoice_ids = fields.Many2many('account.move',
+                                   'rma_invoice_rel',
+                                   'rma_id',
+                                   'invoice_id',
+                                   string='Invoices')
+
+    initial_in_picking_carrier_id = fields.Many2one('delivery.carrier', string='In Delivery Method')
+    initial_out_picking_carrier_id = fields.Many2one('delivery.carrier', string='Out Delivery Method')
+
+    in_picking_id = fields.Many2one('stock.picking', string='Inbound Picking', copy=False)
+    out_picking_id = fields.Many2one('stock.picking', string='Outbound Picking', copy=False)
+
+    in_picking_state = fields.Selection(string='In Picking State', related='in_picking_id.state')
+    out_picking_state = fields.Selection(string='Out Picking State', related='out_picking_id.state')
+
+    in_picking_carrier_id = fields.Many2one('delivery.carrier', related='in_picking_id.carrier_id', readonly=False)
+    out_picking_carrier_id = fields.Many2one('delivery.carrier', related='out_picking_id.carrier_id', readonly=False)
+
+    in_carrier_tracking_ref = fields.Char(related='in_picking_id.carrier_tracking_ref')
+    in_label_url = fields.Char(compute='_compute_in_label_url')
+    out_carrier_tracking_ref = fields.Char(related='out_picking_id.carrier_tracking_ref')
+
+
+    def _compute_access_url(self):
+        super(RMA, self)._compute_access_url()
+        for rma in self:
+            rma.access_url = '/my/rma/%s' % (rma.id)
+
+    @api.onchange('template_id')
+    def _onchange_template_id(self):
+        for rma in self:
+            rma.initial_in_picking_carrier_id = rma.template_id.in_carrier_id
+            rma.initial_out_picking_carrier_id = rma.template_id.out_carrier_id
+
+    @api.onchange('template_usage')
+    def _onchange_template_usage(self):
+        now = datetime.now()
+        for rma in self:
+            if rma.template_id.valid_days:
+                rma.validity_date = now + timedelta(days=rma.template_id.valid_days)
+            if rma.template_usage != 'stock_picking':
+                rma.stock_picking_id = False
+
+    @api.onchange('stock_picking_id')
+    def _onchange_stock_picking_id(self):
+        for rma in self.filtered(lambda rma: rma.stock_picking_id):
+            rma.partner_id = rma.stock_picking_id.partner_id
+            rma.partner_shipping_id = rma.stock_picking_id.partner_id
+
+    @api.onchange('in_carrier_tracking_ref', 'validity_date')
+    def _compute_in_label_url(self):
+        config = self.env['ir.config_parameter'].sudo()
+        secret = config.search([('key', '=', 'database.secret')], limit=1)
+        secret = str(secret.value) if secret else ''
+        base_url = config.search([('key', '=', 'web.base.url')], limit=1)
+        base_url = str(base_url.value) if base_url else ''
+        for rma in self:
+            if not rma.in_picking_id:
+                rma.in_label_url = ''
+                continue
+            if rma.validity_date:
+                e_expires = int(mktime(fields.Datetime.from_string(rma.validity_date).timetuple()))
+            else:
+                year = datetime.now() + timedelta(days=365)
+                e_expires = int(mktime(year.timetuple()))
+            attachment = self.env['ir.attachment'].search([
+                ('res_model', '=', 'stock.picking'),
+                ('res_id', '=', rma.in_picking_id.id),
+                ('name', 'like', 'Label%')], limit=1)
+            if not attachment:
+                rma.in_label_url = ''
+                continue
+            rma.in_label_url = base_url + '/rma_label?a=' + \
+                str(attachment.id) + '&e=' + str(e_expires) + \
+                '&h=' + create_hmac(secret, attachment.id, e_expires)
+
+    @api.depends('stock_picking_id')
+    def _compute_stock_picking_rma_count(self):
+        for rma in self:
+            if rma.stock_picking_id:
+                rma_data = self.read_group([('stock_picking_id', '=', rma.stock_picking_id.id), ('state', '!=', 'cancel')],
+                                           ['stock_picking_id'], ['stock_picking_id'])
+                if rma_data:
+                    rma.stock_picking_rma_count = rma_data[0]['stock_picking_id_count']
+            else:
+                rma.stock_picking_rma_count = 0.0
+
+    def open_stock_picking_rmas(self):
+        return {
+            'type': 'ir.actions.act_window',
+            'name': _('Picking RMAs'),
+            'res_model': 'rma.rma',
+            'view_mode': 'tree,form',
+            'context': {'search_default_stock_picking_id': self[0].stock_picking_id.id}
+        }
+
+    def _action_expire(self):
+        pickings_to_cancel = self.env['stock.picking']
+        rmas = self.filtered(lambda rma: rma.in_picking_state != 'done' and rma.out_picking_state != 'done')
+        pickings_to_cancel += rmas.filtered(lambda r: r.in_picking_id).mapped('in_picking_id')
+        pickings_to_cancel += rmas.filtered(lambda r: r.out_picking_id).mapped('out_picking_id')
+        pickings_to_cancel.action_cancel()
+        rmas.write({'state': 'expired'})
+        return True
+
+    @api.model
+    def create(self, vals):
+        if vals.get('name', _('New')) == _('New'):
+            if 'company_id' in vals:
+                vals['name'] = self.env['ir.sequence'].with_context(force_company=vals['company_id']).next_by_code('rma.rma') or _('New')
+            else:
+                vals['name'] = self.env['ir.sequence'].next_by_code('rma.rma') or _('New')
+
+        # Provide defaults on create (e.g. from portal)
+        if vals.get('template_id'):
+            template = self.env['rma.template'].browse(vals.get('template_id'))
+            if 'initial_in_picking_carrier_id' not in vals:
+                vals['initial_in_picking_carrier_id'] = template.in_carrier_id.id
+            if 'initial_out_picking_carrier_id' not in vals:
+                vals['initial_out_picking_carrier_id'] = template.out_carrier_id.id
+            if template.valid_days and 'validity_date' not in vals:
+                now = datetime.now()
+                vals['validity_date'] = now + timedelta(days=template.valid_days)
+
+        result = super(RMA, self).create(vals)
+        result.template_id._schedule_responsible_activities(result)
+        return result
+
+    def action_confirm(self):
+        for rma in self:
+            in_picking_id = False
+            out_picking_id = False
+            if any((not rma.template_id, not rma.lines, not rma.partner_id, not rma.partner_shipping_id)):
+                raise UserError(_('You can only confirm RMAs with lines, and partner information.'))
+            if rma.template_id.create_in_picking:
+                in_picking_id = rma._create_in_picking()
+                if in_picking_id:
+                    in_picking_id.action_confirm()
+                    in_picking_id.action_assign()
+            if rma.template_id.create_out_picking:
+                out_picking_id = rma._create_out_picking()
+                if out_picking_id:
+                    out_picking_id.action_confirm()
+                    out_picking_id.action_assign()
+            rma.write({'state': 'confirmed',
+                       'in_picking_id': in_picking_id.id if in_picking_id else False,
+                       'out_picking_id': out_picking_id.id if out_picking_id else False})
+
+    def _next_rma_values(self):
+        return {
+            'template_id': self.template_id.next_rma_template_id.id,
+            # Partners should be set when confirming or using the RTV wizard
+            # 'partner_id': self.partner_id.id,
+            # 'partner_shipping_id': self.partner_shipping_id.id,
+            'parent_id': self.id,
+            'lines': [(0, 0, {
+                'product_id': l.product_id.id,
+                'product_uom_id': l.product_uom_id.id,
+                'product_uom_qty': l.product_uom_qty,
+            }) for l in self.lines]
+        }
+
+    def _next_rma(self):
+        if self.template_id.next_rma_template_id:
+            # currently we do not want to automatically confirm them
+            # this is because we want to mass confirm and set picking to one partner/vendor
+            _ = self.create(self._next_rma_values())
+
+    def action_done(self):
+        for rma in self:
+            if rma.in_picking_id and rma.in_picking_id.state not in ('done', 'cancel'):
+                raise UserError(_('Inbound picking not complete or cancelled.'))
+            if rma.out_picking_id and rma.out_picking_id.state not in ('done', 'cancel'):
+                raise UserError(_('Outbound picking not complete or cancelled.'))
+        self.write({'state': 'done'})
+        self._done_invoice()
+        self._next_rma()
+
+    def _done_invoice(self):
+        for rma in self.filtered(lambda r: r.template_id.invoice_done):
+            # If you do NOT want to take part in the default invoicing functionality
+            # then your usage method (e.g. _invoice_values_sale_order) should be
+            # defined, and return nothing or extend _invoice_values to do the same
+            usage = rma.template_usage or ''
+            if hasattr(rma, '_invoice_values_' + usage):
+                values = getattr(rma, '_invoice_values_' + usage)()
+            else:
+                values = rma._invoice_values()
+            if values:
+                if hasattr(rma, '_invoice_' + usage):
+                    getattr(rma, '_invoice_' + usage)(values)
+                else:
+                    rma._invoice(values)
+
+    def _invoice(self, invoice_values):
+        self.invoice_ids += self.env['account.move'].with_context(default_type=invoice_values['type']).create(
+                invoice_values)
+
+    def _invoice_values(self):
+        self.ensure_one()
+        # special case for vendor return
+        supplier = self._context.get('rma_supplier')
+        if supplier is None and self.out_picking_id and self.out_picking_id.location_dest_id.usage == 'supplier':
+            supplier = True
+
+        fiscal_position_id = self.env['account.fiscal.position'].get_fiscal_position(
+            self.partner_id.id, delivery_id=self.partner_shipping_id.id)
+
+        invoice_values = {
+            'type': 'in_refund' if supplier else 'out_refund',
+            'partner_id': self.partner_id.id,
+            'fiscal_position_id': fiscal_position_id,
+        }
+
+        line_commands = []
+        for rma_line in self.lines:
+            product = rma_line.product_id
+            accounts = product.product_tmpl_id.get_product_accounts()
+            account = accounts['expense'] if supplier else accounts['income']
+            qty = rma_line.product_uom_qty
+            uom = rma_line.product_uom_id
+            price = product.standard_price if supplier else product.lst_price
+            if uom != product.uom_id:
+                price = product.uom_id._compute_price(price, uom)
+            line_commands.append((0, 0, {
+                'product_id': product.id,
+                'product_uom_id': uom.id,
+                'name': product.name,
+                'price_unit': price,
+                'quantity': qty,
+                'account_id': account.id,
+                'tax_ids': [(6, 0, product.taxes_id.ids)],
+            }))
+        if line_commands:
+            invoice_values['invoice_line_ids'] = line_commands
+        return invoice_values
+
+    def action_cancel(self):
+        for rma in self:
+            rma.in_picking_id.action_cancel()
+            rma.out_picking_id.action_cancel()
+        self.write({'state': 'cancel'})
+
+    def action_draft(self):
+        self.filtered(lambda l: l.state in ('cancel', 'expired')).write({
+            'state': 'draft', 'in_picking_id': False, 'out_picking_id': False})
+
+    def _create_in_picking(self):
+        if self._context.get('rma_in_picking_id'):
+            # allow passing/setting by context to allow many RMA's to include the same pickings
+            return self.env['stock.picking'].browse(self._context.get('rma_in_picking_id'))
+        if self.template_usage and hasattr(self, '_create_in_picking_' + self.template_usage):
+            return getattr(self, '_create_in_picking_' + self.template_usage)()
+        values = self.template_id._values_for_in_picking(self)
+        return self.env['stock.picking'].sudo().create(values)
+
+    def _create_out_picking(self):
+        if self._context.get('rma_out_picking_id'):
+            # allow passing/setting by context to allow many RMA's to include the same pickings
+            return self.env['stock.picking'].browse(self._context.get('rma_out_picking_id'))
+        if self.template_usage and hasattr(self, '_create_out_picking_' + self.template_usage):
+            return getattr(self, '_create_out_picking_' + self.template_usage)()
+        values = self.template_id._values_for_out_picking(self)
+        return self.env['stock.picking'].sudo().create(values)
+
+    def _find_candidate_return_picking(self, product_ids, pickings, location_id):
+        done_pickings = pickings.filtered(lambda p: p.state == 'done' and p.location_dest_id.id == location_id)
+        for p in done_pickings:
+            p_product_ids = p.move_lines.filtered(lambda l: l.state == 'done').mapped('product_id.id')
+            if set(product_ids) & set(p_product_ids) == set(product_ids):
+                return p
+        return None
+
+    def action_in_picking_send_to_shipper(self):
+        for rma in self:
+            if rma.in_picking_id and rma.in_picking_carrier_id:
+                rma.in_picking_id.send_to_shipper()
+
+    def action_add_picking_lines(self):
+        make_line_obj = self.env['rma.picking.make.lines']
+        for rma in self:
+            lines = make_line_obj.create({
+                'rma_id': rma.id,
+            })
+            action = self.env.ref('rma.action_rma_add_lines').read()[0]
+            action['res_id'] = lines.id
+            return action
+
+    def unlink(self):
+        for rma in self:
+            if rma.state not in ('draft'):
+                raise UserError(_('You can not delete a non-draft RMA.'))
+        return super(RMA, self).unlink()
+
+    def _picking_from_values(self, values, values_update, move_line_values_update):
+        values.update(values_update)
+        move_lines = []
+        for l1, l2, vals in values['move_lines']:
+            vals.update(move_line_values_update)
+            move_lines.append((l1, l2, vals))
+        values['move_lines'] = move_lines
+        return self.env['stock.picking'].sudo().create(values)
+
+    def _new_in_picking(self, old_picking):
+        new_picking = old_picking.copy({
+            'move_lines': [],
+            'picking_type_id': self.template_id.in_type_id.id,
+            'state': 'draft',
+            'origin': old_picking.name + ' ' + self.name,
+            'location_id': self.template_id.in_location_id.id,
+            'location_dest_id': self.template_id.in_location_dest_id.id,
+            'carrier_id': self.initial_in_picking_carrier_id.id,
+            'carrier_tracking_ref': False,
+            'carrier_price': False
+        })
+        new_picking.message_post_with_view('mail.message_origin_link',
+                                           values={'self': new_picking, 'origin': self},
+                                           subtype_id=self.env.ref('mail.mt_note').id)
+        return new_picking
+
+    def _new_in_move_vals(self, rma_line, new_picking, old_move):
+        return {
+                'name': self.name + ' IN: ' + rma_line.product_id.name_get()[0][1],
+                'product_id': rma_line.product_id.id,
+                'product_uom_qty': rma_line.product_uom_qty,
+                'product_uom': rma_line.product_uom_id.id,
+                'picking_id': new_picking.id,
+                'state': 'draft',
+                'location_id': old_move.location_dest_id.id,
+                'location_dest_id': self.template_id.in_location_dest_id.id,
+                'picking_type_id': new_picking.picking_type_id.id,
+                'warehouse_id': new_picking.picking_type_id.warehouse_id.id,
+                'origin_returned_move_id': old_move.id,
+                'procure_method': self.template_id.in_procure_method,
+                'to_refund': self.template_id.in_to_refund,
+            }
+
+    def _new_in_moves(self, old_picking, new_picking, move_update):
+        lines = self.lines.filtered(lambda l: l.product_uom_qty >= 1)
+        if not lines:
+            raise UserError(_('You have no lines with positive quantity.'))
+
+        moves = self.env['stock.move']
+        for l in lines:
+            return_move = old_picking.move_lines.filtered(lambda ol: ol.state == 'done' and ol.product_id.id == l.product_id.id)[0]
+            copy_vals = self._new_in_move_vals(l, new_picking, return_move)
+            copy_vals.update(move_update)
+            r = return_move.copy(copy_vals)
+            vals = {}
+            # +--------------------------------------------------------------------------------------------------------+
+            # |       picking_pick     <--Move Orig--    picking_pack     --Move Dest-->   picking_ship
+            # |              | returned_move_ids              ↑                                  | returned_move_ids
+            # |              ↓                                | return_line.move_id              ↓
+            # |       return pick(Add as dest)          return toLink                    return ship(Add as orig)
+            # +--------------------------------------------------------------------------------------------------------+
+            move_orig_to_link = return_move.move_dest_ids.mapped('returned_move_ids')
+            move_dest_to_link = return_move.move_orig_ids.mapped('returned_move_ids')
+            vals['move_orig_ids'] = [(4, m.id) for m in move_orig_to_link | return_move]
+            vals['move_dest_ids'] = [(4, m.id) for m in move_dest_to_link]
+            r.write(vals)
+            moves += r
+        return moves
+
+    def _new_out_picking(self, old_picking):
+        new_picking = old_picking.copy({
+            'move_lines': [],
+            'picking_type_id': self.template_id.out_type_id.id,
+            'state': 'draft',
+            'origin': old_picking.name + ' ' + self.name,
+            'location_id': self.template_id.out_location_id.id,
+            'location_dest_id': self.template_id.out_location_dest_id.id,
+            'carrier_id': self.initial_out_picking_carrier_id.id,
+            'carrier_tracking_ref': False,
+            'carrier_price': False
+        })
+        new_picking.message_post_with_view('mail.message_origin_link',
+                                           values={'self': new_picking, 'origin': self},
+                                           subtype_id=self.env.ref('mail.mt_note').id)
+        return new_picking
+
+    def _new_out_move_vals(self, rma_line, new_picking, old_move):
+        return {
+                'name': self.name + ' OUT: ' + rma_line.product_id.name_get()[0][1],
+                'product_id': rma_line.product_id.id,
+                'product_uom_qty': rma_line.product_uom_qty,
+                'picking_id': new_picking.id,
+                'state': 'draft',
+                'location_id': self.template_id.out_location_id.id,
+                'location_dest_id': self.template_id.out_location_dest_id.id,
+                'picking_type_id': new_picking.picking_type_id.id,
+                'warehouse_id': new_picking.picking_type_id.warehouse_id.id,
+                'origin_returned_move_id': False,
+                'procure_method': self.template_id.out_procure_method,
+                'to_refund': self.template_id.out_to_refund,
+            }
+
+    def _new_out_moves(self, old_picking, new_picking, move_update):
+        lines = self.lines.filtered(lambda l: l.product_uom_qty >= 1)
+        if not lines:
+            raise UserError(_('You have no lines with positive quantity.'))
+        moves = self.env['stock.move']
+        for l in lines:
+            return_move = old_picking.move_lines.filtered(lambda ol: ol.state == 'done' and ol.product_id.id == l.product_id.id)[0]
+            copy_vals = self._new_out_move_vals(l, new_picking, return_move)
+            copy_vals.update(move_update)
+            moves += return_move.copy(copy_vals)
+        return moves
+
+    def _create_in_picking_stock_picking(self):
+        if not self.stock_picking_id or self.stock_picking_id.state != 'done':
+            raise UserError(_('You must have a completed stock picking for this RMA.'))
+        if not self.template_id.in_require_return:
+            group_id = self.stock_picking_id.group_id.id if self.stock_picking_id.group_id else 0
+            values = self.template_id._values_for_in_picking(self)
+            update = {'group_id': group_id}
+            return self._picking_from_values(values, update, update)
+
+        old_picking = self.stock_picking_id
+
+        new_picking = self._new_in_picking(old_picking)
+        self._new_in_moves(old_picking, new_picking, {})
+        return new_picking
+
+    def _create_out_picking_stock_picking(self):
+        if not self.stock_picking_id or self.stock_picking_id.state != 'done':
+            raise UserError(_('You must have a completed stock picking for this RMA.'))
+        if not self.template_id.out_require_return:
+            group_id = self.stock_picking_id.group_id.id if self.stock_picking_id.group_id else 0
+            values = self.template_id._values_for_out_picking(self)
+            update = {'group_id': group_id}
+            return self._picking_from_values(values, update, update)
+
+        old_picking = self.stock_picking_id
+        new_picking = self._new_out_picking(old_picking)
+        self._new_out_moves(old_picking, new_picking, {})
+        return new_picking
+
+
+class RMALine(models.Model):
+    _name = 'rma.line'
+    _description = 'RMA Line'
+
+    rma_id = fields.Many2one('rma.rma', string='RMA')
+    product_id = fields.Many2one('product.product', 'Product')
+    product_uom_id = fields.Many2one('uom.uom', 'UOM')
+    product_uom_qty = fields.Float(string='QTY')
+    rma_template_usage = fields.Selection(related='rma_id.template_usage')
+
+    @api.onchange('product_id')
+    def _onchange_product_id(self):
+        for line in self:
+            line.product_uom_id = line.product_id.uom_id
diff --git a/rma/models/stock_picking.py b/rma/models/stock_picking.py
new file mode 100644
index 00000000..0b31801d
--- /dev/null
+++ b/rma/models/stock_picking.py
@@ -0,0 +1,26 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo import api, models, _
+
+
+class StockPicking(models.Model):
+    _inherit = 'stock.picking'
+
+    def send_to_shipper(self):
+        res = False
+        for pick in self.filtered(lambda p: not p.carrier_tracking_ref):
+            # deliver full order if no items are done.
+            pick_has_no_done = sum(pick.move_line_ids.mapped('qty_done')) == 0
+            if pick_has_no_done:
+                pick._rma_complete()
+            res = super(StockPicking, pick).send_to_shipper()
+            if pick_has_no_done:
+                pick._rma_complete_reverse()
+        return res
+
+    def _rma_complete(self):
+        for line in self.move_line_ids:
+            line.qty_done = line.product_uom_qty
+
+    def _rma_complete_reverse(self):
+        self.move_line_ids.write({'qty_done': 0.0})
diff --git a/rma/security/ir.model.access.csv b/rma/security/ir.model.access.csv
new file mode 100644
index 00000000..a7c216cd
--- /dev/null
+++ b/rma/security/ir.model.access.csv
@@ -0,0 +1,10 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"manage_rma stock","manage rma","model_rma_rma","stock.group_stock_user",1,1,1,1
+"manage_rma_line stock","manage rma line","model_rma_line","stock.group_stock_user",1,1,1,1
+"manage_rma_template stock","manage rma template","model_rma_template","stock.group_stock_manager",1,1,1,1
+"manage_rma_tag stock","manage rma tag","model_rma_tag","stock.group_stock_manager",1,1,1,1
+"access_rma_template stock","access rma template","model_rma_template","stock.group_stock_user",1,1,0,0
+"access_rma_tag stock","access rma tag","model_rma_tag","stock.group_stock_user",1,0,0,0
+access_rma_portal,rma.rma.portal,rma.model_rma_rma,base.group_portal,1,0,0,0
+access_rma_line_portal,rma.line.portal,rma.model_rma_line,base.group_portal,1,0,0,0
+access_rma_template_portal,rma.template.portal,rma.model_rma_template,base.group_portal,1,0,0,0
\ No newline at end of file
diff --git a/rma/security/rma_security.xml b/rma/security/rma_security.xml
new file mode 100644
index 00000000..31c8c174
--- /dev/null
+++ b/rma/security/rma_security.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<data noupdate="1">
+
+    <!-- Multi Company -->
+    <record id="rma_rma_company_rule" model="ir.rule">
+        <field name="name">RMA: RMA</field>
+        <field name="model_id" ref="model_rma_rma"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">['|',
+                                        ('company_id', '=', False),
+                                        ('company_id', 'child_of', [user.company_id.id]),
+                                    ]</field>
+    </record>
+
+    <record id="rma_template_company_rule" model="ir.rule">
+        <field name="name">RMA: RMA Template</field>
+        <field name="model_id" ref="model_rma_template"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">['|',
+                                        ('company_id', '=', False),
+                                        ('company_id', 'child_of', [user.company_id.id]),
+                                    ]</field>
+    </record>
+
+    <!-- Portal Access Rules -->
+    <record id="rma_rule_portal" model="ir.rule">
+        <field name="name">Portal Personal RMAs</field>
+        <field name="model_id" ref="rma.model_rma_rma"/>
+        <field name="domain_force">[('partner_id','child_of',[user.commercial_partner_id.id])]</field>
+        <field name="groups" eval="[(4, ref('base.group_portal'))]"/>
+        <field name="perm_unlink" eval="False"/>
+        <field name="perm_write" eval="False"/>
+        <field name="perm_read" eval="True"/>
+        <field name="perm_create" eval="False"/>
+    </record>
+
+    <record id="rma_line_rule_portal" model="ir.rule">
+        <field name="name">Portal RMA Line</field>
+        <field name="model_id" ref="rma.model_rma_line"/>
+        <field name="domain_force">[('rma_id.partner_id','child_of',[user.commercial_partner_id.id])]</field>
+        <field name="groups" eval="[(4, ref('base.group_portal'))]"/>
+        <field name="perm_unlink" eval="False"/>
+        <field name="perm_write" eval="False"/>
+        <field name="perm_read" eval="True"/>
+        <field name="perm_create" eval="False"/>
+    </record>
+
+</data>
+</odoo>
diff --git a/rma/tests/__init__.py b/rma/tests/__init__.py
new file mode 100644
index 00000000..586c5532
--- /dev/null
+++ b/rma/tests/__init__.py
@@ -0,0 +1,3 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from . import test_rma
diff --git a/rma/tests/test_rma.py b/rma/tests/test_rma.py
new file mode 100644
index 00000000..ec70c3ac
--- /dev/null
+++ b/rma/tests/test_rma.py
@@ -0,0 +1,308 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo.tests import common
+from odoo.exceptions import UserError, ValidationError
+import logging
+
+
+_logger = logging.getLogger(__name__)
+
+
+class TestRMA(common.TransactionCase):
+    def setUp(self):
+        super(TestRMA, self).setUp()
+        self.product1 = self.env.ref('product.product_product_24')
+        self.template_missing = self.env.ref('rma.template_missing_item')
+        self.template_return = self.env.ref('rma.template_picking_return')
+        self.template_rtv = self.env.ref('rma.template_rtv')
+        self.partner1 = self.env.ref('base.res_partner_2')
+        self.user1 = self.env.ref('base.user_demo')
+        # Additional partner in tests or vendor in Return To Vendor
+        self.partner2 = self.env.ref('base.res_partner_12')
+
+    def test_00_basic_rma(self):
+        self.template_missing.responsible_user_ids += self.user1
+        self.template_missing.usage = False
+        rma = self.env['rma.rma'].create({
+            'template_id': self.template_missing.id,
+            'partner_id': self.partner1.id,
+            'partner_shipping_id': self.partner1.id,
+        })
+        self.assertEqual(rma.state, 'draft')
+        self.assertTrue(rma.activity_ids)
+        self.assertEqual(rma.activity_ids.user_id, self.user1)
+        rma_line = self.env['rma.line'].create({
+            'rma_id': rma.id,
+            'product_id': self.product1.id,
+            'product_uom_id': self.product1.uom_id.id,
+            'product_uom_qty': 2.0,
+        })
+        rma.action_confirm()
+        # Should have made pickings
+        self.assertEqual(rma.state, 'confirmed')
+        # No inbound picking
+        self.assertFalse(rma.in_picking_id)
+        # Good outbound picking
+        self.assertTrue(rma.out_picking_id)
+        self.assertEqual(rma_line.product_id, rma.out_picking_id.move_lines.product_id)
+        self.assertEqual(rma_line.product_uom_qty, rma.out_picking_id.move_lines.product_uom_qty)
+
+        with self.assertRaises(UserError):
+            rma.action_done()
+
+        rma.out_picking_id.move_lines.quantity_done = 2.0
+        rma.out_picking_id.action_done()
+        rma.action_done()
+        self.assertEqual(rma.state, 'done')
+
+    def test_10_rma_cancel(self):
+        self.template_missing.usage = False
+        rma = self.env['rma.rma'].create({
+            'template_id': self.template_missing.id,
+            'partner_id': self.partner1.id,
+            'partner_shipping_id': self.partner1.id,
+        })
+        self.assertEqual(rma.state, 'draft')
+        rma_line = self.env['rma.line'].create({
+            'rma_id': rma.id,
+            'product_id': self.product1.id,
+            'product_uom_id': self.product1.uom_id.id,
+            'product_uom_qty': 2.0,
+        })
+        rma.action_confirm()
+        # Good outbound picking
+        self.assertEqual(rma.out_picking_id.move_lines.state, 'assigned')
+        rma.action_cancel()
+        self.assertEqual(rma.out_picking_id.move_lines.state, 'cancel')
+
+    def test_20_picking_rma(self):
+        type_out = self.env.ref('stock.picking_type_out')
+        location = self.env.ref('stock.stock_location_stock')
+        location_customer = self.env.ref('stock.stock_location_customers')
+
+        adj = self.env['stock.inventory'].create({
+            'name': 'Adjust Out',
+            'product_ids': [(4, self.product1.id)],
+        })
+        adj.action_start()
+        adj.line_ids.write({
+            'product_qty': 0.0,
+        })
+        adj.action_validate()
+
+        # Adjust in a single serial
+        self.product1.tracking = 'serial'
+
+        # Need to ensure this is the only quant that can be reserved for this move.
+        lot = self.env['stock.production.lot'].create({
+            'product_id': self.product1.id,
+            'name': 'X1000',
+            'product_uom_id': self.product1.uom_id.id,
+            'company_id': self.env.user.company_id.id,
+        })
+        adj = self.env['stock.inventory'].create({
+            'name': 'Initial',
+            'product_ids': [(4, self.product1.id)],
+        })
+        adj.action_start()
+        if not adj.line_ids:
+            _ = self.env['stock.inventory.line'].create({
+                'inventory_id': adj.id,
+                'product_id': self.product1.id,
+                'location_id': self.env.ref('stock.warehouse0').lot_stock_id.id,
+            })
+        adj.line_ids.write({
+            'product_qty': 1.0,
+            'prod_lot_id': lot.id,
+        })
+        adj.action_validate()
+
+        self.assertEqual(self.product1.qty_available, 1.0)
+        self.assertTrue(lot.quant_ids)
+        # Test some internals in Odoo 12.0
+        lot_internal_quants = lot.quant_ids.filtered(lambda q: q.location_id.usage in ['internal', 'transit'])
+        self.assertEqual(len(lot_internal_quants), 1)
+        self.assertEqual(lot_internal_quants.mapped('quantity'), [1.0])
+        # Re-compute qty as it does not depend on anything.
+        lot._product_qty()
+        self.assertEqual(lot.product_qty, 1.0)
+
+        # Create initial picking that will be returned by RMA
+        picking_out = self.env['stock.picking'].create({
+            'partner_id': self.partner1.id,
+            'name': 'testpicking',
+            'picking_type_id': type_out.id,
+            'location_id': location.id,
+            'location_dest_id': location_customer.id,
+        })
+        self.env['stock.move'].create({
+            'name': self.product1.name,
+            'product_id': self.product1.id,
+            'product_uom_qty': 1.0,
+            'product_uom': self.product1.uom_id.id,
+            'picking_id': picking_out.id,
+            'location_id': location.id,
+            'location_dest_id': location_customer.id,
+        })
+        picking_out.with_context(planned_picking=True).action_confirm()
+
+        # Try to RMA item not delivered yet
+        rma = self.env['rma.rma'].create({
+            'template_id': self.template_return.id,
+            'partner_id': self.partner1.id,
+            'partner_shipping_id': self.partner1.id,
+            'stock_picking_id': picking_out.id,
+        })
+        self.assertEqual(rma.state, 'draft')
+        wizard = self.env['rma.picking.make.lines'].create({
+            'rma_id': rma.id,
+        })
+        wizard.line_ids.product_uom_qty = 1.0
+        wizard.add_lines()
+        self.assertEqual(len(rma.lines), 1)
+
+        # Make sure that we cannot 'return' if we cannot 'reverse' a stock move
+        # (this is what `in_require_return` and `out_require_return` do on `rma.template`)
+        with self.assertRaises(UserError):
+            rma.action_confirm()
+
+        # Finish our original picking
+        picking_out.action_assign()
+        self.assertEqual(picking_out.state, 'assigned')
+
+        # The only lot should be reserved, so we shouldn't get an exception finishing the transfer.
+        picking_out.move_line_ids.write({
+            'qty_done': 1.0,
+        })
+        picking_out.button_validate()
+        self.assertEqual(picking_out.state, 'done')
+
+        # Now we can 'return' that picking
+        rma.action_confirm()
+        self.assertEqual(rma.in_picking_id.state, 'assigned')
+        pack_opt = rma.in_picking_id.move_line_ids[0]
+        self.assertTrue(pack_opt)
+
+        # We cannot check this directly anymore.  Instead just try to return the same lot and make sure you can.
+        # self.assertEqual(pack_opt.lot_id, lot)
+
+        with self.assertRaises(UserError):
+            rma.action_done()
+
+        pack_opt.qty_done = 1.0
+        with self.assertRaises(UserError):
+            # require a lot
+            rma.in_picking_id.button_validate()
+
+        pack_opt.lot_id = lot
+        rma.in_picking_id.button_validate()
+        rma.action_done()
+
+        # Ensure that the same lot was in fact returned into our destination inventory
+        quant = self.env['stock.quant'].search([('product_id', '=', self.product1.id), ('location_id', '=', location.id)])
+        self.assertEqual(len(quant), 1)
+        self.assertEqual(quant.lot_id, lot)
+
+        # Make another RMA for the same picking
+        rma2 = self.env['rma.rma'].create({
+            'template_id': self.template_return.id,
+            'partner_id': self.partner1.id,
+            'partner_shipping_id': self.partner1.id,
+            'stock_picking_id': picking_out.id,
+        })
+        wizard = self.env['rma.picking.make.lines'].create({
+            'rma_id': rma2.id,
+        })
+        wizard.line_ids.product_uom_qty = 1.0
+        wizard.add_lines()
+        self.assertEqual(len(rma2.lines), 1)
+
+        rma2.action_confirm()
+
+        # In Odoo 10, this would not have been able to reserve.
+        # In Odoo 11, reservation can still happen, but at least we can't move the same lot twice!
+        # self.assertEqual(rma2.in_picking_id.state, 'confirmed')
+
+        # Requires Lot
+        with self.assertRaises(UserError):
+            rma2.in_picking_id.move_line_ids.write({'qty_done': 1.0})
+            rma2.in_picking_id.button_validate()
+
+
+        self.assertTrue(rma2.in_picking_id.move_line_ids)
+        self.assertFalse(rma2.in_picking_id.move_line_ids.lot_id.name)
+
+        # Assign existing lot
+        # TODO: Investigate
+        # rma2.in_picking_id.move_line_ids.write({
+        #     'lot_id': lot.id
+        # })
+
+        # Existing lot cannot be re-used.
+        # TODO: Investigate
+        # It appears that in Odoo 13 You can move the lot again...
+        # with self.assertRaises(ValidationError):
+        #     rma2.in_picking_id.action_done()
+
+        # RMA cannot be completed because the inbound picking state is confirmed
+        with self.assertRaises(UserError):
+            rma2.action_done()
+
+    def test_30_next_rma_rtv(self):
+        self.template_return.usage = False
+        self.template_return.in_require_return = False
+        self.template_return.next_rma_template_id = self.template_rtv
+        rma = self.env['rma.rma'].create({
+            'template_id': self.template_return.id,
+            'partner_id': self.partner1.id,
+            'partner_shipping_id': self.partner1.id,
+        })
+        self.assertEqual(rma.state, 'draft')
+        rma_line = self.env['rma.line'].create({
+            'rma_id': rma.id,
+            'product_id': self.product1.id,
+            'product_uom_id': self.product1.uom_id.id,
+            'product_uom_qty': 2.0,
+        })
+        rma.action_confirm()
+        # Should have made pickings
+        self.assertEqual(rma.state, 'confirmed')
+
+        # No outbound picking
+        self.assertFalse(rma.out_picking_id)
+        # Good inbound picking
+        self.assertTrue(rma.in_picking_id)
+        self.assertEqual(rma_line.product_id, rma.in_picking_id.move_lines.product_id)
+        self.assertEqual(rma_line.product_uom_qty, rma.in_picking_id.move_lines.product_uom_qty)
+
+        with self.assertRaises(UserError):
+            rma.action_done()
+
+        rma.in_picking_id.move_lines.quantity_done = 2.0
+        rma.in_picking_id.action_done()
+        rma.action_done()
+        self.assertEqual(rma.state, 'done')
+
+        # RTV RMA
+        rma_rtv = self.env['rma.rma'].search([('parent_id', '=', rma.id)])
+        self.assertTrue(rma_rtv)
+        self.assertEqual(rma_rtv.state, 'draft')
+
+        wiz = self.env['rma.make.rtv'].with_context(active_model='rma.rma', active_ids=rma_rtv.ids).create({})
+        self.assertTrue(wiz.rma_line_ids)
+        wiz.partner_id = self.partner2
+        wiz.create_batch()
+        self.assertTrue(rma_rtv.out_picking_id)
+        self.assertEqual(rma_rtv.out_picking_id.partner_id, self.partner2)
+        self.assertEqual(rma_rtv.state, 'confirmed')
+
+        # ship and finish
+        rma_rtv.out_picking_id.move_lines.quantity_done = 2.0
+        rma_rtv.out_picking_id.action_done()
+        rma_rtv.action_done()
+        self.assertEqual(rma_rtv.state, 'done')
+
+        # ensure invoice and type
+        rtv_invoice = rma_rtv.invoice_ids
+        self.assertTrue(rtv_invoice)
+        self.assertEqual(rtv_invoice.type, 'in_refund')
diff --git a/rma/views/account_views.xml b/rma/views/account_views.xml
new file mode 100644
index 00000000..b189fc7a
--- /dev/null
+++ b/rma/views/account_views.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="view_move_form_rma" model="ir.ui.view">
+        <field name="name">account.move.form.rma</field>
+        <field name="model">account.move</field>
+        <field name="inherit_id" ref="account.view_move_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//group[@name='payments_info_group']" position="after">
+                <group string="RMAs" name="rma" attrs="{'invisible': [('type', 'not in', ('out_invoice', 'out_refund', 'in_invoice', 'in_refund'))]}">
+                    <field name="rma_ids"/>
+                </group>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
\ No newline at end of file
diff --git a/rma/views/portal_templates.xml b/rma/views/portal_templates.xml
new file mode 100644
index 00000000..0692be42
--- /dev/null
+++ b/rma/views/portal_templates.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <template id="portal_my_home_menu_rma" name="Portal layout : RMA menu entries"
+              inherit_id="portal.portal_breadcrumbs" priority="20">
+        <xpath expr="//ol[hasclass('o_portal_submenu')]" position="inside">
+            <li t-if="page_name == 'rma' or rma or rma_template" t-attf-class="breadcrumb-item #{'active ' if not rma else ''}">
+                <a t-if="rma" t-attf-href="/my/rma?{{ keep_query() }}">RMA</a>
+                <t t-else="">RMA</t>
+            </li>
+            <li t-if="rma" class="breadcrumb-item active">
+                <t t-esc="rma.name"/>
+            </li>
+            <li t-if="rma_template" class="breadcrumb-item active">
+               <a t-attf-href="/my/rma/new/#{rma_template.id}">
+                    New "<t t-esc="rma_template.name"/>"
+               </a>
+            </li>
+        </xpath>
+    </template>
+
+    <template id="portal_my_home_rma" name="Portal My Home : RMA entry" inherit_id="portal.portal_my_home"
+              priority="20">
+        <xpath expr="//div[hasclass('o_portal_docs')]" position="inside">
+            <t t-call="portal.portal_docs_entry">
+                <t t-set="title">RMA</t>
+                <t t-set="url" t-value="'/my/rma'"/>
+                <t t-set="count" t-value="rma_count"/>
+            </t>
+        </xpath>
+    </template>
+
+    <template id="portal_my_rma" name="Portal: My RMAs">
+        <t t-call="portal.portal_layout">
+            <t t-call="portal.portal_searchbar">
+                <t t-set="title">RMA</t>
+            </t>
+            <t t-if="rma_list" t-call="portal.portal_table">
+                <thead>
+                    <tr class="active">
+                        <th>RMA #</th>
+                        <th>Submitted Date</th>
+                        <th>Status</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <t t-foreach="rma_list" t-as="rma">
+                        <tr>
+                            <td>
+                                <a t-attf-href="/my/rma/#{rma.id}?#{keep_query()}">
+                                    <t t-esc="rma.name"/>
+                                </a>
+                            </td>
+                            <td>
+                                <span t-field="rma.create_date"/>
+                            </td>
+                            <td>
+                                <span t-field="rma.state"/>
+                            </td>
+                        </tr>
+                    </t>
+                </tbody>
+            </t>
+            <div t-if="rma_templates" class="row">
+                <div class="col-12">
+                    <button class="create-rma btn btn-primary mt8" data-toggle="modal" data-target="#create-rma">Create New RMA</button>
+                </div>
+            </div>
+
+            <div t-if="rma_templates" role="dialog" class="modal fade" id="create-rma">
+                <div class="modal-dialog">
+                    <form id="create" class="modal-content">
+                        <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
+                        <header class="modal-header">
+                            <h4 class="modal-title">Create RMA</h4>
+                            <button type="button" class="close" data-dismiss="modal" aria-label="Close">&amp;times;</button>
+                        </header>
+                        <main class="modal-body">
+                            <ul class="list-group">
+                                <li class="list-group-item" t-foreach="rma_templates" t-as="template">
+                                    <a t-attf-href="/my/rma/new/#{template.id}">
+                                        <span t-esc="template.name"/>
+                                    </a>
+                                </li>
+                            </ul>
+                        </main>
+                        <footer class="modal-footer">
+                            <button type="button" class="btn btn-primary" data-dismiss="modal">Cancel</button>
+                        </footer>
+                    </form>
+                </div>
+            </div>
+        </t>
+    </template>
+
+    <template id="portal_my_rma_rma" name="Portal: My RMA">
+        <t t-call="portal.portal_layout">
+            <div id="optional_placeholder"></div>
+            <div class="container">
+                <div class="card">
+                    <div class="card-header">
+                        <div class="row">
+                            <div class="col-lg-12">
+                                <h4>
+                                    <t t-if="rma.state == 'draft'">
+                                        Submitted -
+                                    </t>
+                                    <span t-esc="rma.name"/> - <span t-field="rma.state"/>
+                                </h4>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="card-body">
+                        <div class="rma-details">
+                            <div class="mb8">
+                                <strong>Submitted Date:</strong>
+                                <span t-field="rma.create_date" t-options='{"widget": "date"}'/>
+                            </div>
+                            <div t-if="rma.validity_date" class="mb8">
+                                <strong>Validity Date:</strong>
+                                <span t-attf-class="#{'text-danger' if rma.validity_date &lt; current_date else 'text-warning'}"
+                                      t-field="rma.validity_date" t-options='{"widget": "date"}'/>
+                            </div>
+                            <div t-if="rma.stock_picking_id" class="mb8">
+                                <strong>Transfer:</strong>
+                                <span t-esc="rma.stock_picking_id.name"/>
+                            </div>
+                        </div>
+
+                        <div class="row">
+                            <div class="col-lg-10">
+                                <strong>Product</strong>
+                            </div>
+                            <div class="col-lg-2 text-right">
+                                <strong>Quantity</strong>
+                            </div>
+                        </div>
+                        <t t-foreach="rma.lines" t-as="line">
+                            <div class="row purchases_vertical_align">
+                                <div class="col-lg-3 text-center">
+                                    <img class="mr4 float-left o_portal_product_img" t-if="line.product_id.image_128" t-att-src="image_data_uri(line.product_id.image_128)" alt="Product Image" width="64"/>
+                                    <img class="mr4 float-left o_portal_product_img" t-if="not line.product_id.image_128" src="/web/static/src/img/placeholder.png" alt="Product Image" width="64"/>
+                                </div>
+                                <div class="col-lg-7">
+                                    <span t-esc="line.product_id.name"/>
+                                </div>
+                                <div class="col-lg-2 text-right">
+                                    <span t-esc="line.product_uom_qty"/>
+                                </div>
+                            </div>
+                        </t>
+
+                        <!-- Return Label -->
+                        <t t-if="rma.in_label_url">
+                            <hr/>
+                            <a t-attf-href="#{rma.in_label_url}">Download Your Return Label</a>
+                        </t>
+
+                        <!-- Customer Instructions -->
+                        <t t-if="rma.customer_description">
+                            <hr/>
+                            <div class="row">
+                                <div class="col-12">
+                                    <h3>Customer Instructions</h3>
+                                    <div t-raw="rma.customer_description"/>
+                                </div>
+                            </div>
+                        </t>
+
+                        <hr/>
+                        <!-- chatter -->
+                        <div id="rma_communication" class="mt-4">
+                            <h2>Communication</h2>
+                            <t t-call="portal.message_thread">
+                                <t t-set="object" t-value="rma"/>
+                            </t>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="oe_structure mb32"/>
+        </t>
+    </template>
+
+    <template id="portal_rma_error" name="RMA Error">
+        <t t-if="error">
+            <div class="alert alert-danger text-left mt16" role="alert">
+                <t t-esc="error"/>
+            </div>
+        </t>
+    </template>
+
+    <!-- New -->
+    <template id="portal_new_stock_picking" name="New Transfer RMA">
+        <t t-call="portal.portal_layout">
+            <div id="optional_placeholder"></div>
+            <div class="container">
+                <t t-call="rma.portal_rma_error"/>
+                <div class="card">
+                    <div class="card-header">
+                        <div class="row">
+                            <div class="col-lg-12">
+                                <h4>
+                                    <span t-esc="rma_template.name"/>
+                                </h4>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="card-body">
+                        <ul t-if="pickings" class="list-group">
+                            <li class="list-group-item" t-foreach="pickings" t-as="p">
+                                <a t-attf-href="/my/rma/new/#{rma_template.id}/res/#{p.id}">
+                                    <span t-esc="p.name"/>
+                                </a>
+                            </li>
+                        </ul>
+                        <p t-if="not pickings and not picking">No Transfers to choose from.</p>
+                        <form t-if="picking" method="post" t-attf-action="/my/rma/new/#{rma_template.id}/res/#{picking.id}">
+                            <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
+                            <div class="row">
+                                <div class="col-lg-2">
+                                    <strong>Product</strong>
+                                </div>
+                                <div class="col-lg-4">
+                                    <strong>Description</strong>
+                                </div>
+                                <div class="col-lg-2 text-right">
+                                    <strong>Quantity Ordered</strong>
+                                </div>
+                                <div class="col-lg-2 text-right">
+                                    <strong>Quantity Delivered</strong>
+                                </div>
+                                <div class="col-lg-2 text-right">
+                                    <strong>Quantity to Return</strong>
+                                </div>
+                            </div>
+                            <t t-foreach="picking.move_lines" t-as="line">
+                                <div class="row purchases_vertical_align">
+                                    <div class="col-lg-2 text-center">
+                                        <img class="mr4 float-left o_portal_product_img" t-if="line.product_id.image_128" t-att-src="image_data_uri(line.product_id.image_128)" alt="Product Image" width="64"/>
+                                        <img class="mr4 float-left o_portal_product_img" t-if="not line.product_id.image_128" src="/web/static/src/img/placeholder.png" alt="Product Image" width="64"/>
+                                    </div>
+                                    <div class="col-lg-4">
+                                        <span t-esc="line.product_id.name"/>
+                                    </div>
+                                    <div class="col-lg-2 text-right">
+                                        <span t-esc="line.product_uom_qty"/>
+                                    </div>
+                                    <div class="col-lg-2 text-right">
+                                        <span t-esc="line.product_qty"/>
+                                    </div>
+                                    <div class="col-lg-2 text-right">
+                                        <input type="text"  t-attf-name="move_#{line.id}" class="form-control"/>
+                                    </div>
+                                </div>
+                            </t>
+                            <input type="submit" class="btn btn-primary mt16 float-right" name="submit"/>
+                        </form>
+                    </div>
+                </div>
+            </div>
+            <div class="oe_structure mb32"/>
+        </t>
+    </template>
+
+
+</odoo>
diff --git a/rma/views/rma_views.xml b/rma/views/rma_views.xml
new file mode 100644
index 00000000..42ee959a
--- /dev/null
+++ b/rma/views/rma_views.xml
@@ -0,0 +1,289 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="view_rma_rma_form" model="ir.ui.view">
+        <field name="name">rma.rma.form</field>
+        <field name="model">rma.rma</field>
+        <field name="arch" type="xml">
+            <form string="RMA" class="oe_form_nomargin">
+                <header>
+                    <button name="action_confirm" string="Confirm" class="btn-primary" type="object" attrs="{'invisible': [('state', '!=', 'draft')]}"/>
+                    <button name="action_done" string="Done" class="btn-primary" type="object" attrs="{'invisible': [('state', '!=', 'confirmed')]}"/>
+                    <button name="action_draft" string="Set Draft" class="btn-default" type="object" attrs="{'invisible': [('state', 'not in', ('cancel', 'expired'))]}"/>
+                    <button name="action_cancel" string="Cancel" class="btn-default" type="object" attrs="{'invisible': [('state', 'in', ('draft', 'done'))]}"/>
+                    <field name="state" widget="statusbar" on_change="1" modifiers="{'readonly': true}"/>
+                </header>
+                <sheet>
+                    <div class="oe_button_box" name="button_box">
+                        <button class="oe_stat_button" name="open_stock_picking_rmas" icon="fa-cubes"
+                                type="object" attrs="{'invisible': ['|', ('stock_picking_id', '=', False), ('stock_picking_rma_count', '&lt;=', 1)]}">
+                            <field name="stock_picking_rma_count" string="Pick RMAs" widget="statinfo" />
+                        </button>
+                    </div>
+                    <div class="oe_title">
+                        <h1>
+                            <field name="name" readonly="1" modifiers="{'readonly': true, 'required': true}"/>
+                        </h1>
+                    </div>
+                    <group>
+                        <group>
+                            <field name="parent_id" readonly="1" attrs="{'invisible': [('parent_id', '=', False)]}"/>
+                            <field name="template_usage" invisible="1"/>
+                            <field name="template_create_in_picking" invisible="1"/>
+                            <field name="template_create_out_picking" invisible="1"/>
+                            <field name="template_id" options="{'no_create': True}" attrs="{'readonly': [('state', 'in', ('confirmed', 'done', 'cancel'))]}"/>
+                            <field name="stock_picking_id" options="{'no_create': True}" attrs="{'invisible': [('template_usage', '!=', 'stock_picking')], 'required': [('template_usage', '=', 'stock_picking')], 'readonly': [('state', 'in', ('confirmed', 'done', 'cancel'))]}"/>
+                            <br/>
+                            <button string="Add lines" type="object" name="action_add_picking_lines" attrs="{'invisible': ['|', ('stock_picking_id', '=', False), ('state', '!=', 'draft')]}"/>
+                        </group>
+                        <group>
+                            <field name="claim_number"/>
+                            <field name="validity_date"/>
+                            <field name="tag_ids" widget="many2many_tags" placeholder="Tags" options="{'no_create': True}"/>
+                            <field name="partner_id" options="{'no_create_edit': True}" attrs="{'readonly': [('state', '!=', 'draft')]}"/>
+                            <field name="partner_shipping_id" attrs="{'readonly': [('state', '!=', 'draft')]}"/>
+                            <field name="initial_in_picking_carrier_id" attrs="{'invisible': [('template_create_in_picking', '=', False)]}"/>
+                            <field name="initial_out_picking_carrier_id" attrs="{'invisible': [('template_create_out_picking', '=', False)]}"/>
+                            <field name="company_id" options="{'no_create': True}"/>
+                        </group>
+                        <group name="invoices" string="Invoices" colspan="4" attrs="{'invisible': [('invoice_ids', '=', False), ('state', '!=', 'done')]}">
+                            <field name="invoice_ids" nolabel="1"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="Internal Instructions">
+                            <field name="description" readonly="1"/>
+                        </page>
+                        <page string="Customer Instructions">
+                            <field name="customer_description" readonly="1"/>
+                        </page>
+                    </notebook>
+                    <notebook>
+                        <page string="RMA Lines">
+                            <field name="lines" attrs="{'readonly': [('state', '!=', 'draft')]}">
+                                <tree editable="bottom">
+                                    <field name="rma_template_usage" invisible="1"/>
+                                    <field name="product_id" attrs="{'readonly': [('rma_template_usage', '!=', False)]}"/>
+                                    <field name="product_uom_qty" attrs="{'readonly': [('rma_template_usage', '!=', False)]}"/>
+                                    <field name="product_uom_id" attrs="{'readonly': [('rma_template_usage', '!=', False)]}"/>
+                                </tree>
+                            </field>
+                        </page>
+                    </notebook>
+                </sheet>
+                <sheet attrs="{'invisible': [('in_picking_id', '=', False)]}">
+                    <header>
+                        <field name="in_picking_state" widget="statusbar" on_change="1" modifiers="{'readonly': true}"/>
+                    </header>
+                    <div class="oe_title">
+                        <h2>Inbound Picking:</h2>
+                        <h1>
+                            <field name="in_picking_id" readonly="1" modifiers="{'readonly': true}"/>
+                        </h1>
+                        <p>
+                            <field name="in_label_url" attrs="{'invisible': [('in_label_url', '=', False)]}"/>
+                        </p>
+                    </div>
+                    <group>
+                        <group>
+                            <field name="in_picking_carrier_id" string="Carrier"/>
+                            <field name="in_carrier_tracking_ref" string="Tracking"/>
+                            <button string="Generate Label" type="object" name="action_in_picking_send_to_shipper" attrs="{'invisible': ['|', ('in_carrier_tracking_ref', '!=', False), ('in_picking_carrier_id', '=', False)]}"/>
+                        </group>
+                    </group>
+                </sheet>
+                <sheet attrs="{'invisible': [('out_picking_id', '=', False)]}">
+                    <header>
+                        <field name="out_picking_state" widget="statusbar" on_change="1" modifiers="{'readonly': true}"/>
+                    </header>
+                    <div class="oe_title">
+                        <h2>Outbound Picking:</h2>
+                        <h1>
+                            <field name="out_picking_id" readonly="1" modifiers="{'readonly': true}"/>
+                        </h1>
+                    </div>
+                    <group>
+                        <group>
+                            <field name="out_picking_carrier_id" string="Carrier"/>
+                            <field name="out_carrier_tracking_ref" string="Tracking"/>
+                        </group>
+                    </group>
+                </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="activity_ids" widget="mail_activity"/>
+                    <field name="message_ids" widget="mail_thread"/>
+                </div>
+            </form>
+        </field>
+    </record>
+
+    <record id="view_rma_rma_tree" model="ir.ui.view">
+        <field name="name">rma.rma.tree</field>
+        <field name="model">rma.rma</field>
+        <field name="arch" type="xml">
+            <tree decoration-info="state == 'draft'" decoration-muted="state in ('cancel', 'done')" decoration-warning="validity_date and validity_date &lt; current_date">
+                <field name="name"/>
+                <field name="template_id"/>
+                <field name="stock_picking_id"/>
+                <field name="partner_id"/>
+                <field name="create_date"/>
+                <field name="validity_date"/>
+                <field name="state"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_rma_rma_search" model="ir.ui.view">
+        <field name="name">rma.rma.search</field>
+        <field name="model">rma.rma</field>
+        <field name="arch" type="xml">
+            <search string="Search RMA">
+                <field name="name"/>
+                <field name="claim_number"/>
+                <field name="partner_id"/>
+                <field name="template_id"/>
+                <field name="stock_picking_id"/>
+                <separator/>
+                <filter string="New" name="new" domain="[('state', '=', 'draft')]"/>
+                <filter string="Confirmed" name="confirmed" domain="[('state', '=', 'confirmed')]"/>
+                <filter string="Expired" name="expired" domain="[('validity_date', '!=', False),('validity_date', '&lt;', datetime.datetime.now())]"/>
+                <group expand="0" name="group_by" string="Group By">
+                    <filter name="group_state" string="State" domain="[]" context="{'group_by': 'state'}"/>
+                    <filter name="group_template" string="Template" domain="[]" context="{'group_by': 'template_id'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="view_rma_template_form" model="ir.ui.view">
+        <field name="name">rma.template.form</field>
+        <field name="model">rma.template</field>
+        <field name="arch" type="xml">
+            <form string="RMA Template" class="oe_form_nomargin">
+                <sheet>
+                    <div class="oe_title">
+                        <h1>
+                            <field name="name"/>
+                        </h1>
+                    </div>
+                    <group>
+                        <group>
+                            <field name="usage"/>
+                            <field name="valid_days"/>
+                            <field name="automatic_expire"/>
+                            <field name="company_id" options="{'no_create': True}"/>
+                            <field name="portal_ok"/>
+                            <field name="invoice_done" help="This feature is implemented in specific RMA types automatically when enabled."/>
+                            <field name="next_rma_template_id"/>
+                        </group>
+                        <group>
+                            <field name="responsible_user_ids" domain="[('share', '=', False)]" widget="many2many_tags"/>
+                        </group>
+                    </group>
+                    <group>
+                        <group>
+                            <field name="create_in_picking"/>
+                            <field name="in_type_id" attrs="{'invisible': [('create_in_picking', '=', False)]}"/>
+                            <field name="in_location_id" attrs="{'invisible': [('create_in_picking', '=', False)]}"/>
+                            <field name="in_location_dest_id" attrs="{'invisible': [('create_in_picking', '=', False)]}"/>
+                            <field name="in_carrier_id" attrs="{'invisible': [('create_in_picking', '=', False)]}"/>
+                            <field name="in_require_return" attrs="{'invisible': [('create_in_picking', '=', False)]}"/>
+                            <field name="in_procure_method" attrs="{'invisible': [('create_in_picking', '=', False)]}"/>
+                            <field name="in_to_refund" attrs="{'invisible': [('create_in_picking', '=', False)]}"/>
+                        </group>
+                        <group>
+                            <field name="create_out_picking"/>
+                            <field name="out_type_id" attrs="{'invisible': [('create_out_picking', '=', False)]}"/>
+                            <field name="out_location_id" attrs="{'invisible': [('create_out_picking', '=', False)]}"/>
+                            <field name="out_location_dest_id" attrs="{'invisible': [('create_out_picking', '=', False)]}"/>
+                            <field name="out_carrier_id" attrs="{'invisible': [('create_out_picking', '=', False)]}"/>
+                            <field name="out_require_return" attrs="{'invisible': [('create_out_picking', '=', False)]}"/>
+                            <field name="out_procure_method" attrs="{'invisible': [('create_out_picking', '=', False)]}"/>
+                            <field name="out_to_refund" attrs="{'invisible': [('create_out_picking', '=', False)]}"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="Internal Instructions">
+                            <field name="description"/>
+                        </page>
+                        <page string="Customer Instructions">
+                            <field name="customer_description"/>
+                        </page>
+                    </notebook>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="view_rma_template_tree" model="ir.ui.view">
+        <field name="name">rma.template.tree</field>
+        <field name="model">rma.template</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="name"/>
+                <field name="usage"/>
+                <field name="create_in_picking"/>
+                <field name="create_out_picking"/>
+            </tree>
+        </field>
+    </record>
+
+
+    <record id="action_rma_rma" model="ir.actions.act_window">
+        <field name="name">RMA</field>
+        <field name="res_model">rma.rma</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem
+        action="action_rma_rma"
+        name="RMA"
+        id="menu_rma"
+        web_icon="fa fa-cubes,#FFFFFF,#EB5A46"
+        sequence="10"
+        />
+    <menuitem
+        action="action_rma_rma"
+        id="menu_rma_rmas"
+        parent="menu_rma"
+        sequence="10"
+        />
+    <menuitem
+        id="menu_rma_configuration"
+        name="Configuration"
+        parent="menu_rma"
+        sequence="100"
+        />
+
+
+    <record id="action_rma_tag_form" model="ir.actions.act_window">
+        <field name="name">RMA Tag</field>
+        <field name="res_model">rma.tag</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <record id="action_rma_template_form" model="ir.actions.act_window">
+        <field name="name">RMA Templates</field>
+        <field name="res_model">rma.template</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem
+        id="menu_rma_configuation_rma_template_form"
+        name="Templates"
+        action="action_rma_template_form"
+        parent="menu_rma_configuration"
+        sequence="21"
+        />
+    <menuitem
+        id="menu_rma_configuation_rma_tag_form"
+        name="Tags"
+        action="action_rma_tag_form"
+        parent="menu_rma_configuration"
+        sequence="25"
+        />
+
+
+
+
+</odoo>
diff --git a/rma/views/stock_picking_views.xml b/rma/views/stock_picking_views.xml
new file mode 100644
index 00000000..4fdea8e0
--- /dev/null
+++ b/rma/views/stock_picking_views.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="view_picking_withcarrier_out_form" model="ir.ui.view">
+        <field name="name">delivery.stock.picking_withcarrier.form.view</field>
+        <field name="model">stock.picking</field>
+        <field name="inherit_id" ref="delivery.view_picking_withcarrier_out_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//button[@name='send_to_shipper']" position="attributes">
+                <attribute name="attrs">{'invisible':['|','|','|',('carrier_tracking_ref','!=',False),('delivery_type','in', ['fixed', 'base_on_rule']),('delivery_type','=',False)]}</attribute>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/rma/wizard/__init__.py b/rma/wizard/__init__.py
new file mode 100644
index 00000000..38eeb3bd
--- /dev/null
+++ b/rma/wizard/__init__.py
@@ -0,0 +1,4 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from . import rma_lines
+from . import rma_make_rtv
diff --git a/rma/wizard/rma_lines.py b/rma/wizard/rma_lines.py
new file mode 100644
index 00000000..db98141c
--- /dev/null
+++ b/rma/wizard/rma_lines.py
@@ -0,0 +1,59 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo import api, fields, models
+
+
+class RMAPickingMakeLines(models.TransientModel):
+    _name = 'rma.picking.make.lines'
+    _description = 'Add Picking Lines'
+
+    rma_id = fields.Many2one('rma.rma', string='RMA')
+    line_ids = fields.One2many('rma.picking.make.lines.line', 'rma_make_lines_id', string='Lines')
+
+
+    @api.model
+    def create(self, vals):
+        maker = super(RMAPickingMakeLines, self).create(vals)
+        maker._create_lines()
+        return maker
+
+    def _line_values(self, move):
+        return {
+            'rma_make_lines_id': self.id,
+            'product_id': move.product_id.id,
+            'qty_ordered': move.product_uom_qty,
+            'qty_delivered': move.product_qty,
+            'product_uom_qty': 0.0,
+            'product_uom_id': move.product_uom.id,
+        }
+
+    def _create_lines(self):
+        make_lines_obj = self.env['rma.picking.make.lines.line']
+
+        if self.rma_id.template_usage == 'stock_picking' and self.rma_id.stock_picking_id:
+            for l in self.rma_id.stock_picking_id.move_lines:
+                self.line_ids |= make_lines_obj.create(self._line_values(l))
+
+    def add_lines(self):
+        rma_line_obj = self.env['rma.line']
+        for o in self:
+            lines = o.line_ids.filtered(lambda l: l.product_uom_qty > 0.0)
+            for l in lines:
+                rma_line_obj.create({
+                    'rma_id': o.rma_id.id,
+                    'product_id': l.product_id.id,
+                    'product_uom_id': l.product_uom_id.id,
+                    'product_uom_qty': l.product_uom_qty,
+                })
+
+
+class RMAPickingMakeLinesLine(models.TransientModel):
+    _name = 'rma.picking.make.lines.line'
+    _description = 'RMA Picking Make Lines Line'
+
+    rma_make_lines_id = fields.Many2one('rma.picking.make.lines')
+    product_id = fields.Many2one('product.product', string="Product")
+    qty_ordered = fields.Float(string='Ordered')
+    qty_delivered = fields.Float(string='Delivered')
+    product_uom_qty = fields.Float(string='QTY')
+    product_uom_id = fields.Many2one('uom.uom', 'UOM')
diff --git a/rma/wizard/rma_lines_views.xml b/rma/wizard/rma_lines_views.xml
new file mode 100644
index 00000000..7a3a59e2
--- /dev/null
+++ b/rma/wizard/rma_lines_views.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+
+    <record id="view_rma_add_lines_form" model="ir.ui.view">
+        <field name="name">view.rma.add.lines.form</field>
+        <field name="model">rma.picking.make.lines</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form>
+                <field name="line_ids">
+                    <tree editable="top" create="false" delete="false">
+                        <field name="product_id" readonly="1"/>
+                        <field name="qty_ordered" readonly="1"/>
+                        <field name="qty_delivered" readonly="1"/>
+                        <field name="product_uom_qty"/>
+                        <field name="product_uom_id" readonly="1"/>
+                    </tree>
+                </field>
+                <footer>
+                    <button class="oe_highlight"
+                            name="add_lines"
+                            type="object"
+                            string="Add" />
+                    <button class="oe_link"
+                            special="cancel"
+                            string="Cancel" />
+                </footer>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_rma_add_lines" model="ir.actions.act_window">
+        <field name="name">Add RMA Lines</field>
+        <field name="res_model">rma.picking.make.lines</field>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="view_rma_add_lines_form" />
+        <field name="target">new</field>
+    </record>
+
+</odoo>
\ No newline at end of file
diff --git a/rma/wizard/rma_make_rtv.py b/rma/wizard/rma_make_rtv.py
new file mode 100644
index 00000000..728e3905
--- /dev/null
+++ b/rma/wizard/rma_make_rtv.py
@@ -0,0 +1,90 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo import api, fields, models
+from odoo.exceptions import UserError
+
+
+class RMAMakeRTV(models.TransientModel):
+    _name = 'rma.make.rtv'
+    _description = 'Make RTV Batch'
+
+    partner_id = fields.Many2one('res.partner', string='Vendor')
+    partner_shipping_id = fields.Many2one('res.partner', string='Shipping Address')
+    rma_line_ids = fields.One2many('rma.make.rtv.line', 'rma_make_rtv_id', string='Lines')
+
+    @api.model
+    def default_get(self, fields):
+        result = super().default_get(fields)
+        if 'rma_line_ids' in fields and self._context.get('active_model') == 'rma.rma' and self._context.get('active_ids'):
+            active_ids = self._context.get('active_ids')
+            rmas = self.env['rma.rma'].browse(active_ids)
+            result['rma_line_ids'] = [(0, 0, {
+                'rma_id': r.id,
+                'rma_state': r.state,
+                'rma_claim_number': r.claim_number,
+            }) for r in rmas]
+            rma_partner = rmas.mapped('partner_id')
+            if rma_partner:
+                result['partner_id'] = rma_partner[0].id
+        return result
+
+    def create_batch(self):
+        self.ensure_one()
+        if self.rma_line_ids.filtered(lambda rl: rl.rma_id.state != 'draft'):
+            raise UserError('All RMAs must be in the draft state.')
+        rma_partner = self.rma_line_ids.mapped('rma_id.partner_id')
+        if rma_partner and len(rma_partner) != 1:
+            raise UserError('All RMAs must be for the same partner.')
+        elif not rma_partner and not self.partner_id:
+            raise UserError('Please select a Vendor')
+        elif not rma_partner:
+            rma_partner = self.partner_id
+            rma_partner_shipping = self.partner_shipping_id or rma_partner
+            # update all RMA's to the currently selected vendor
+            self.rma_line_ids.mapped('rma_id').write({
+                'partner_id': rma_partner.id,
+                'partner_shipping_id': rma_partner_shipping.id,
+            })
+        if len(self.rma_line_ids.mapped('rma_id.template_id')) != 1:
+            raise UserError('All RMAs must be of the same template.')
+
+        in_values = None
+        out_values = None
+        for rma in self.rma_line_ids.mapped('rma_id'):
+            if rma.template_id.create_in_picking:
+                if not in_values:
+                    in_values = rma.template_id._values_for_in_picking(rma)
+                    in_values['origin'] = [in_values['origin']]
+                else:
+                    other_in_values = rma.template_id._values_for_in_picking(rma)
+                    in_values['move_lines'] += other_in_values['move_lines']
+            if rma.template_id.create_out_picking:
+                if not out_values:
+                    out_values = rma.template_id._values_for_out_picking(rma)
+                    out_values['origin'] = [out_values['origin']]
+                else:
+                    other_out_values = rma.template_id._values_for_out_picking(rma)
+                    out_values['move_lines'] += other_out_values['move_lines']
+        in_picking_id = False
+        out_picking_id = False
+        if in_values:
+            in_values['origin'] = ', '.join(in_values['origin'])
+            in_picking = self.env['stock.picking'].sudo().create(in_values)
+            in_picking_id = in_picking.id
+        if out_values:
+            out_values['origin'] = ', '.join(out_values['origin'])
+            out_picking = self.env['stock.picking'].sudo().create(out_values)
+            out_picking_id = out_picking.id
+        rmas = self.rma_line_ids.mapped('rma_id').with_context(rma_in_picking_id=in_picking_id, rma_out_picking_id=out_picking_id)
+        # action_confirm known to be multi-aware and makes only one context
+        rmas.action_confirm()
+
+
+class RMAMakeRTVLine(models.TransientModel):
+    _name = 'rma.make.rtv.line'
+    _description = 'Make RTV Batch RMA'
+
+    rma_make_rtv_id = fields.Many2one('rma.make.rtv')
+    rma_id = fields.Many2one('rma.rma')
+    rma_state = fields.Selection(related='rma_id.state')
+    rma_claim_number = fields.Char(related='rma_id.claim_number', readonly=False)
diff --git a/rma/wizard/rma_make_rtv_views.xml b/rma/wizard/rma_make_rtv_views.xml
new file mode 100644
index 00000000..b7da2d82
--- /dev/null
+++ b/rma/wizard/rma_make_rtv_views.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="view_rma_make_rtv" model="ir.ui.view">
+        <field name="name">Return To Vendor</field>
+        <field name="model">rma.make.rtv</field>
+        <field name="arch" type="xml">
+            <form string="RMA Make RTV">
+                <p class="oe_grey">
+                    RMAs will be batched to pick simultaneously.
+                </p>
+                <group>
+                    <field name="partner_id"/>
+                    <field name="partner_shipping_id"/>
+                    <field name="rma_line_ids" nolabel="1" colspan="4">
+                        <tree decoration-warning="rma_state != 'draft'" editable="bottom">
+                            <field name="rma_id" readonly="1" force_save="1"/>
+                            <field name="rma_state" invisible="1"/>
+                            <field name="rma_claim_number"/>
+                        </tree>
+                    </field>
+                </group>
+                <footer>
+                    <button name="create_batch" string="Confirm" type="object" class="btn-primary"/>
+                    <button string="Cancel" class="btn-secondary" special="cancel"/>
+                </footer>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_view_rma_make_rtv" model="ir.actions.act_window">
+        <field name="name">RMA Make RTV</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">rma.make.rtv</field>
+        <field name="view_mode">form</field>
+        <field name="target">new</field>
+        <field name="binding_model_id" ref="rma.model_rma_rma" />
+        <field name="binding_view_types">list</field>
+    </record>
+
+</odoo>
diff --git a/rma_product_cores/__init__.py b/rma_product_cores/__init__.py
new file mode 100644
index 00000000..c7120225
--- /dev/null
+++ b/rma_product_cores/__init__.py
@@ -0,0 +1,4 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from . import models
+from . import wizard
diff --git a/rma_product_cores/__manifest__.py b/rma_product_cores/__manifest__.py
new file mode 100755
index 00000000..979a0c7a
--- /dev/null
+++ b/rma_product_cores/__manifest__.py
@@ -0,0 +1,30 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+{
+    'name': 'RMA - Product Cores',
+    'author': 'Hibou Corp. <hello@hibou.io>',
+    'version': '13.0.1.0.1',
+    'license': 'OPL-1',
+    'category': 'Tools',
+    'summary': 'RMA Product Cores',
+    'description': """
+RMA Product Cores - Return core products from customers.
+    """,
+    'website': 'https://hibou.io/',
+    'depends': [
+        'hibou_professional',
+        'product_cores',
+        'rma_sale',
+    ],
+    'data': [
+        'views/portal_templates.xml',
+        'views/rma_views.xml',
+        'wizard/rma_lines_views.xml',
+    ],
+    'demo': [
+        'data/rma_demo.xml',
+    ],
+    'installable': True,
+    'application': False,
+    'auto_install': True,
+}
diff --git a/rma_product_cores/data/rma_demo.xml b/rma_product_cores/data/rma_demo.xml
new file mode 100644
index 00000000..6071c7a4
--- /dev/null
+++ b/rma_product_cores/data/rma_demo.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="template_product_core_sale_return" model="rma.template">
+        <field name="name">Core Sale Return</field>
+        <field name="usage">product_core_sale</field>
+        <field name="valid_days" eval="10"/>
+        <field name="create_in_picking" eval="True"/>
+        <field name="in_type_id" ref="stock.picking_type_in"/>
+        <field name="in_location_id" ref="stock.stock_location_customers"/>
+        <field name="in_location_dest_id" ref="stock.stock_location_stock"/>
+        <field name="in_procure_method">make_to_stock</field>
+        <field name="in_to_refund" eval="True"/>
+        <field name="in_require_return" eval="False"/>
+        <field name="so_decrement_order_qty" eval="False"/>
+    </record>
+
+    <record id="template_product_core_purchase_return" model="rma.template">
+        <field name="name">Core Purchase Return</field>
+        <field name="usage">product_core_purchase</field>
+        <field name="valid_days" eval="10"/>
+        <field name="create_out_picking" eval="True"/>
+        <field name="out_type_id" ref="stock.picking_type_out"/>
+        <field name="out_location_id" ref="stock.stock_location_stock"/>
+        <field name="out_location_dest_id" ref="stock.stock_location_suppliers"/>
+        <field name="out_procure_method">make_to_stock</field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/rma_product_cores/models/__init__.py b/rma_product_cores/models/__init__.py
new file mode 100644
index 00000000..2d2a9914
--- /dev/null
+++ b/rma_product_cores/models/__init__.py
@@ -0,0 +1,3 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from . import rma
diff --git a/rma_product_cores/models/rma.py b/rma_product_cores/models/rma.py
new file mode 100644
index 00000000..1d52747c
--- /dev/null
+++ b/rma_product_cores/models/rma.py
@@ -0,0 +1,239 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from collections import defaultdict
+from dateutil.relativedelta import relativedelta
+from odoo import api, fields, models, _
+from odoo.exceptions import UserError, ValidationError
+
+
+class RMATemplate(models.Model):
+    _inherit = 'rma.template'
+
+    usage = fields.Selection(selection_add=[
+        ('product_core_sale', 'Product Core Sale'),
+        ('product_core_purchase', 'Product Core Purchase'),
+    ])
+
+    # Portal Methods
+    def _portal_try_create(self, request_user, res_id, **kw):
+        if self.usage == 'product_core_sale':
+            prefix = 'product_'
+            product_map = {int(key[len(prefix):]): float(kw[key]) for key in kw if key.find(prefix) == 0 and kw[key]}
+            if product_map:
+                service_lines = self._get_product_core_sale_service_lines(request_user.partner_id)
+                eligible_service_lines = self._product_core_eligible_service_lines(service_lines)
+                eligible_lines = self._rma_product_core_eligible_data(service_lines, eligible_service_lines)
+                lines = []
+                for product_id, qty in product_map.items():
+                    product_f = filter(lambda key_product: key_product.id == product_id, eligible_lines)
+                    if product_f:
+                        product = next(product_f)
+                        product_data = eligible_lines[product]
+                        if not qty:
+                            continue
+                        if qty < 0.0 or product_data['qty_delivered'] < qty:
+                            raise ValidationError('Invalid quantity.')
+                        lines.append((0, 0, {
+                            'product_id': product.id,
+                            'product_uom_id': product.uom_id.id,
+                            'product_uom_qty': qty,
+                        }))
+                if not lines:
+                    raise ValidationError('Missing product quantity.')
+                rma = self.env['rma.rma'].create({
+                    'name': _('New'),
+                    'template_id': self.id,
+                    'partner_id': request_user.partner_id.id,
+                    'partner_shipping_id': request_user.partner_id.id,
+                    'lines': lines,
+                })
+                return rma
+        return super(RMATemplate, self)._portal_try_create(request_user, res_id, **kw)
+
+    def _portal_template(self, res_id=None):
+        if self.usage == 'product_core_sale':
+            return 'rma_product_cores.portal_new'
+        return super(RMATemplate, self)._portal_template(res_id=res_id)
+
+    def _portal_values(self, request_user, res_id=None):
+        if self.usage == 'product_core_sale':
+            service_lines = self._get_product_core_sale_service_lines(request_user.partner_id)
+            eligible_service_lines = self._product_core_eligible_service_lines(service_lines)
+            eligible_lines = self._rma_product_core_eligible_data(service_lines, eligible_service_lines)
+
+            return {
+                'rma_template': self,
+                'rma_product_core_lines': eligible_lines,
+            }
+        return super(RMATemplate, self)._portal_values(request_user, res_id=res_id)
+
+    # Product Cores
+    def _get_product_core_sale_service_lines(self, partner):
+        return partner.sale_order_ids.mapped('order_line').filtered(lambda l: l.core_line_id)\
+                                                          .sorted(key=lambda r: r.id)
+
+    def _product_core_eligible_service_lines(self, service_lines, date=None):
+        if not date:
+            date = fields.Datetime.now()
+        lines = service_lines.browse()
+        for line in service_lines:
+            validity = line.core_line_id.product_id.product_core_validity
+            partition_date = date - relativedelta(days=validity)
+            if line.order_id.date_order >= partition_date:
+                lines += line
+        return lines
+
+    def _rma_product_core_eligible_data(self, service_lines, eligible_service_lines):
+        rma_model = self.env['rma.rma']
+        eligible_lines = defaultdict(lambda: {
+            'qty_ordered': 0.0,
+            'qty_delivered': 0.0,
+            'qty_invoiced': 0.0,
+            'lines': self.env['sale.order.line'].browse()})
+
+        for line in service_lines:
+            product = rma_model._get_dirty_core_from_service_line(line)
+            if product:
+                eligible_line = eligible_lines[product]
+                eligible_line['lines'] += line
+                if line in eligible_service_lines:
+                    eligible_line['qty_ordered'] += line.product_uom_qty
+                    eligible_line['qty_delivered'] += line.qty_delivered
+                    eligible_line['qty_invoiced'] += line.qty_invoiced
+        return eligible_lines
+
+
+class RMA(models.Model):
+    _inherit = 'rma.rma'
+
+    def action_done(self):
+        res = super(RMA, self).action_done()
+        res2 = self._product_core_action_done()
+        if isinstance(res, dict) and isinstance(res2, dict):
+            if 'warning' in res and 'warning' in res2:
+                res['warning'] = '\n'.join([res['warning'], res2['warning']])
+                return res
+            if 'warning' in res2:
+                res['warning'] = res2['warning']
+                return res
+        elif isinstance(res2, dict):
+            return res2
+        return res
+
+    def _invoice_values_product_core_sale(self):
+        # the RMA invoice API will not be used as invoicing will happen at the SO level
+        return False
+
+    def _get_dirty_core_from_service_line(self, line):
+        original_product_line = line.core_line_id
+        return original_product_line.product_id.product_core_id
+
+    def _product_core_action_done(self):
+        for rma in self.filtered(lambda r: r.template_usage in ('product_core_sale', 'product_core_purchase')):
+            if rma.template_usage == 'product_core_sale':
+                service_lines = rma.template_id._get_product_core_sale_service_lines(rma.partner_id)
+                eligible_service_lines = rma.template_id._product_core_eligible_service_lines(service_lines, date=rma.create_date)
+
+                # collect the to reduce qty by product id
+                qty_to_reduce = defaultdict(float)
+                for line in rma.lines:
+                    qty_to_reduce[line.product_id.id] += line.product_uom_qty
+
+                # iterate over all service_lines to see if the qty_delivered can be reduced.
+                sale_orders = self.env['sale.order'].browse()
+                for line in eligible_service_lines:
+                    product = self._get_dirty_core_from_service_line(line)
+                    pid = product.id
+                    if qty_to_reduce[pid] > 0.0:
+                        if line.qty_delivered > 0.0:
+                            sale_orders += line.order_id
+                            if qty_to_reduce[pid] > line.qty_delivered:
+                                # can reduce this whole line
+                                qty_to_reduce[pid] -= line.qty_delivered
+                                line.write({'qty_delivered': 0.0})
+                            else:
+                                # can reduce some of this line, but there are no more to reduce
+                                line.write({'qty_delivered': line.qty_delivered - qty_to_reduce[pid]})
+                                qty_to_reduce[pid] = 0.0
+
+                # if there are more qty to reduce, then we have an error.
+                if any(qty_to_reduce.values()):
+                    raise UserError(_('Cannot complete RMA as there are not enough service lines to reduce. (Maybe a duplicate)'))
+
+                # Try to invoice if we don't already have an invoice (e.g. from resetting to draft)
+                if sale_orders and rma.template_id.invoice_done and not rma.invoice_ids:
+                    rma.invoice_ids += rma._product_core_sale_invoice_done(sale_orders)
+            else:
+                raise UserError(_('not ready for purchase rma'))
+        return True
+
+    def _product_core_sale_invoice_done(self, sale_orders):
+        return self._sale_invoice_done(sale_orders)
+
+    def action_add_product_core_lines(self):
+        make_line_obj = self.env['rma.product_cores.make.lines']
+        for rma in self:
+            lines = make_line_obj.create({
+                'rma_id': rma.id,
+            })
+            action = self.env.ref('rma_product_cores.action_rma_add_lines').read()[0]
+            action['res_id'] = lines.id
+            return action
+
+    def _product_cores_create_make_lines(self, wizard, rma_line_model):
+        """
+        Called from the wizard, as this model "owns" the eligibility and qty on lines.
+        :param wizard:
+        :param line_model:
+        :return:
+        """
+        if self.partner_id:
+            if self.template_usage == 'product_core_sale':
+                service_lines = self.template_id._get_product_core_sale_service_lines(self.partner_id)
+                eligible_service_lines = self.template_id._product_core_eligible_service_lines(service_lines, date=self.create_date)
+                rma_lines = rma_line_model.browse()
+                for line in service_lines:
+                    product = self._get_dirty_core_from_service_line(line)
+                    if product:
+                        rma_line = rma_lines.filtered(lambda l: l.product_id == product)
+                        if not rma_line:
+                            rma_line = rma_line_model.create({
+                                'rma_make_lines_id': wizard.id,
+                                'product_id': product.id,
+                                'product_uom_id': product.uom_id.id,
+                            })
+                            rma_lines += rma_line
+                        if line in eligible_service_lines:
+                            rma_line.update({
+                                'qty_ordered': rma_line.qty_ordered + line.product_uom_qty,
+                                'qty_delivered': rma_line.qty_delivered + line.qty_delivered,
+                                'qty_invoiced': rma_line.qty_invoiced + line.qty_invoiced,
+                            })
+            elif self.template_usage == 'product_core_purchase':
+                raise UserError('not ready for purchase rma')
+
+    def _product_core_field_check(self):
+        if not self.partner_shipping_id:
+            raise UserError(_('You must have a shipping address selected for this RMA.'))
+        if not self.partner_id:
+            raise UserError(_('You must have a partner selected for this RMA.'))
+
+    def _create_in_picking_product_core_sale(self):
+        self._product_core_field_check()
+        values = self.template_id._values_for_in_picking(self)
+        return self._picking_from_values(values, {}, {})
+
+    def _create_out_picking_product_core_sale(self):
+        self._product_core_field_check()
+        values = self.template_id._values_for_out_picking(self)
+        return self._picking_from_values(values, {}, {})
+
+    def _create_in_picking_product_core_purchase(self):
+        self._product_core_field_check()
+        values = self.template_id._values_for_in_picking(self)
+        return self._picking_from_values(values, {}, {})
+
+    def _create_out_picking_product_core_purchase(self):
+        self._product_core_field_check()
+        values = self.template_id._values_for_out_picking(self)
+        return self._picking_from_values(values, {}, {})
diff --git a/rma_product_cores/tests/__init__.py b/rma_product_cores/tests/__init__.py
new file mode 100644
index 00000000..586c5532
--- /dev/null
+++ b/rma_product_cores/tests/__init__.py
@@ -0,0 +1,3 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from . import test_rma
diff --git a/rma_product_cores/tests/test_rma.py b/rma_product_cores/tests/test_rma.py
new file mode 100644
index 00000000..afed4a0f
--- /dev/null
+++ b/rma_product_cores/tests/test_rma.py
@@ -0,0 +1,144 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo.addons.rma.tests.test_rma import TestRMA
+from odoo.exceptions import UserError, ValidationError
+from dateutil.relativedelta import relativedelta
+
+
+class TestRMACore(TestRMA):
+
+    def setUp(self):
+        super(TestRMACore, self).setUp()
+        self.template_sale_return = self.env.ref('rma_product_cores.template_product_core_sale_return')
+        self.template_purchase_return = self.env.ref('rma_product_cores.template_product_core_purchase_return')
+        self.product_core_service = self.env['product.product'].create({
+            'name': 'Turbo Core Deposit',
+            'type': 'service',
+            'categ_id': self.env.ref('product.product_category_all').id,
+            'core_ok': True,
+            'invoice_policy': 'delivery',
+        })
+        self.product_core = self.env['product.product'].create({
+            'name': 'Turbo Core',
+            'type': 'product',
+            'categ_id': self.env.ref('product.product_category_all').id,
+            'core_ok': True,
+            'tracking': 'serial',
+            'invoice_policy': 'delivery',
+        })
+
+    def test_30_product_core_sale_return(self):
+        # Initialize template
+        self.template_sale_return.usage = 'product_core_sale'
+        self.template_sale_return.invoice_done = True
+
+        self.product1.tracking = 'serial'
+        self.product1.product_core_id = self.product_core
+        self.product1.product_core_service_id = self.product_core_service
+        self.product1.product_core_validity = 30  # eligible for 30 days
+
+        order = self.env['sale.order'].create({
+            'partner_id': self.partner1.id,
+            'partner_invoice_id': self.partner1.id,
+            'partner_shipping_id': self.partner1.id,
+            'order_line': [(0, 0, {
+                'product_id': self.product1.id,
+                'product_uom_qty': 1.0,
+                'product_uom': self.product1.uom_id.id,
+                'price_unit': 10.0,
+            })]
+        })
+        order.action_confirm()
+        original_date_order = order.date_order
+        self.assertTrue(order.state in ('sale', 'done'))
+        self.assertEqual(len(order.picking_ids), 1, 'Tests only run with single stage delivery.')
+
+        # Try to RMA item not delivered yet
+        rma = self.env['rma.rma'].create({
+            'template_id': self.template_sale_return.id,
+            'partner_id': self.partner1.id,
+            'partner_shipping_id': self.partner1.id,
+        })
+        self.assertEqual(rma.state, 'draft')
+        wizard = self.env['rma.product_cores.make.lines'].create({
+            'rma_id': rma.id,
+        })
+        self.assertEqual(wizard.line_ids.qty_delivered, 0.0)
+        wizard.line_ids.product_uom_qty = 1.0
+        with self.assertRaises(UserError):
+            # Prevents adding if the qty_delivered on the line is not >= product_uom_qty
+            wizard.add_lines()
+
+        order.picking_ids.action_assign()
+        pack_opt = order.picking_ids.move_line_ids[0]
+
+        lot = self.env['stock.production.lot'].create({
+            'product_id': self.product1.id,
+            'name': 'X100',
+            'product_uom_id': self.product1.uom_id.id,
+            'company_id': self.env.user.company_id.id,
+        })
+        pack_opt.qty_done = 1.0
+        pack_opt.lot_id = lot
+        order.picking_ids.button_validate()
+        self.assertEqual(order.picking_ids.state, 'done')
+        self.assertEqual(order.order_line.filtered(lambda l: l.product_id == self.product1).qty_delivered,
+                         1.0)
+        self.assertEqual(order.order_line.filtered(lambda l: l.product_id == self.product_core_service).qty_delivered,
+                         1.0)
+
+        # ensure that we have a qty_delivered
+        wizard = self.env['rma.product_cores.make.lines'].create({
+            'rma_id': rma.id,
+        })
+        self.assertEqual(wizard.line_ids.qty_delivered, 1.0)
+
+        # set the date back and ensure that we have 0 again.
+        order.date_order = order.date_order - relativedelta(days=31)
+        wizard = self.env['rma.product_cores.make.lines'].create({
+            'rma_id': rma.id,
+        })
+        self.assertEqual(wizard.line_ids.qty_delivered, 0.0)
+
+        # Reset Date and process RMA
+        order.date_order = original_date_order
+        wizard = self.env['rma.product_cores.make.lines'].create({
+            'rma_id': rma.id,
+        })
+        self.assertEqual(wizard.line_ids.qty_delivered, 1.0)
+        wizard.line_ids.product_uom_qty = 1.0
+        wizard.add_lines()
+
+        # Invoice the order so that only the core product is invoiced at the end...
+        self.assertFalse(order.invoice_ids)
+        wiz = self.env['sale.advance.payment.inv'].with_context(active_ids=order.ids).create({})
+        wiz.create_invoices()
+        order.flush()
+        self.assertTrue(order.invoice_ids)
+
+        # The added product should be the 'dirty core' for the RMA's `core_product_id`
+        self.assertEqual(rma.lines.product_id, self.product1.product_core_id)
+        rma.action_confirm()
+        self.assertTrue(rma.in_picking_id)
+        self.assertEqual(rma.in_picking_id.state, 'assigned')
+        pack_opt = rma.in_picking_id.move_line_ids[0]
+        pack_opt.lot_id = self.env['stock.production.lot'].create({
+            'product_id': pack_opt.product_id.id,
+            'name': 'TESTDIRTYLOT1',
+            'company_id': self.env.user.company_id.id,
+        })
+        pack_opt.qty_done = 1.0
+        rma.in_picking_id.button_validate()
+        rma.action_done()
+        self.assertEqual(rma.state, 'done')
+
+        # Finishing the RMA should have made an invoice
+        self.assertTrue(rma.invoice_ids, 'Finishing RMA did not create an invoice(s).')
+        self.assertEqual(rma.invoice_ids.invoice_line_ids.product_id, self.product_core_service)
+
+        # Make sure the delivered qty of the Core Service was decremented.
+        self.assertEqual(order.order_line.filtered(lambda l: l.product_id == self.product1).qty_delivered,
+                         1.0)
+        # This is known to work in practice, but no amount of magic ORM flushing seems to make it work in test.
+        # self.assertEqual(order.order_line.filtered(lambda l: l.product_id == self.product_core_service).qty_delivered,
+        #                  0.0)
diff --git a/rma_product_cores/views/portal_templates.xml b/rma_product_cores/views/portal_templates.xml
new file mode 100644
index 00000000..ff1818d8
--- /dev/null
+++ b/rma_product_cores/views/portal_templates.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <!-- New -->
+    <template id="portal_new" name="New Product Core RMA">
+        <t t-call="portal.portal_layout">
+            <div id="optional_placeholder"></div>
+            <div class="container">
+                <t t-call="rma.portal_rma_error"/>
+                <div class="card">
+                    <div class="card-header">
+                        <div class="row">
+                            <div class="col-lg-12">
+                                <h4>
+                                    <span t-esc="rma_template.name"/>
+                                </h4>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="card-body">
+                        <p t-if="not rma_product_core_lines">No product cores in your purchase history.</p>
+                        <form t-if="rma_product_core_lines" method="post" t-attf-action="/my/rma/new/#{rma_template.id}/res/1">
+                            <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
+                            <div class="row">
+                                <div class="col-lg-5">
+                                    <strong>Product</strong>
+                                </div>
+                                <div class="col-lg-2 text-right">
+                                    <strong>Qty. Ordered</strong>
+                                </div>
+                                <div class="col-lg-2 text-right">
+                                    <strong>Qty. Invoiced</strong>
+                                </div>
+                                <div class="col-lg-2 text-right">
+                                    <strong>Qty. Delivered</strong>
+                                </div>
+                                <div class="col-lg-1 text-right">
+                                    <strong>Qty. to Return</strong>
+                                </div>
+                            </div>
+                            <t t-foreach="rma_product_core_lines" t-as="product">
+                                <t t-set="core_lines" t-value="rma_product_core_lines[product]"/>
+                                <hr/>
+                                <div class="row">
+                                    <div class="col-lg-1 text-center">
+                                        <img class="mr4 float-left o_portal_product_img" t-if="product.image_128" t-att-src="image_data_uri(product.image_128)" alt="Product Image" width="64"/>
+                                        <img class="mr4 float-left o_portal_product_img" t-if="not product.image_128" src="/web/static/src/img/placeholder.png" alt="Product Image" width="64"/>
+                                    </div>
+                                    <div class="col-lg-4">
+                                        <span t-esc="product.name"/>
+                                        <button class="btn btn-secondary btn-sm float-right" type="button" data-toggle="collapse" t-attf-data-target="#product_detail_#{product.id}" aria-expanded="false" aria-controls="collapseExample">
+                                            <span class="fa fa-info-circle"/>
+                                        </button>
+                                    </div>
+                                    <div class="col-lg-2 text-right">
+                                        <span t-esc="core_lines['qty_ordered']"/>
+                                    </div>
+                                    <div class="col-lg-2 text-right">
+                                        <span t-esc="core_lines['qty_invoiced']"/>
+                                    </div>
+                                    <div class="col-lg-2 text-right">
+                                        <span t-esc="core_lines['qty_delivered']"/>
+                                    </div>
+                                    <div class="col-lg-1 text-right">
+                                        <input type="text"  t-attf-name="product_#{product.id}" class="form-control"/>
+                                    </div>
+                                </div>
+                                <div class="collapse text-muted" t-attf-id="product_detail_#{product.id}">
+                                    <div class="row" t-foreach="core_lines['lines']" t-as="l">
+                                        <t t-set="validity" t-value="float(l.core_line_id.product_id.product_core_validity)"/>
+                                        <t t-set="partition_date" t-value="current_date - relativedelta(days=validity)"/>
+                                        <div class="col-lg-3">
+                                            <span t-field="l.order_id"/>
+                                        </div>
+                                        <div class="col-lg-2">
+                                            <span t-field="l.order_id.date_order"
+                                                  t-attf-class="#{'text-danger' if l.order_id.date_order &lt; partition_date else 'text-success'}"
+                                                  t-options='{"widget": "date"}'/>
+                                        </div>
+                                        <div class="col-lg-2 text-right">
+                                            <span t-esc="l.product_uom_qty"/>
+                                        </div>
+                                        <div class="col-lg-2 text-right">
+                                            <span t-esc="l.qty_invoiced"/>
+                                        </div>
+                                        <div class="col-lg-2 text-right">
+                                            <span t-esc="l.qty_delivered"/>
+                                        </div>
+                                    </div>
+                                </div>
+                            </t>
+                            <input type="submit" class="btn btn-primary mt16 float-right" name="submit"/>
+                        </form>
+                    </div>
+                </div>
+            </div>
+            <div class="oe_structure mb32"/>
+        </t>
+    </template>
+</odoo>
diff --git a/rma_product_cores/views/rma_views.xml b/rma_product_cores/views/rma_views.xml
new file mode 100644
index 00000000..af26eb9d
--- /dev/null
+++ b/rma_product_cores/views/rma_views.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <!-- RMA -->
+    <record id="view_rma_rma_form_product_cores" model="ir.ui.view">
+        <field name="name">rma.rma.form.product_cores</field>
+        <field name="model">rma.rma</field>
+        <field name="inherit_id" ref="rma.view_rma_rma_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='template_id']" position="after">
+                <br/>
+                <button string="Add lines" type="object" name="action_add_product_core_lines" attrs="{'invisible': ['|', ('template_usage', 'not in', ('product_core_sale')), ('state', '!=', 'draft')]}"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/rma_product_cores/wizard/__init__.py b/rma_product_cores/wizard/__init__.py
new file mode 100644
index 00000000..1cbabc08
--- /dev/null
+++ b/rma_product_cores/wizard/__init__.py
@@ -0,0 +1,3 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from . import rma_lines
diff --git a/rma_product_cores/wizard/rma_lines.py b/rma_product_cores/wizard/rma_lines.py
new file mode 100644
index 00000000..3d9e847c
--- /dev/null
+++ b/rma_product_cores/wizard/rma_lines.py
@@ -0,0 +1,43 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo import api, fields, models
+from odoo.exceptions import UserError
+
+
+class RMAProductCoresMakeLines(models.TransientModel):
+    _name = 'rma.product_cores.make.lines'
+    _description = 'Add Product Core Lines'
+
+    rma_id = fields.Many2one('rma.rma', string='RMA')
+    line_ids = fields.One2many('rma.product_cores.make.lines.line', 'rma_make_lines_id', string='Lines')
+
+    @api.model
+    def create(self, vals):
+        maker = super(RMAProductCoresMakeLines, self).create(vals)
+        maker._create_lines()
+        return maker
+
+    def _create_lines(self):
+        make_lines_obj = self.env['rma.product_cores.make.lines.line']
+        self.rma_id._product_cores_create_make_lines(self, make_lines_obj)
+
+    def add_lines(self):
+        rma_line_obj = self.env['rma.line']
+        for o in self:
+            lines = o.line_ids.filtered(lambda l: l.product_uom_qty > 0.0)
+            for l in lines:
+                if l.qty_delivered < l.product_uom_qty:
+                    raise UserError('You cannot return more than the eligible qty of this product.')
+                rma_line_obj.create({
+                    'rma_id': o.rma_id.id,
+                    'product_id': l.product_id.id,
+                    'product_uom_id': l.product_uom_id.id,
+                    'product_uom_qty': l.product_uom_qty,
+                })
+
+
+class RMAProductCoresMakeLinesLine(models.TransientModel):
+    _name = 'rma.product_cores.make.lines.line'
+    _inherit = 'rma.sale.make.lines.line'
+
+    rma_make_lines_id = fields.Many2one('rma.product_cores.make.lines')
diff --git a/rma_product_cores/wizard/rma_lines_views.xml b/rma_product_cores/wizard/rma_lines_views.xml
new file mode 100644
index 00000000..8ce97889
--- /dev/null
+++ b/rma_product_cores/wizard/rma_lines_views.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+
+    <record id="view_rma_add_lines_form" model="ir.ui.view">
+        <field name="name">view.rma.add.lines.form</field>
+        <field name="model">rma.product_cores.make.lines</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form>
+                <field name="line_ids">
+                    <tree editable="top" create="false" delete="false">
+                        <field name="product_id" readonly="1"/>
+                        <field name="qty_ordered" readonly="1"/>
+                        <field name="qty_delivered" readonly="1"/>
+                        <field name="qty_invoiced" readonly="1"/>
+                        <field name="product_uom_qty"/>
+                        <field name="product_uom_id" readonly="1"/>
+                    </tree>
+                </field>
+                <footer>
+                    <button class="oe_highlight"
+                            name="add_lines"
+                            type="object"
+                            string="Add" />
+                    <button class="oe_link"
+                            special="cancel"
+                            string="Cancel" />
+                </footer>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_rma_add_lines" model="ir.actions.act_window">
+        <field name="name">Add RMA Lines</field>
+        <field name="res_model">rma.product_cores.make.lines</field>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="view_rma_add_lines_form" />
+        <field name="target">new</field>
+    </record>
+
+</odoo>
\ No newline at end of file
diff --git a/rma_sale/__init__.py b/rma_sale/__init__.py
new file mode 100644
index 00000000..c7120225
--- /dev/null
+++ b/rma_sale/__init__.py
@@ -0,0 +1,4 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from . import models
+from . import wizard
diff --git a/rma_sale/__manifest__.py b/rma_sale/__manifest__.py
new file mode 100644
index 00000000..2f3f70ff
--- /dev/null
+++ b/rma_sale/__manifest__.py
@@ -0,0 +1,30 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+{
+    'name': 'Hibou RMAs for Sale Orders',
+    'version': '13.0.1.2.0',
+    'category': 'Sale',
+    'author': 'Hibou Corp.',
+    'license': 'OPL-1',
+    'website': 'https://hibou.io/',
+    'depends': [
+        'hibou_professional',
+        'rma',
+        'sale',
+        'sales_team',
+    ],
+    'data': [
+        'security/ir.model.access.csv',
+        'views/portal_templates.xml',
+        'views/product_views.xml',
+        'views/rma_views.xml',
+        'views/sale_views.xml',
+        'wizard/rma_lines_views.xml',
+    ],
+    'demo': [
+        'data/rma_demo.xml',
+    ],
+    'installable': True,
+    'auto_install': True,
+    'application': False,
+ }
diff --git a/rma_sale/data/rma_demo.xml b/rma_sale/data/rma_demo.xml
new file mode 100644
index 00000000..24132ea6
--- /dev/null
+++ b/rma_sale/data/rma_demo.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="template_sale_return" model="rma.template">
+        <field name="name">Sale Return</field>
+        <field name="usage">sale_order</field>
+        <field name="valid_days" eval="10"/>
+        <field name="create_in_picking" eval="True"/>
+        <field name="in_type_id" ref="stock.picking_type_in"/>
+        <field name="in_location_id" ref="stock.stock_location_customers"/>
+        <field name="in_location_dest_id" ref="stock.stock_location_stock"/>
+        <field name="in_procure_method">make_to_stock</field>
+        <field name="in_to_refund" eval="True"/>
+        <field name="in_require_return" eval="True"/>
+        <field name="so_decrement_order_qty" eval="True"/>
+    </record>
+
+</odoo>
\ No newline at end of file
diff --git a/rma_sale/models/__init__.py b/rma_sale/models/__init__.py
new file mode 100644
index 00000000..d997816f
--- /dev/null
+++ b/rma_sale/models/__init__.py
@@ -0,0 +1,5 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from . import product
+from . import rma
+from . import sale
diff --git a/rma_sale/models/product.py b/rma_sale/models/product.py
new file mode 100644
index 00000000..06308b76
--- /dev/null
+++ b/rma_sale/models/product.py
@@ -0,0 +1,26 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo import fields, models
+
+
+class ProductTemplate(models.Model):
+    _inherit = 'product.template'
+
+    rma_sale_validity = fields.Integer(string='RMA Eligible Days (Sale)',
+                                       help='Determines the number of days from the time '
+                                            'of the sale that the product is eligible to '
+                                            'be returned. 0 (default) will allow the product '
+                                            'to be returned for an indefinite period of time. '
+                                            'A positive number will allow the product to be '
+                                            'returned up to that number of days. A negative '
+                                            'number prevents the return of the product.')
+
+    rma_sale_warranty_validity = fields.Integer(string='RMA Eligible Days (Sale Warranty)',
+                                                help='Determines the number of days from the time '
+                                                     'of the sale that the product is eligible to '
+                                                     'be returned for warranty claims. '
+                                                     '0 (default) will allow the product to be '
+                                                     'returned for an indefinite period of time. '
+                                                     'A positive number will allow the product to be '
+                                                     'returned up to that number of days. A negative '
+                                                     'number prevents the return of the product.')
diff --git a/rma_sale/models/rma.py b/rma_sale/models/rma.py
new file mode 100644
index 00000000..fb800915
--- /dev/null
+++ b/rma_sale/models/rma.py
@@ -0,0 +1,265 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo import api, fields, models, _
+from odoo.exceptions import UserError, ValidationError
+from datetime import timedelta
+
+
+class SaleOrderLine(models.Model):
+    _inherit = 'sale.order.line'
+
+    def _get_protected_fields(self):
+        res = super(SaleOrderLine, self)._get_protected_fields()
+        context = self._context or {}
+        if context.get('rma_done') and 'product_uom_qty' in res:
+            res.remove('product_uom_qty')
+        return res
+
+
+class RMATemplate(models.Model):
+    _inherit = 'rma.template'
+
+    usage = fields.Selection(selection_add=[('sale_order', 'Sale Order')])
+    sale_order_warranty = fields.Boolean(string='Sale Order Warranty',
+                                         help='Determines if the regular return validity or '
+                                              'Warranty validity is used.')
+    so_decrement_order_qty = fields.Boolean(string='SO Decrement Ordered Qty.',
+                                            help='When completing the RMA, the Ordered Quantity will be decremented by '
+                                                 'the RMA qty.')
+
+    def _portal_try_create(self, request_user, res_id, **kw):
+        if self.usage == 'sale_order':
+            prefix = 'line_'
+            line_map = {int(key[len(prefix):]): float(kw[key]) for key in kw if key.find(prefix) == 0 and kw[key]}
+            if line_map:
+                sale_order = self.env['sale.order'].with_user(request_user).browse(res_id)
+                if not sale_order.exists():
+                    raise ValidationError('Invalid user for sale order.')
+                lines = []
+                sale_order_sudo = sale_order.sudo()
+                for line_id, qty in line_map.items():
+                    line = sale_order_sudo.order_line.filtered(lambda l: l.id == line_id)
+                    if line:
+                        if not qty:
+                            continue
+                        if qty < 0.0 or line.qty_delivered < qty:
+                            raise ValidationError('Invalid quantity.')
+                        validity = self._rma_sale_line_validity(line)
+                        if not validity:
+                            raise ValidationError('Product is not eligible for return.')
+                        if validity == 'expired':
+                            raise ValidationError('Product is past the return period.')
+                        lines.append((0, 0, {
+                            'product_id': line.product_id.id,
+                            'product_uom_id': line.product_uom.id,
+                            'product_uom_qty': qty,
+                        }))
+                if not lines:
+                    raise ValidationError('Missing product quantity.')
+                rma = self.env['rma.rma'].create({
+                    'name': _('New'),
+                    'sale_order_id': sale_order.id,
+                    'template_id': self.id,
+                    'partner_id': sale_order.partner_id.id,
+                    'partner_shipping_id': sale_order.partner_shipping_id.id,
+                    'lines': lines,
+                })
+                return rma
+        return super(RMATemplate, self)._portal_try_create(request_user, res_id, **kw)
+
+    def _portal_template(self, res_id=None):
+        if self.usage == 'sale_order':
+            return 'rma_sale.portal_new_sale_order'
+        return super(RMATemplate, self)._portal_template(res_id=res_id)
+
+    def _portal_values(self, request_user, res_id=None):
+        if self.usage == 'sale_order':
+            sale_orders = None
+            sale_order = None
+            if res_id:
+                sale_order = self.env['sale.order'].with_user(request_user).browse(res_id)
+                if sale_order:
+                    sale_order = sale_order.sudo()
+            else:
+                sale_orders = self.env['sale.order'].with_user(request_user).search([], limit=100)
+            return {
+                'rma_template': self,
+                'rma_sale_orders': sale_orders,
+                'rma_sale_order': sale_order,
+            }
+        return super(RMATemplate, self)._portal_values(request_user, res_id=res_id)
+
+    def _rma_sale_line_validity(self, so_line):
+        if self.sale_order_warranty:
+            validity_days = so_line.product_id.rma_sale_warranty_validity
+        else:
+            validity_days = so_line.product_id.rma_sale_validity
+        if validity_days < 0:
+            return ''
+        elif validity_days > 0:
+            sale_date = so_line.order_id.date_order
+            now = fields.Datetime.now()
+            if sale_date < (now - timedelta(days=validity_days)):
+                return 'expired'
+        return 'valid'
+
+
+class RMA(models.Model):
+    _inherit = 'rma.rma'
+
+    sale_order_id = fields.Many2one('sale.order', string='Sale Order')
+    sale_order_rma_count = fields.Integer('Number of RMAs for this Sale Order', compute='_compute_sale_order_rma_count')
+    company_id = fields.Many2one('res.company', 'Company',
+                                 default=lambda self: self.env.company)
+
+    @api.depends('sale_order_id')
+    def _compute_sale_order_rma_count(self):
+        for rma in self:
+            if rma.sale_order_id:
+                rma_data = self.read_group([('sale_order_id', '=', rma.sale_order_id.id), ('state', '!=', 'cancel')],
+                                           ['sale_order_id'], ['sale_order_id'])
+                if rma_data:
+                    rma.sale_order_rma_count = rma_data[0]['sale_order_id_count']
+                else:
+                    rma.sale_order_rma_count = 0.0
+            else:
+                rma.sale_order_rma_count = 0.0
+
+    def open_sale_order_rmas(self):
+        return {
+            'type': 'ir.actions.act_window',
+            'name': _('Sale Order RMAs'),
+            'res_model': 'rma.rma',
+            'view_mode': 'tree,form',
+            'context': {'search_default_sale_order_id': self[0].sale_order_id.id}
+        }
+
+    @api.onchange('template_usage')
+    def _onchange_template_usage(self):
+        res = super(RMA, self)._onchange_template_usage()
+        for rma in self.filtered(lambda rma: rma.template_usage != 'sale_order'):
+            rma.sale_order_id = False
+        return res
+
+    @api.onchange('sale_order_id')
+    def _onchange_sale_order_id(self):
+        for rma in self.filtered(lambda rma: rma.sale_order_id):
+            rma.partner_id = rma.sale_order_id.partner_id
+            rma.partner_shipping_id = rma.sale_order_id.partner_shipping_id
+
+    def action_done(self):
+        res = super(RMA, self).action_done()
+        res2 = self._so_action_done()
+        if isinstance(res, dict) and isinstance(res2, dict):
+            if 'warning' in res and 'warning' in res2:
+                res['warning'] = '\n'.join([res['warning'], res2['warning']])
+                return res
+            if 'warning' in res2:
+                res['warning'] = res2['warning']
+                return res
+        elif isinstance(res2, dict):
+            return res2
+        return res
+
+    def _so_action_done(self):
+        warnings = []
+        for rma in self:
+            sale_orders = rma.sale_order_id
+            if rma.template_id.so_decrement_order_qty:
+                sale_orders = self.env['sale.order'].browse()
+                for rma_line in rma.lines:
+                    so_lines = rma.sale_order_id.order_line.filtered(lambda l: l.product_id == rma_line.product_id)
+                    qty_remaining = rma_line.product_uom_qty
+                    for sale_line in so_lines:
+                        if qty_remaining == 0:
+                            continue
+                        sale_line_qty = sale_line.product_uom_qty
+                        sale_line_qty = sale_line_qty - qty_remaining
+                        if sale_line_qty < 0:
+                            qty_remaining = abs(sale_line_qty)
+                            sale_line_qty = 0
+                        else:
+                            qty_remaining = 0
+                        sale_line.with_context(rma_done=True).write({'product_uom_qty': sale_line_qty})
+                        sale_orders += sale_line.order_id
+                    if qty_remaining:
+                        warnings.append((rma, rma.sale_order_id, rma_line, qty_remaining))
+            # Try to invoice if we don't already have an invoice (e.g. from resetting to draft)
+            if sale_orders and rma.template_id.invoice_done and not rma.invoice_ids:
+                rma.invoice_ids += rma._sale_invoice_done(sale_orders)
+        if warnings:
+            return {'warning': _('Could not reduce all ordered qty:\n %s' % '\n'.join(
+                ['%s %s %s : %s' % (w[0].name, w[1].name, w[2].product_id.display_name, w[3]) for w in warnings]))}
+        return True
+
+    def _sale_invoice_done(self, sale_orders):
+        original_invoices = sale_orders.mapped('invoice_ids')
+        try:
+            wiz = self.env['sale.advance.payment.inv'].with_context(active_ids=sale_orders.ids).create({})
+            wiz.create_invoices()
+        except UserError:
+            pass
+        return sale_orders.mapped('invoice_ids') - original_invoices
+
+    def _invoice_values_sale_order(self):
+        # the RMA invoice API will not be used as invoicing will happen at the SO level
+        return False
+
+    def action_add_so_lines(self):
+        make_line_obj = self.env['rma.sale.make.lines']
+        for rma in self:
+            lines = make_line_obj.create({
+                'rma_id': rma.id,
+            })
+            action = self.env.ref('rma_sale.action_rma_add_lines').read()[0]
+            action['res_id'] = lines.id
+            return action
+
+    def _create_in_picking_sale_order(self):
+        if not self.sale_order_id:
+            raise UserError(_('You must have a sale order for this RMA.'))
+        if not self.template_id.in_require_return:
+            group_id = self.sale_order_id.procurement_group_id.id if self.sale_order_id.procurement_group_id else 0
+            sale_id = self.sale_order_id.id
+            values = self.template_id._values_for_in_picking(self)
+            update = {'sale_id': sale_id, 'group_id': group_id}
+            update_lines = {'to_refund': self.template_id.in_to_refund, 'group_id': group_id}
+            return self._picking_from_values(values, update, update_lines)
+
+        lines = self.lines.filtered(lambda l: l.product_uom_qty >= 1 and l.product_id.type != 'service')
+        if not lines:
+            raise UserError(_('You have no lines with positive quantity.'))
+        product_ids = lines.mapped('product_id.id')
+
+        old_picking = self._find_candidate_return_picking(product_ids, self.sale_order_id.picking_ids, self.template_id.in_location_id.id)
+        if not old_picking:
+            raise UserError('No eligible pickings were found to return (you can only return products from the same initial picking).')
+
+        new_picking = self._new_in_picking(old_picking)
+        self._new_in_moves(old_picking, new_picking, {})
+        return new_picking
+
+    def _create_out_picking_sale_order(self):
+        if not self.sale_order_id:
+            raise UserError(_('You must have a sale order for this RMA.'))
+        if not self.template_id.out_require_return:
+            group_id = self.sale_order_id.procurement_group_id.id if self.sale_order_id.procurement_group_id else 0
+            sale_id = self.sale_order_id.id
+            values = self.template_id._values_for_out_picking(self)
+            update = {'sale_id': sale_id, 'group_id': group_id}
+            update_lines = {'group_id': group_id}
+            return self._picking_from_values(values, update, update_lines)
+
+        lines = self.lines.filtered(lambda l: l.product_uom_qty >= 1 and l.product_id.type != 'service')
+        if not lines:
+            raise UserError(_('You have no lines with positive quantity.'))
+        product_ids = lines.mapped('product_id.id')
+
+        old_picking = self._find_candidate_return_picking(product_ids, self.sale_order_id.picking_ids, self.template_id.out_location_dest_id.id)
+        if not old_picking:
+            raise UserError(
+                'No eligible pickings were found to duplicate (you can only return products from the same initial picking).')
+
+        new_picking = self._new_out_picking(old_picking)
+        self._new_out_moves(old_picking, new_picking, {})
+        return new_picking
diff --git a/rma_sale/models/sale.py b/rma_sale/models/sale.py
new file mode 100644
index 00000000..66abb68d
--- /dev/null
+++ b/rma_sale/models/sale.py
@@ -0,0 +1,15 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo import api, fields, models
+
+
+class SaleOrder(models.Model):
+    _inherit = 'sale.order'
+
+    rma_count = fields.Integer(string='RMA Count', compute='_compute_rma_count', compute_sudo=True)
+    rma_ids = fields.One2many('rma.rma', 'sale_order_id', string='RMAs')
+
+    @api.depends('rma_ids')
+    def _compute_rma_count(self):
+        for so in self:
+            so.rma_count = len(so.rma_ids)
diff --git a/rma_sale/security/ir.model.access.csv b/rma_sale/security/ir.model.access.csv
new file mode 100644
index 00000000..ccb878eb
--- /dev/null
+++ b/rma_sale/security/ir.model.access.csv
@@ -0,0 +1,7 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"manage_rma sale","manage rma","rma.model_rma_rma","sales_team.group_sale_salesman",1,1,1,1
+"manage_rma_line sale","manage rma line","rma.model_rma_line","sales_team.group_sale_salesman",1,1,1,1
+"manage_rma_template sale","manage rma template","rma.model_rma_template","sales_team.group_sale_manager",1,1,1,1
+"manage_rma_tag sale","manage rma tag","rma.model_rma_tag","sales_team.group_sale_manager",1,1,1,1
+"access_rma_template sale","access rma template","rma.model_rma_template","sales_team.group_sale_salesman",1,1,0,0
+"access_rma_tag sale","access rma tag","rma.model_rma_tag","sales_team.group_sale_salesman",1,0,0,0
\ No newline at end of file
diff --git a/rma_sale/tests/__init__.py b/rma_sale/tests/__init__.py
new file mode 100644
index 00000000..586c5532
--- /dev/null
+++ b/rma_sale/tests/__init__.py
@@ -0,0 +1,3 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from . import test_rma
diff --git a/rma_sale/tests/test_rma.py b/rma_sale/tests/test_rma.py
new file mode 100644
index 00000000..7cd4d329
--- /dev/null
+++ b/rma_sale/tests/test_rma.py
@@ -0,0 +1,306 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo.addons.rma.tests.test_rma import TestRMA
+from odoo.exceptions import UserError, ValidationError
+from datetime import timedelta
+
+
+class TestRMASale(TestRMA):
+
+    def setUp(self):
+        super(TestRMASale, self).setUp()
+        self.template_sale_return = self.env.ref('rma_sale.template_sale_return')
+        # Make it possible to "see all sale orders", but not be a manager (as managers can RMA ineligible lines)
+        self.user1.groups_id += self.env.ref('sales_team.group_sale_salesman_all_leads')
+
+    def test_20_sale_return(self):
+        self.template_sale_return.write({
+            'usage': 'sale_order',
+            'invoice_done': True,
+        })
+        self.product1.write({
+            'type': 'product',
+            'invoice_policy': 'delivery',
+            'tracking': 'serial',
+        })
+        order = self.env['sale.order'].create({
+            'partner_id': self.partner1.id,
+            'partner_invoice_id': self.partner1.id,
+            'partner_shipping_id': self.partner1.id,
+            'order_line': [(0, 0, {
+                'product_id': self.product1.id,
+                'product_uom_qty': 1.0,
+                'product_uom': self.product1.uom_id.id,
+                'price_unit': 10.0,
+            })]
+        })
+        order.action_confirm()
+        self.assertTrue(order.state in ('sale', 'done'))
+        self.assertEqual(len(order.picking_ids), 1, 'Tests only run with single stage delivery.')
+
+        # Try to RMA item not delivered yet
+        rma = self.env['rma.rma'].create({
+            'template_id': self.template_sale_return.id,
+            'partner_id': self.partner1.id,
+            'partner_shipping_id': self.partner1.id,
+            'sale_order_id': order.id,
+        })
+        self.assertEqual(rma.state, 'draft')
+        # Do not allow return.
+        self.product1.rma_sale_validity = -1
+        wizard = self.env['rma.sale.make.lines'].with_user(self.user1).create({'rma_id': rma.id})
+        self.assertEqual(wizard.line_ids.qty_delivered, 0.0)
+        wizard.line_ids.product_uom_qty = 1.0
+
+        with self.assertRaises(UserError):
+            wizard.add_lines()
+
+        # Allows returns, but not forever
+        self.product1.rma_sale_validity = 5
+        original_date_order = order.date_order
+        order.write({'date_order': original_date_order - timedelta(days=6)})
+        wizard = self.env['rma.sale.make.lines'].with_user(self.user1).create({'rma_id': rma.id})
+        self.assertEqual(wizard.line_ids.qty_delivered, 0.0)
+        wizard.line_ids.product_uom_qty = 1.0
+        with self.assertRaises(UserError):
+            wizard.add_lines()
+
+        # Allows returns due to date
+        order.write({'date_order': original_date_order})
+        wizard = self.env['rma.sale.make.lines'].with_user(self.user1).create({'rma_id': rma.id})
+        self.assertEqual(wizard.line_ids.qty_delivered, 0.0)
+        wizard.line_ids.product_uom_qty = 1.0
+        wizard.add_lines()
+
+        self.assertEqual(len(rma.lines), 1)
+        with self.assertRaises(UserError):
+            rma.action_confirm()
+
+        order.picking_ids.action_assign()
+        pack_opt = order.picking_ids.move_line_ids[0]
+        lot = self.env['stock.production.lot'].create({
+            'product_id': self.product1.id,
+            'name': 'X100',
+            'product_uom_id': self.product1.uom_id.id,
+            'company_id': self.env.user.company_id.id,
+        })
+        pack_opt.qty_done = 1.0
+        pack_opt.lot_id = lot
+        order.picking_ids.button_validate()
+        self.assertEqual(order.picking_ids.state, 'done')
+
+        # Invoice order so that the return is invoicable
+        wiz = self.env['sale.advance.payment.inv'].with_context(active_ids=order.ids).create({})
+        wiz.create_invoices()
+        # Odoo 13 Not flushing the order here will cause delivered_qty to be incorrect later
+        order.flush()
+        self.assertTrue(order.invoice_ids, 'Order did not create an invoice.')
+
+        wizard = self.env['rma.sale.make.lines'].create({
+            'rma_id': rma.id,
+        })
+        self.assertEqual(wizard.line_ids.qty_delivered, 1.0)
+
+        # Confirm RMA
+        rma.action_confirm()
+        self.assertEqual(rma.in_picking_id.state, 'assigned')
+        pack_opt = rma.in_picking_id.move_line_ids[0]
+
+        with self.assertRaises(UserError):
+            rma.action_done()
+
+        pack_opt.lot_id = lot
+        pack_opt.qty_done = 1.0
+        rma.in_picking_id.button_validate()
+        self.assertEqual(rma.in_picking_id.move_lines.sale_line_id, order.order_line)
+        self.assertEqual(rma.in_picking_id.state, 'done')
+        for move in order.order_line.mapped('move_ids'):
+            # Additional testing like this may not be needed in the future.  Was added troubleshooting new 13 ORM
+            self.assertEqual(move.state, 'done', 'Move not done ' + str(move.name))
+        self.assertEqual(order.order_line.qty_delivered, 0.0)
+        rma.action_done()
+        self.assertEqual(order.order_line.qty_delivered, 0.0)
+
+        # Finishing the RMA should have made an invoice
+        self.assertTrue(rma.invoice_ids, 'Finishing RMA did not create an invoice(s).')
+
+        # Test Ordered Qty was decremented.
+        self.assertEqual(order.order_line.product_uom_qty, 0.0)
+        self.assertEqual(order.order_line.qty_delivered, 0.0)
+
+        # Make another RMA for the same sale order
+        rma2 = self.env['rma.rma'].create({
+            'template_id': self.template_sale_return.id,
+            'partner_id': self.partner1.id,
+            'partner_shipping_id': self.partner1.id,
+            'sale_order_id': order.id,
+        })
+        wizard = self.env['rma.sale.make.lines'].create({
+            'rma_id': rma2.id,
+        })
+        # The First completed RMA will have "un-delivered" it for invoicing purposes.
+        self.assertEqual(wizard.line_ids.qty_delivered, 0.0)
+        wizard.line_ids.product_uom_qty = 1.0
+        wizard.add_lines()
+        self.assertEqual(len(rma2.lines), 1)
+
+        rma2.action_confirm()
+
+        # In Odoo 10, this would not have been able to reserve.
+        # In Odoo 11, reservation can still happen, but at least we can't move the same lot twice!
+        #self.assertEqual(rma2.in_picking_id.state, 'confirmed')
+
+        # Requires Lot
+        with self.assertRaises(UserError):
+            rma2.in_picking_id.move_line_ids.write({'qty_done': 1.0})
+            rma2.in_picking_id.button_validate()
+
+        self.assertTrue(rma2.in_picking_id.move_line_ids)
+        self.assertFalse(rma2.in_picking_id.move_line_ids.lot_id.name)
+
+        # Assign existing lot
+        rma2.in_picking_id.move_line_ids.write({
+            'lot_id': lot.id,
+            'qty_done': 1.0,
+        })
+
+        # Existing lot cannot be re-used.
+        with self.assertRaises(ValidationError):
+            rma2.in_picking_id.action_done()
+        
+        # RMA cannot be completed because the inbound picking state is confirmed
+        with self.assertRaises(UserError):
+            rma2.action_done()
+
+    def test_30_product_sale_return_warranty(self):
+        self.template_sale_return.write({
+            'usage': 'sale_order',
+            'invoice_done': True,
+            'sale_order_warranty': True,
+            'in_to_refund': True,
+            'so_decrement_order_qty': False,  # invoice on decremented delivered not decremented order
+            'next_rma_template_id': self.template_rtv.id,
+        })
+
+        validity = 100  # eligible for 100 days
+        warranty_validity = validity + 100  # eligible for 200 days
+
+        self.product1.write({
+            'rma_sale_validity': validity,
+            'rma_sale_warranty_validity': warranty_validity,
+            'type': 'product',
+            'invoice_policy': 'delivery',
+            'tracking': 'serial',
+            'standard_price': 1.5,
+        })
+
+        order = self.env['sale.order'].create({
+            'partner_id': self.partner1.id,
+            'partner_invoice_id': self.partner1.id,
+            'partner_shipping_id': self.partner1.id,
+            'user_id': self.user1.id,
+            'order_line': [(0, 0, {
+                'product_id': self.product1.id,
+                'product_uom_qty': 1.0,
+                'product_uom': self.product1.uom_id.id,
+                'price_unit': 10.0,
+            })]
+        })
+        order.action_confirm()
+        self.assertTrue(order.state in ('sale', 'done'))
+        self.assertEqual(len(order.picking_ids), 1, 'Tests only run with single stage delivery.')
+
+        # Try to RMA item not delivered yet
+        rma = self.env['rma.rma'].create({
+            'template_id': self.template_sale_return.id,
+            'partner_id': self.partner1.id,
+            'partner_shipping_id': self.partner1.id,
+            'sale_order_id': order.id,
+        })
+        self.assertEqual(rma.state, 'draft')
+        # Do not allow warranty return.
+        self.product1.rma_sale_warranty_validity = -1
+        wizard = self.env['rma.sale.make.lines'].with_user(self.user1).create({'rma_id': rma.id})
+        self.assertEqual(wizard.line_ids.qty_delivered, 0.0)
+        wizard.line_ids.product_uom_qty = 1.0
+
+        with self.assertRaises(UserError):
+            wizard.add_lines()
+
+        # Allows returns, but not forever
+        self.product1.rma_sale_warranty_validity = warranty_validity
+        original_date_order = order.date_order
+        order.write({'date_order': original_date_order - timedelta(days=warranty_validity+1)})
+        wizard = self.env['rma.sale.make.lines'].with_user(self.user1).create({'rma_id': rma.id})
+        self.assertEqual(wizard.line_ids.qty_delivered, 0.0)
+        wizard.line_ids.product_uom_qty = 1.0
+        with self.assertRaises(UserError):
+            wizard.add_lines()
+
+        # Allows returns due to date, due to warranty option
+        order.write({'date_order': original_date_order - timedelta(days=validity+1)})
+        wizard = self.env['rma.sale.make.lines'].with_user(self.user1).create({'rma_id': rma.id})
+        self.assertEqual(wizard.line_ids.qty_delivered, 0.0)
+        wizard.line_ids.product_uom_qty = 1.0
+        wizard.add_lines()
+
+        # finish outbound so that we can invoice.
+        order.picking_ids.action_assign()
+        pack_opt = order.picking_ids.move_line_ids[0]
+        lot = self.env['stock.production.lot'].create({
+            'product_id': self.product1.id,
+            'name': 'X100',
+            'product_uom_id': self.product1.uom_id.id,
+            'company_id': self.env.user.company_id.id,
+        })
+        pack_opt.qty_done = 1.0
+        pack_opt.lot_id = lot
+        order.picking_ids.button_validate()
+        self.assertEqual(order.picking_ids.state, 'done')
+        self.assertEqual(order.order_line.qty_delivered, 1.0)
+
+        # Invoice the order so that only the core product is invoiced at the end...
+        self.assertFalse(order.invoice_ids)
+        wiz = self.env['sale.advance.payment.inv'].with_context(active_ids=order.ids).create({})
+        wiz.create_invoices()
+        order.flush()
+        self.assertTrue(order.invoice_ids)
+        order_invoice = order.invoice_ids
+
+        self.assertEqual(rma.lines.product_id, self.product1)
+        rma.action_confirm()
+        self.assertTrue(rma.in_picking_id)
+        self.assertEqual(rma.in_picking_id.state, 'assigned')
+        pack_opt = rma.in_picking_id.move_line_ids[0]
+        pack_opt.lot_id = lot.id
+        pack_opt.qty_done = 1.0
+        rma.in_picking_id.button_validate()
+        self.assertEqual(rma.in_picking_id.state, 'done')
+        order.flush()
+        # self.assertEqual(order.order_line.qty_delivered, 0.0)
+        rma.action_done()
+        self.assertEqual(rma.state, 'done')
+        order.flush()
+
+        rma_invoice = rma.invoice_ids
+        self.assertTrue(rma_invoice)
+        sale_line = rma_invoice.invoice_line_ids.filtered(lambda l: l.sale_line_ids)
+        so_line = sale_line.sale_line_ids
+        self.assertTrue(sale_line)
+        self.assertEqual(sale_line.price_unit, so_line.price_unit)
+
+        # Invoices do not have their anglo-saxon cost lines until they post
+        order_invoice.post()
+        rma_invoice.post()
+
+        # Find the return to vendor RMA
+        rtv_rma = self.env['rma.rma'].search([('parent_id', '=', rma.id)])
+        self.assertTrue(rtv_rma)
+        self.assertFalse(rtv_rma.out_picking_id)
+
+        wiz = self.env['rma.make.rtv'].with_context(active_model='rma.rma', active_ids=rtv_rma.ids).create({})
+        self.assertTrue(wiz.rma_line_ids)
+        wiz.partner_id = self.partner2
+        wiz.create_batch()
+        self.assertTrue(rtv_rma.out_picking_id)
+        self.assertEqual(rtv_rma.out_picking_id.partner_id, self.partner2)
diff --git a/rma_sale/views/portal_templates.xml b/rma_sale/views/portal_templates.xml
new file mode 100644
index 00000000..bb97b9b7
--- /dev/null
+++ b/rma_sale/views/portal_templates.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <template id="portal_my_rma_rma_inherit" inherit_id="rma.portal_my_rma_rma">
+        <xpath expr="//div[hasclass('rma-details')]" position="inside">
+            <div t-if="rma.sale_order_id" class="mb8">
+                <strong>Sale Order:</strong>
+                <span t-esc="rma.sale_order_id.name"/>
+            </div>
+        </xpath>
+    </template>
+
+    <!-- New -->
+    <template id="portal_new_sale_order" name="New Sale Order RMA">
+        <t t-call="portal.portal_layout">
+            <div id="optional_placeholder"></div>
+            <div class="container">
+                <t t-call="rma.portal_rma_error"/>
+                <div class="card">
+                    <div class="card-header">
+                        <div class="row">
+                            <div class="col-lg-12">
+                                <h4>
+                                    <span t-esc="rma_template.name"/>
+                                </h4>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="card-body">
+                        <ul t-if="rma_sale_orders" class="list-group">
+                            <li class="list-group-item" t-foreach="rma_sale_orders" t-as="s">
+                                <a t-attf-href="/my/rma/new/#{rma_template.id}/res/#{s.id}">
+                                    <span t-esc="s.name"/> - Order Date: <span t-field="s.date_order"/>
+                                </a>
+                            </li>
+                        </ul>
+                        <p t-if="not rma_sale_orders and not rma_sale_order">No Sale Orders to choose from.</p>
+                        <form t-if="rma_sale_order" method="post" t-attf-action="/my/rma/new/#{rma_template.id}/res/#{rma_sale_order.id}">
+                            <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
+                            <div class="row">
+                                <div class="col-lg-4">
+                                    <strong>Product</strong>
+                                </div>
+                                <div class="col-lg-3">
+                                    <strong>Description</strong>
+                                </div>
+                                <div class="col-lg-2 text-right">
+                                    <strong>Qty. Ordered</strong>
+                                </div>
+                                <div class="col-lg-2 text-right">
+                                    <strong>Qty. Delivered</strong>
+                                </div>
+                                <div class="col-lg-1 text-right">
+                                    <strong>Qty. to Return</strong>
+                                </div>
+                            </div>
+                            <t t-foreach="rma_sale_order.order_line" t-as="line">
+                                <t t-set="validity" t-value="rma_template._rma_sale_line_validity(line)"/>
+                                <div class="row" t-attf-class="row #{'' if validity == 'valid' else 'text-muted'}">
+                                    <div class="col-lg-1 text-center">
+                                        <img class="mr4 float-left o_portal_product_img" t-if="line.product_id.image_128" t-att-src="image_data_uri(line.product_id.image_128)" alt="Product Image" width="64"/>
+                                        <img class="mr4 float-left o_portal_product_img" t-if="not line.product_id.image_128" src="/web/static/src/img/placeholder.png" alt="Product Image" width="64"/>
+                                    </div>
+                                    <div class="col-lg-3">
+                                        <span t-esc="line.product_id.name"/>
+                                    </div>
+                                    <div class="col-lg-3">
+                                        <span t-esc="line.name"/>
+                                    </div>
+                                    <div class="col-lg-2 text-right">
+                                        <span t-esc="line.product_uom_qty"/>
+                                    </div>
+                                    <div class="col-lg-2 text-right">
+                                        <span t-esc="line.qty_delivered"/>
+                                    </div>
+                                    <div class="col-lg-1 text-right" t-if="validity == 'valid'">
+                                        <input type="text"  t-attf-name="line_#{line.id}" class="form-control"/>
+                                    </div>
+                                    <div class="col-lg-1 text-left" t-else="">
+                                        <span t-if="validity == 'expired'">Expired</span>
+                                        <span t-else="">Not Eligible</span>
+                                    </div>
+                                </div>
+                            </t>
+                            <input type="submit" class="btn btn-primary mt16 float-right" name="submit"/>
+                        </form>
+                    </div>
+                </div>
+            </div>
+            <div class="oe_structure mb32"/>
+        </t>
+    </template>
+
+
+</odoo>
diff --git a/rma_sale/views/product_views.xml b/rma_sale/views/product_views.xml
new file mode 100644
index 00000000..41ea3e62
--- /dev/null
+++ b/rma_sale/views/product_views.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="product_template_only_form_view_inherit" model="ir.ui.view">
+        <field name="name">product.template.product.form.inherit</field>
+        <field name="model">product.template</field>
+        <field name="inherit_id" ref="product.product_template_only_form_view"/>
+        <field name="arch" type="xml">
+            <xpath expr="//page[@name='sales']/group[@name='sale']" position="inside">
+                <group name="rma_sale" string="RMA Sales">
+                    <field name="rma_sale_validity" string="Eligible Days"/>
+                    <field name="rma_sale_warranty_validity" string="Warranty Eligible Days"/>
+                </group>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="product_normal_form_view_inherit" model="ir.ui.view">
+        <field name="name">product.product.form.inherit</field>
+        <field name="model">product.product</field>
+        <field name="inherit_id" ref="product.product_normal_form_view"/>
+        <field name="arch" type="xml">
+            <xpath expr="//page[@name='sales']/group[@name='sale']" position="inside">
+                <group name="rma_sale" string="RMA Sales">
+                    <field name="rma_sale_validity" string="Eligible Days"/>
+                    <field name="rma_sale_warranty_validity" string="Warranty Eligible Days"/>
+                </group>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/rma_sale/views/rma_views.xml b/rma_sale/views/rma_views.xml
new file mode 100644
index 00000000..9c39bf9b
--- /dev/null
+++ b/rma_sale/views/rma_views.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <!-- RMA Template -->
+    <record id="view_rma_template_form_sale" model="ir.ui.view">
+        <field name="name">rma.template.form.sale</field>
+        <field name="model">rma.template</field>
+        <field name="inherit_id" ref="rma.view_rma_template_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='usage']" position="after">
+                <field name="so_decrement_order_qty" string="Decrement Ordered Qty" attrs="{'invisible': [('usage', '!=', 'sale_order')]}"/>
+                <field name="sale_order_warranty" string="Warranty" attrs="{'invisible': [('usage', '!=', 'sale_order')]}"/>
+            </xpath>
+        </field>
+    </record>
+
+    <!-- RMA -->
+    <record id="view_rma_rma_form_sale" model="ir.ui.view">
+        <field name="name">rma.rma.form.sale</field>
+        <field name="model">rma.rma</field>
+        <field name="inherit_id" ref="rma.view_rma_rma_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//div[@name='button_box']" position="inside">
+                <button class="oe_stat_button" name="open_sale_order_rmas" icon="fa-cubes"
+                        type="object" attrs="{'invisible': ['|', ('sale_order_id', '=', False), ('sale_order_rma_count', '&lt;=', 1)]}">
+                    <field name="sale_order_rma_count" string="SO RMAs" widget="statinfo" />
+                </button>
+            </xpath>
+            <xpath expr="//field[@name='template_id']" position="after">
+                <field name="sale_order_id" options="{'no_create': True}" attrs="{'invisible': [('template_usage', '!=', 'sale_order')], 'required': [('template_usage', '=', 'sale_order')], 'readonly': [('state', 'in', ('confirmed', 'done', 'cancel'))]}"/>
+                <br/>
+                <button string="Add lines" type="object" name="action_add_so_lines" attrs="{'invisible': ['|', ('sale_order_id', '=', False), ('state', '!=', 'draft')]}"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="view_rma_rma_tree_sale" model="ir.ui.view">
+        <field name="name">rma.rma.tree.sale</field>
+        <field name="model">rma.rma</field>
+        <field name="inherit_id" ref="rma.view_rma_rma_tree"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='template_id']" position="after">
+                <field name="sale_order_id"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="view_rma_rma_search_sale" model="ir.ui.view">
+        <field name="name">rma.rma.tree.sale</field>
+        <field name="model">rma.rma</field>
+        <field name="inherit_id" ref="rma.view_rma_rma_search"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='template_id']" position="after">
+                <field name="sale_order_id"/>
+            </xpath>
+        </field>
+    </record>
+
+    <menuitem
+        action="rma.action_rma_rma"
+        id="menu_action_sales_rma_form"
+        parent="sale.sale_order_menu"
+        sequence="12"
+        />
+
+    <menuitem
+        action="rma.action_rma_template_form"
+        id="menu_action_sales_rma_template_form"
+        parent="sale.menu_sale_config"
+        sequence="12"
+        />
+    <menuitem
+        action="rma.action_rma_tag_form"
+        id="menu_action_sales_rma_tag_form"
+        parent="sale.menu_sale_config"
+        sequence="12"
+        />
+</odoo>
diff --git a/rma_sale/views/sale_views.xml b/rma_sale/views/sale_views.xml
new file mode 100644
index 00000000..4713945b
--- /dev/null
+++ b/rma_sale/views/sale_views.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="view_order_form_inherit" model="ir.ui.view">
+        <field name="name">sale.order.form.inherit</field>
+        <field name="model">sale.order</field>
+        <field name="inherit_id" ref="sale.view_order_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//div[@name='button_box']" position="inside">
+                <button name="%(rma.action_rma_rma)d" type="action" class="oe_stat_button" icon="fa-cubes"
+                        attrs="{'invisible': [('rma_count', '=', 0)]}"
+                        context="{'search_default_sale_order_id': active_id}">
+                    <div class="o_field_widget o_stat_info">
+                        <span class="o_stat_value"><field name="rma_count"/></span> RMA
+                    </div>
+                </button>
+            </xpath>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/rma_sale/wizard/__init__.py b/rma_sale/wizard/__init__.py
new file mode 100644
index 00000000..1cbabc08
--- /dev/null
+++ b/rma_sale/wizard/__init__.py
@@ -0,0 +1,3 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from . import rma_lines
diff --git a/rma_sale/wizard/rma_lines.py b/rma_sale/wizard/rma_lines.py
new file mode 100644
index 00000000..c0733624
--- /dev/null
+++ b/rma_sale/wizard/rma_lines.py
@@ -0,0 +1,73 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo import api, fields, models
+from odoo.exceptions import UserError
+
+
+class RMASaleMakeLines(models.TransientModel):
+    _name = 'rma.sale.make.lines'
+    _description = 'Add SO Lines'
+
+    rma_id = fields.Many2one('rma.rma', string='RMA')
+    line_ids = fields.One2many('rma.sale.make.lines.line', 'rma_make_lines_id', string='Lines')
+
+
+    @api.model
+    def create(self, vals):
+        maker = super(RMASaleMakeLines, self).create(vals)
+        maker._create_lines()
+        return maker
+
+    def _line_values(self, so_line):
+        return {
+            'rma_make_lines_id': self.id,
+            'product_id': so_line.product_id.id,
+            'qty_ordered': so_line.product_uom_qty,
+            'qty_delivered': so_line.qty_delivered,
+            'qty_invoiced': so_line.qty_invoiced,
+            'product_uom_qty': 0.0,
+            'product_uom_id': so_line.product_uom.id,
+            'validity': self.rma_id.template_id._rma_sale_line_validity(so_line),
+        }
+
+    def _create_lines(self):
+        make_lines_obj = self.env['rma.sale.make.lines.line']
+
+        if self.rma_id.template_usage == 'sale_order' and self.rma_id.sale_order_id:
+            for l in self.rma_id.sale_order_id.order_line:
+                self.line_ids |= make_lines_obj.create(self._line_values(l))
+
+    def add_lines(self):
+        rma_line_obj = self.env['rma.line']
+        for o in self:
+            lines = o.line_ids.filtered(lambda l: l.product_uom_qty > 0.0)
+            if not self.env.user.has_group('sales_team.group_sale_manager'):
+                if lines.filtered(lambda l: not l.validity):
+                    raise UserError('One or more items are not eligible for return.')
+                if lines.filtered(lambda l: l.validity == 'expired'):
+                    raise UserError('One or more items are past their return period.')
+            for l in lines:
+                rma_line_obj.create({
+                    'rma_id': o.rma_id.id,
+                    'product_id': l.product_id.id,
+                    'product_uom_id': l.product_uom_id.id,
+                    'product_uom_qty': l.product_uom_qty,
+                })
+
+
+class RMASOMakeLinesLine(models.TransientModel):
+    _name = 'rma.sale.make.lines.line'
+    _description = 'RMA Sale Make Lines Line'
+
+    rma_make_lines_id = fields.Many2one('rma.sale.make.lines')
+    product_id = fields.Many2one('product.product', string="Product")
+    qty_ordered = fields.Float(string='Ordered')
+    qty_invoiced = fields.Float(string='Invoiced')
+    qty_delivered = fields.Float(string='Delivered')
+    product_uom_qty = fields.Float(string='QTY')
+    product_uom_id = fields.Many2one('uom.uom', 'UOM')
+    validity = fields.Selection([
+        ('', 'Not Eligible'),
+        ('valid', 'Eligible'),
+        ('expired', 'Expired'),
+    ], string='Validity')
diff --git a/rma_sale/wizard/rma_lines_views.xml b/rma_sale/wizard/rma_lines_views.xml
new file mode 100644
index 00000000..3f332f42
--- /dev/null
+++ b/rma_sale/wizard/rma_lines_views.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="view_rma_add_lines_form" model="ir.ui.view">
+        <field name="name">view.rma.add.lines.form</field>
+        <field name="model">rma.sale.make.lines</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form>
+                <field name="line_ids">
+                    <tree editable="top" create="false" delete="false" decoration-muted="validity != 'valid'">
+                        <field name="product_id" readonly="1"/>
+                        <field name="qty_ordered" readonly="1"/>
+                        <field name="qty_delivered" readonly="1"/>
+                        <field name="qty_invoiced" readonly="1"/>
+                        <field name="product_uom_qty"/>
+                        <field name="product_uom_id" readonly="1"/>
+                        <field name="validity" readonly="1"/>
+                    </tree>
+                </field>
+                <footer>
+                    <button class="oe_highlight"
+                            name="add_lines"
+                            type="object"
+                            string="Add" />
+                    <button class="oe_link"
+                            special="cancel"
+                            string="Cancel" />
+                </footer>
+            </form>
+        </field>
+    </record>
+     <record id="action_rma_add_lines" model="ir.actions.act_window">
+        <field name="name">Add RMA Lines</field>
+        <field name="res_model">rma.sale.make.lines</field>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="view_rma_add_lines_form" />
+        <field name="target">new</field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/sale_credit_limit/__init__.py b/sale_credit_limit/__init__.py
new file mode 100644
index 00000000..0650744f
--- /dev/null
+++ b/sale_credit_limit/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/sale_credit_limit/__manifest__.py b/sale_credit_limit/__manifest__.py
new file mode 100644
index 00000000..30ec8fe4
--- /dev/null
+++ b/sale_credit_limit/__manifest__.py
@@ -0,0 +1,29 @@
+{
+    'name': 'Sale Credit Limit',
+    'summary': 'Uses credit limit on Partners to warn salespeople if they are over their limit.',
+    'version': '13.0.1.0.0',
+    'author': "Hibou Corp.",
+    'category': 'Sale',
+    'license': 'AGPL-3',
+    'complexity': 'expert',
+    'images': [],
+    'website': "https://hibou.io",
+    'description': """
+Uses credit limit on Partners to warn salespeople if they are over their limit.
+
+When confirming a sale order, the current sale order total will be considered and a Sale Order Exception 
+will be created if the total would put them over their credit limit.
+""",
+    'depends': [
+        'sale',
+        'account',
+        'sale_exception',
+    ],
+    'demo': [],
+    'data': [
+        'data/sale_exceptions.xml',
+        'views/partner_views.xml',
+    ],
+    'auto_install': False,
+    'installable': True,
+}
diff --git a/sale_credit_limit/data/sale_exceptions.xml b/sale_credit_limit/data/sale_exceptions.xml
new file mode 100644
index 00000000..b8f6192d
--- /dev/null
+++ b/sale_credit_limit/data/sale_exceptions.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="excep_sale_credit_limit" model="exception.rule">
+        <field name="name">Invoice Partner credit limit exceeded.</field>
+        <field name="description">The Customer or Invoice Address has a credit limit.
+            This sale order, or the customer has an outstanding balance that, exceeds their credit limit.</field>
+        <field name="sequence">50</field>
+        <field name="model">sale.order</field>
+        <field name="code">
+partner = sale.partner_invoice_id.commercial_partner_id
+partner_balance = partner.credit + sale.amount_total
+if partner.credit_limit and partner.credit_limit &lt;= partner_balance:
+    failed = True
+        </field>
+        <field name="active" eval="True" />
+    </record>
+
+</odoo>
\ No newline at end of file
diff --git a/sale_credit_limit/models/__init__.py b/sale_credit_limit/models/__init__.py
new file mode 100644
index 00000000..8a0dc04e
--- /dev/null
+++ b/sale_credit_limit/models/__init__.py
@@ -0,0 +1 @@
+from . import sale
diff --git a/sale_credit_limit/models/sale.py b/sale_credit_limit/models/sale.py
new file mode 100644
index 00000000..5b90514e
--- /dev/null
+++ b/sale_credit_limit/models/sale.py
@@ -0,0 +1,18 @@
+from odoo import api, models, tools
+
+
+class SaleOrder(models.Model):
+    _inherit = 'sale.order'
+
+    @api.onchange('partner_invoice_id')
+    def _onchange_partner_invoice_id(self):
+        for so in self:
+            partner = so.partner_invoice_id.commercial_partner_id
+            if partner.credit_limit and partner.credit_limit <= partner.credit:
+                m = 'Partner outstanding receivables %s is above their credit limit of %s' \
+                                           % (tools.format_amount(self.env, partner.credit, so.currency_id),
+                                              tools.format_amount(self.env, partner.credit_limit, so.currency_id))
+                return {
+                    'warning': {'title': 'Sale Credit Limit',
+                                'message': m}
+                }
diff --git a/sale_credit_limit/tests/__init__.py b/sale_credit_limit/tests/__init__.py
new file mode 100644
index 00000000..a2d422d0
--- /dev/null
+++ b/sale_credit_limit/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_sale_credit_exception
diff --git a/sale_credit_limit/tests/test_sale_credit_exception.py b/sale_credit_limit/tests/test_sale_credit_exception.py
new file mode 100644
index 00000000..d679661f
--- /dev/null
+++ b/sale_credit_limit/tests/test_sale_credit_exception.py
@@ -0,0 +1,32 @@
+
+from odoo.addons.sale_exception.tests.test_sale_exception import TestSaleException
+
+
+class TestSaleCreditException(TestSaleException):
+
+    def setUp(self):
+        super(TestSaleCreditException, self).setUp()
+
+    def test_sale_order_credit_limit_exception(self):
+        self.sale_exception_confirm = self.env['sale.exception.confirm']
+        exception = self.env.ref('sale_credit_limit.excep_sale_credit_limit')
+        exception.active = True
+        partner = self.env.ref('base.res_partner_12')
+        partner.credit_limit = 100.00
+        p = self.env.ref('product.product_product_25_product_template')
+        so1 = self.env['sale.order'].create({
+            'partner_id': partner.id,
+            'partner_invoice_id': partner.id,
+            'partner_shipping_id': partner.id,
+            'order_line': [(0, 0, {'name': p.name,
+                                   'product_id': p.id,
+                                   'product_uom_qty': 2,
+                                   'product_uom': p.uom_id.id,
+                                   'price_unit': p.list_price})],
+            'pricelist_id': self.env.ref('product.list0').id,
+        })
+
+        # confirm quotation
+        so1.action_confirm()
+        self.assertTrue(so1.state == 'draft')
+        self.assertFalse(so1.ignore_exception)
diff --git a/sale_credit_limit/views/partner_views.xml b/sale_credit_limit/views/partner_views.xml
new file mode 100644
index 00000000..e9dbe0ae
--- /dev/null
+++ b/sale_credit_limit/views/partner_views.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="view_partner_form_inherit" model="ir.ui.view">
+        <field name="name">res.partner.form.inherit</field>
+        <field name="model">res.partner</field>
+        <field name="inherit_id" ref="base.view_partner_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//group[@name='accounting_entries']" position="inside">
+                <field name="credit_limit" widget="monetary" attrs="{'invisible': [('parent_id', '!=', False)]}"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
\ No newline at end of file
diff --git a/sale_payment_deposit/__init__.py b/sale_payment_deposit/__init__.py
new file mode 100755
index 00000000..0650744f
--- /dev/null
+++ b/sale_payment_deposit/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/sale_payment_deposit/__manifest__.py b/sale_payment_deposit/__manifest__.py
new file mode 100755
index 00000000..b42543fe
--- /dev/null
+++ b/sale_payment_deposit/__manifest__.py
@@ -0,0 +1,24 @@
+{
+    'name': 'Sale Payment Deposit',
+    'author': 'Hibou Corp. <hello@hibou.io>',
+    'category': 'Sales',
+    'version': '13.0.1.0.0',
+    'description':
+        """
+Sale Deposits
+=============
+
+Automates the creation of 'Deposit' invoices and payments.  For example, someone confirming 
+a sale with "50% Deposit, 50% on Delivery" payment terms, will pay the 
+50% deposit payment up front instead of the entire order.
+        """,
+    'depends': [
+        'sale',
+        'payment',
+    ],
+    'auto_install': False,
+    'data': [
+        'views/account_views.xml',
+        'views/sale_portal_templates.xml',
+    ],
+}
diff --git a/sale_payment_deposit/models/__init__.py b/sale_payment_deposit/models/__init__.py
new file mode 100644
index 00000000..13088db7
--- /dev/null
+++ b/sale_payment_deposit/models/__init__.py
@@ -0,0 +1,3 @@
+from . import account
+from . import sale
+from . import sale_patch
diff --git a/sale_payment_deposit/models/account.py b/sale_payment_deposit/models/account.py
new file mode 100644
index 00000000..04b31246
--- /dev/null
+++ b/sale_payment_deposit/models/account.py
@@ -0,0 +1,32 @@
+from odoo import api, fields, models
+
+
+class AccountPaymentTerm(models.Model):
+    _inherit = 'account.payment.term'
+
+    deposit_percentage = fields.Float(string='Deposit Percentage',
+                                      help='Require Percentage deposit when paying on the front end.')
+    deposit_flat = fields.Float(string='Deposit Flat',
+                                      help='Require Flat deposit when paying on the front end.')
+
+
+class PaymentTransaction(models.Model):
+    _inherit = 'payment.transaction'
+
+    def _post_process_after_done(self):
+        now = fields.Datetime.now()
+        res = super(PaymentTransaction, self)._post_process_after_done()
+
+        # Post Process Payments made on the front of the website, reconciling to Deposit.
+        for transaction in self.filtered(lambda t: t.payment_id
+                                                   and t.sale_order_ids
+                                                   and sum(t.sale_order_ids.mapped('amount_total_deposit'))
+                                                   and not t.invoice_ids and (now - t.date).seconds < 1200):
+            if not transaction.sale_order_ids.mapped('invoice_ids'):
+                # don't process ones that we might still be able to process later...
+                transaction.write({'is_processed': False})
+            else:
+                # we have a payment and could attempt to reconcile to an invoice
+                # Leave the payment in 'is_processed': True
+                transaction.sale_order_ids._auto_deposit_payment_match()
+        return res
diff --git a/sale_payment_deposit/models/sale.py b/sale_payment_deposit/models/sale.py
new file mode 100644
index 00000000..3da6f709
--- /dev/null
+++ b/sale_payment_deposit/models/sale.py
@@ -0,0 +1,49 @@
+from odoo import api, fields, models
+from json import loads as json_loads
+
+
+class SaleOrder(models.Model):
+    _inherit = 'sale.order'
+
+    amount_total_deposit = fields.Monetary(string='Deposit', compute='_amount_total_deposit')
+
+    @api.depends('amount_total', 'payment_term_id.deposit_percentage')
+    def _amount_total_deposit(self):
+        for order in self:
+            percent_deposit = order.amount_total * float(order.payment_term_id.deposit_percentage) / 100.0
+            flat_deposite = float(order.payment_term_id.deposit_flat)
+            order.amount_total_deposit = percent_deposit + flat_deposite
+
+    def action_confirm(self):
+        res = super(SaleOrder, self).action_confirm()
+        self._auto_deposit_invoice()
+        return res
+
+    def _auto_deposit_invoice(self):
+        wizard_model = self.env['sale.advance.payment.inv'].sudo()
+        for sale in self.sudo().filtered(lambda o: not o.invoice_ids and o.amount_total_deposit):
+            # Create Deposit Invoices
+            wizard = wizard_model.create({
+                'advance_payment_method': 'fixed',
+                'fixed_amount': sale.amount_total_deposit,
+            })
+            wizard.with_context(active_ids=sale.ids).create_invoices()
+            # Validate Invoices
+            sale.invoice_ids.filtered(lambda i: i.state == 'draft').post()
+            # Attempt to reconcile
+            sale._auto_deposit_payment_match()
+
+    def _auto_deposit_payment_match(self):
+        # Attempt to find payments that could be used on this new invoice and reconcile them.
+        # Note that this probably doesn't work for a payment made on the front, see .account.PaymentTransaction
+        aml_model = self.env['account.move.line'].sudo()
+        for sale in self.sudo():
+            for invoice in sale.invoice_ids.filtered(lambda i: i.state == 'posted'):
+                outstanding = json_loads(invoice.invoice_outstanding_credits_debits_widget)
+                if isinstance(outstanding, dict) and outstanding.get('content'):
+                    for line in outstanding.get('content'):
+                        if abs(line.get('amount', 0.0) - invoice.amount_residual) < 0.01 and line.get('id'):
+                            aml = aml_model.browse(line.get('id'))
+                            aml += invoice.line_ids.filtered(lambda l: l.account_id == aml.account_id)
+                            if aml.reconcile():
+                                break
diff --git a/sale_payment_deposit/models/sale_patch.py b/sale_payment_deposit/models/sale_patch.py
new file mode 100644
index 00000000..6be1e4ac
--- /dev/null
+++ b/sale_payment_deposit/models/sale_patch.py
@@ -0,0 +1,85 @@
+from odoo import api, fields, models
+from odoo.exceptions import ValidationError
+from odoo.addons.sale.models.sale import SaleOrder
+
+
+def _create_payment_transaction(self, vals):
+    # This is a copy job from odoo.addons.sale.models.sale due to the closed nature of the vals.update(dict) call
+    # Ultimately, only the 'vals.update' with the new amount is really used.
+    '''Similar to self.env['payment.transaction'].create(vals) but the values are filled with the
+    current sales orders fields (e.g. the partner or the currency).
+    :param vals: The values to create a new payment.transaction.
+    :return: The newly created payment.transaction record.
+    '''
+    # Ensure the currencies are the same.
+
+    # extract variable for use later.
+    sale = self[0]
+
+    currency = sale.pricelist_id.currency_id
+    if any([so.pricelist_id.currency_id != currency for so in self]):
+        raise ValidationError(_('A transaction can\'t be linked to sales orders having different currencies.'))
+
+    # Ensure the partner are the same.
+    partner = sale.partner_id
+    if any([so.partner_id != partner for so in self]):
+        raise ValidationError(_('A transaction can\'t be linked to sales orders having different partners.'))
+
+    # Try to retrieve the acquirer. However, fallback to the token's acquirer.
+    acquirer_id = vals.get('acquirer_id')
+    acquirer = False
+    payment_token_id = vals.get('payment_token_id')
+
+    if payment_token_id:
+        payment_token = self.env['payment.token'].sudo().browse(payment_token_id)
+
+        # Check payment_token/acquirer matching or take the acquirer from token
+        if acquirer_id:
+            acquirer = self.env['payment.acquirer'].browse(acquirer_id)
+            if payment_token and payment_token.acquirer_id != acquirer:
+                raise ValidationError(_('Invalid token found! Token acquirer %s != %s') % (
+                payment_token.acquirer_id.name, acquirer.name))
+            if payment_token and payment_token.partner_id != partner:
+                raise ValidationError(_('Invalid token found! Token partner %s != %s') % (
+                payment_token.partner.name, partner.name))
+        else:
+            acquirer = payment_token.acquirer_id
+
+    # Check an acquirer is there.
+    if not acquirer_id and not acquirer:
+        raise ValidationError(_('A payment acquirer is required to create a transaction.'))
+
+    if not acquirer:
+        acquirer = self.env['payment.acquirer'].browse(acquirer_id)
+
+    # Check a journal is set on acquirer.
+    if not acquirer.journal_id:
+        raise ValidationError(_('A journal must be specified of the acquirer %s.' % acquirer.name))
+
+    if not acquirer_id and acquirer:
+        vals['acquirer_id'] = acquirer.id
+
+    # Override for Deposit
+    amount = sum(self.mapped('amount_total'))
+    # This is a patch, all databases will run this code even if this field doesn't exist.
+    if hasattr(sale, 'amount_total_deposit') and sum(self.mapped('amount_total_deposit')):
+        amount = sum(self.mapped('amount_total_deposit'))
+
+    vals.update({
+        'amount': amount,
+        'currency_id': currency.id,
+        'partner_id': partner.id,
+        'sale_order_ids': [(6, 0, self.ids)],
+    })
+
+    transaction = self.env['payment.transaction'].create(vals)
+
+    # Process directly if payment_token
+    if transaction.payment_token_id:
+        transaction.s2s_do_transaction()
+
+    return transaction
+
+
+# Patch core implementation.
+SaleOrder._create_payment_transaction = _create_payment_transaction
diff --git a/sale_payment_deposit/views/account_views.xml b/sale_payment_deposit/views/account_views.xml
new file mode 100644
index 00000000..d46a6a2c
--- /dev/null
+++ b/sale_payment_deposit/views/account_views.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="view_payment_term_form_inherit" model="ir.ui.view">
+        <field name="name">account.payment.term.form.inherit</field>
+        <field name="model">account.payment.term</field>
+        <field name="inherit_id" ref="account.view_payment_term_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//group/group" position="inside">
+                <field name="deposit_percentage"/>
+                <field name="deposit_flat"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/sale_payment_deposit/views/sale_portal_templates.xml b/sale_payment_deposit/views/sale_portal_templates.xml
new file mode 100644
index 00000000..cda5acea
--- /dev/null
+++ b/sale_payment_deposit/views/sale_portal_templates.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <template id="sale_order_portal_template_deposit" name="Sales Order Portal Template - Deposit" inherit_id="sale.sale_order_portal_template">
+        <!-- Display the Deposit amount prominently -->
+        <xpath expr="//t[@t-set='title']/h2" position="replace">
+            <h2 class="mb-0"><b t-field="sale_order.amount_total"/></h2>
+            <h5 t-if="sale_order.amount_total_deposit"><b t-field="sale_order.amount_total_deposit"/> Deposit</h5>
+        </xpath>
+        <!-- Display the Deposit and Total when Signing -->
+        <xpath expr="//div[@id='modalaccept']/div/form/main/p/ul/li[2]" position="replace">
+            <li><span>For an amount of:</span> <b data-id="total_amount" t-field="sale_order.amount_total"/></li>
+            <li t-if="sale_order.amount_total_deposit"><span>Deposit today of:</span> <b data-id="total_amount_deposit" t-field="sale_order.amount_total_deposit"/></li>
+            <li t-if="sale_order.payment_term_id.note"><span t-field="sale_order.payment_term_id.note"/></li>
+        </xpath>
+        <!-- Display the Deposit when Paying -->
+        <xpath expr="//div[@id='modalaccept']/div/div/main/p/ul/li[2]" position="replace">
+            <li t-if="sale_order.amount_total_deposit"><span>For the deposit amount of:</span> <b data-id="total_amount_deposit" t-field="sale_order.amount_total_deposit"/></li>
+            <li t-else=""><span>For an amount of:</span> <b data-id="total_amount" t-field="sale_order.amount_total"/></li>
+            <li t-if="sale_order.payment_term_id.note"><span t-field="sale_order.payment_term_id.note"/></li>
+        </xpath>
+    </template>
+</odoo>
\ No newline at end of file
diff --git a/session_redis/__init__.py b/session_redis/__init__.py
new file mode 100755
index 00000000..612ceb86
--- /dev/null
+++ b/session_redis/__init__.py
@@ -0,0 +1,2 @@
+from . import session_redis
+
diff --git a/session_redis/__manifest__.py b/session_redis/__manifest__.py
new file mode 100755
index 00000000..b84e07d7
--- /dev/null
+++ b/session_redis/__manifest__.py
@@ -0,0 +1,31 @@
+{
+    "name": "Redis Sessions",
+    "version": "13.0.1.0.0",
+    "depends": ["base"],
+    "author": "Hibou Corp.",
+    "license": "AGPL-3",
+    "description": """Use Redis for Session storage instead of File system
+
+To use, you must load `session_redis` as a server wide module.
+Example Configuration file overrides un-needed ones will be commented and show the default or example.
+
+server_wide_modules = web,session_redis
+session_redis = True
+;session_redis_host = localhost
+;session_redis_port = 6379
+;session_redis_dbindex = 1
+;session_redis_pass = x
+;session_redis_expire = 604800
+;session_redis_prefix = test
+
+    """,
+    "summary": "",
+    "website": "",
+    "category": 'Tools',
+    "auto_install": False,
+    "installable": True,
+    "application": False,
+    "external_dependencies": {
+        'python': ['redis'],
+    },
+}
diff --git a/session_redis/session_redis.py b/session_redis/session_redis.py
new file mode 100755
index 00000000..eab749b5
--- /dev/null
+++ b/session_redis/session_redis.py
@@ -0,0 +1,77 @@
+import werkzeug.contrib.sessions
+from odoo import http, tools
+from odoo.tools.func import lazy_property
+
+
+def is_redis_session_store_activated():
+    return tools.config.get('session_redis')
+
+
+try:
+    import cPickle
+except ImportError:
+    import _pickle as cPickle
+
+try:
+    import redis
+except ImportError:
+    if is_redis_session_store_activated():
+        raise
+
+
+DEFAULT_SESSION_TIMEOUT = 60 * 60 * 24 * 7  # 1 weeks in seconds
+
+
+class RedisSessionStore(werkzeug.contrib.sessions.SessionStore):
+
+    def __init__(self, *args, **kwargs):
+        super(RedisSessionStore, self).__init__(*args, **kwargs)
+        self.expire = kwargs.get('expire', DEFAULT_SESSION_TIMEOUT)
+        if self.expire == DEFAULT_SESSION_TIMEOUT:
+            self.expire = int(tools.config.get('session_redis_expire', DEFAULT_SESSION_TIMEOUT))
+        self.key_prefix = kwargs.get('key_prefix', tools.config.get('session_redis_prefix', ''))
+        self.redis = redis.Redis(
+            host=tools.config.get('session_redis_host', 'localhost'),
+            port=int(tools.config.get('session_redis_port', 6379)),
+            db=int(tools.config.get('session_redis_dbindex', 1)),
+            password=tools.config.get('session_redis_pass', None))
+        self._is_redis_server_running()
+
+    def _get_session_key(self, sid):
+        key = self.key_prefix + sid
+        return key.encode('utf-8')
+
+    def _is_redis_server_running(self):
+        self.redis.ping()
+
+    def save(self, session):
+        key = self._get_session_key(session.sid)
+        data = cPickle.dumps(dict(session))
+        self.redis.setex(name=key, value=data, time=self.expire)
+
+    def delete(self, session):
+        key = self._get_session_key(session.sid)
+        self.redis.delete(key)
+
+    def get(self, sid):
+        key = self._get_session_key(sid)
+        data = self.redis.get(key)
+        if data:
+            self.redis.setex(name=key, value=data, time=self.expire)
+            data = cPickle.loads(data)
+        else:
+            data = {}
+        return self.session_class(data, sid, False)
+
+
+if is_redis_session_store_activated():
+    def session_gc(session_store):
+        pass
+
+    @lazy_property
+    def session_store(self):
+        return RedisSessionStore(session_class=http.OpenERPSession)
+
+    http.session_gc = session_gc
+    http.Root.session_store = session_store
+
diff --git a/shipbox b/shipbox
new file mode 120000
index 00000000..e077c55d
--- /dev/null
+++ b/shipbox
@@ -0,0 +1 @@
+./external/hibou-shipbox/shipbox
\ No newline at end of file
diff --git a/stock_picklist/README.rst b/stock_picklist/README.rst
new file mode 100644
index 00000000..af019c78
--- /dev/null
+++ b/stock_picklist/README.rst
@@ -0,0 +1,16 @@
+**********************
+Hibou - Stock Picklist
+**********************
+
+Adds a `Picklist` button to picking batches (waves) that provides a summary grouped by location
+and product for all of the pickings in the batch.
+
+For more information and add-ons, visit `Hibou.io <https://hibou.io/>`_.
+
+
+=======
+License
+=======
+
+Please see `LICENSE <https://github.com/hibou-io/hibou-odoo-suite/blob/master/LICENSE>`_.
+Copyright Hibou Corp. 2018
\ No newline at end of file
diff --git a/stock_picklist/__init__.py b/stock_picklist/__init__.py
new file mode 100644
index 00000000..59b4cb50
--- /dev/null
+++ b/stock_picklist/__init__.py
@@ -0,0 +1,2 @@
+from . import report
+from . import models
diff --git a/stock_picklist/__manifest__.py b/stock_picklist/__manifest__.py
new file mode 100644
index 00000000..145df091
--- /dev/null
+++ b/stock_picklist/__manifest__.py
@@ -0,0 +1,24 @@
+{
+    'name': 'Stock Picklist',
+    'version': '13.0.1.0.0',
+    'category': 'Tools',
+    'depends': [
+        'stock_picking_batch',
+    ],
+    'description': """
+Stock Picklist
+==============
+
+Adds a `Picklist` button to picking batches (waves) that provides a summary grouped by location 
+and product for all of the pickings in the batch.
+    """,
+    'author': 'Hibou Corp.',
+    'license': 'AGPL-3',
+    'website': 'https://hibou.io/',
+    'data': [
+        'report/stock_picklist.xml',
+        'views/stock_views.xml',
+    ],
+    'installable': True,
+    'application': False,
+}
diff --git a/stock_picklist/models/__init__.py b/stock_picklist/models/__init__.py
new file mode 100644
index 00000000..07b5490f
--- /dev/null
+++ b/stock_picklist/models/__init__.py
@@ -0,0 +1 @@
+from . import stock_picking_batch
diff --git a/stock_picklist/models/stock_picking_batch.py b/stock_picklist/models/stock_picking_batch.py
new file mode 100644
index 00000000..a53b149e
--- /dev/null
+++ b/stock_picklist/models/stock_picking_batch.py
@@ -0,0 +1,12 @@
+from odoo import api, fields, models, _
+from odoo.exceptions import UserError
+
+
+class StockPickingBatch(models.Model):
+    _inherit = 'stock.picking.batch'
+
+    def print_pick_list(self):
+        pickings = self.mapped('picking_ids')
+        if not pickings:
+            raise UserError(_('Nothing to print.'))
+        return self.env.ref('stock_picklist.picklist').report_action(pickings, data=None, config=False)
diff --git a/stock_picklist/report/__init__.py b/stock_picklist/report/__init__.py
new file mode 100644
index 00000000..4927808c
--- /dev/null
+++ b/stock_picklist/report/__init__.py
@@ -0,0 +1 @@
+from . import stock_picklist
diff --git a/stock_picklist/report/stock_picklist.py b/stock_picklist/report/stock_picklist.py
new file mode 100644
index 00000000..b2b4defe
--- /dev/null
+++ b/stock_picklist/report/stock_picklist.py
@@ -0,0 +1,36 @@
+from odoo import api, models
+from collections import namedtuple
+
+LocationGroup = namedtuple('LocationGroup', ('location_id', 'lines'))
+ProductGroup = namedtuple('ProductGroup', ('product_id', 'qty'))
+
+
+class StockPicklist(models.AbstractModel):
+    _name = 'report.stock_picklist.report_picklist'
+    _template = 'stock_picklist.report_picklist'
+
+    @api.model
+    def _get_report_values(self, docids, data=None):
+        report_name = 'stock_picklist.report_picklist'
+        report = self.env['ir.actions.report']._get_report_from_name(report_name)
+        stock_pickings = self.env['stock.picking'].browse(docids)
+        stock_pack_operations = stock_pickings.mapped(lambda o: o.move_lines).mapped(lambda l: l.move_line_ids)
+
+        locations = stock_pack_operations.mapped(lambda o: o.location_id)
+        _l = []
+        for location in locations:
+            operations = stock_pack_operations.filtered(lambda o: o.location_id.id == location.id)
+            products = operations.mapped(lambda o: o.product_id)
+            _p = []
+            for product in products:
+                qty = sum(operations.filtered(lambda o: o.product_id.id == product.id).mapped(lambda o: o.product_qty))
+                _p.append(ProductGroup(product_id=product, qty=int(qty)))
+            _p = sorted(_p, key=lambda p: -p.qty)
+            _l.append(LocationGroup(location_id=location, lines=_p))
+
+        _l = sorted(_l, key=lambda l: l.location_id.name)
+        return {
+            'doc_ids': docids,
+            'doc_model': report.model,
+            'docs': _l,
+        }
diff --git a/stock_picklist/report/stock_picklist.xml b/stock_picklist/report/stock_picklist.xml
new file mode 100644
index 00000000..0e27c170
--- /dev/null
+++ b/stock_picklist/report/stock_picklist.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <report
+            id="picklist"
+            model="stock.picking"
+            string="Picklist"
+            report_type="qweb-pdf"
+            name="stock_picklist.report_picklist"
+        />
+
+        <template id="report_picklist">
+            <t t-call="web.basic_layout">
+                <div class="page">
+                    <table class="table table-condensed">
+                        <thead>
+                            <th/>
+                            <th>Qty</th>
+                            <th>Product</th>
+                            <th>Barcode</th>
+                            <th>Location</th>
+                        </thead>
+                        <tbody>
+                        <t t-foreach="docs" t-as="l">
+                            <t t-foreach="l.lines" t-as="p">
+                                <tr>
+                                    <td><img t-att-src="image_data_uri(p.product_id.image_128)" width="64" height="64"/></td>
+                                    <td><span t-esc="p.qty"/></td>
+                                    <td>
+                                        <span t-if="p.product_id.seller_ids" t-field="p.product_id.seller_ids[0].name" /> -
+                                        <span t-field="p.product_id.default_code" /> :
+                                        <span t-if="p.product_id.seller_ids" t-field="p.product_id.seller_ids[0].product_code" />
+                                        <br />
+                                        <span t-field="p.product_id.name"/>
+                                    </td>
+                                    <td class="text-center">
+                                        <img t-if="p.product_id.barcode" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s' % ('Code128', p.product_id.barcode, 400, 80)" style="width:200px;height:40px"/>
+                                        <br />
+                                        <span t-if="p.product_id.barcode" t-field="p.product_id.barcode" />
+                                    </td>
+                                    <td><span t-esc="l.location_id.name"/></td>
+                                </tr>
+                            </t>
+                        </t>
+                        </tbody>
+                    </table>
+                </div>
+            </t>
+        </template>
+    </data>
+</odoo>
diff --git a/stock_picklist/views/stock_views.xml b/stock_picklist/views/stock_views.xml
new file mode 100644
index 00000000..16f009c2
--- /dev/null
+++ b/stock_picklist/views/stock_views.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <record id="stock_picking_batch_form_inherit" model="ir.ui.view">
+        <field name="name">stock.picking.batch.form.form</field>
+        <field name="model">stock.picking.batch</field>
+        <field name="inherit_id" ref="stock_picking_batch.stock_picking_batch_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//button[@name='print_picking']" position="after">
+                <button name="print_pick_list" string="Picklist" type="object" class="oe_highlight"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/timesheet_description/__init__.py b/timesheet_description/__init__.py
new file mode 100644
index 00000000..0650744f
--- /dev/null
+++ b/timesheet_description/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/timesheet_description/__manifest__.py b/timesheet_description/__manifest__.py
new file mode 100644
index 00000000..63724af7
--- /dev/null
+++ b/timesheet_description/__manifest__.py
@@ -0,0 +1,24 @@
+{
+    'name': 'Timesheet Description',
+    'version': '13.0.1.0.0',
+    'author': 'Hibou Corp. <hello@hibou.io>',
+    'website': 'https://hibou.io/',
+    'license': 'AGPL-3',
+    'category': 'Tools',
+    'complexity': 'easy',
+    'description': """
+Timesheet entries will be made in a form view, allowing the end user to enter more descriptive timesheet entries.
+
+Optionally, allows you to display your timesheet entries in markdown on the front end of the website.
+    """,
+    'depends': [
+        'project',
+        'hr_timesheet',
+    ],
+    'data': [
+        'views/project_templates.xml',
+        'views/timesheet_views.xml',
+    ],
+    'installable': True,
+    'auto_install': False,
+}
diff --git a/timesheet_description/models/__init__.py b/timesheet_description/models/__init__.py
new file mode 100644
index 00000000..1b7bb1fb
--- /dev/null
+++ b/timesheet_description/models/__init__.py
@@ -0,0 +1 @@
+from . import timesheet
diff --git a/timesheet_description/models/timesheet.py b/timesheet_description/models/timesheet.py
new file mode 100644
index 00000000..30b71e43
--- /dev/null
+++ b/timesheet_description/models/timesheet.py
@@ -0,0 +1,22 @@
+try:
+    from markdown import markdown
+except ImportError:
+    markdown = None
+
+from odoo import api, fields, models
+
+
+class AnalyticLine(models.Model):
+    _inherit = 'account.analytic.line'
+
+    name_markdown = fields.Html(compute='_compute_name_markdown')
+
+    def _compute_name_markdown(self):
+        if not markdown:
+            for line in self:
+                # Why not just name? Because it needs to be escaped.
+                # Use nothing to indicate that it shouldn't be used.
+                line.name_markdown = ''
+        else:
+            for line in self:
+                line.name_markdown = markdown(line.name)
diff --git a/timesheet_description/views/project_templates.xml b/timesheet_description/views/project_templates.xml
new file mode 100644
index 00000000..d691233c
--- /dev/null
+++ b/timesheet_description/views/project_templates.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <template id="portal_my_task_markdown" inherit_id='hr_timesheet.portal_timesheet_table' customize_show="True" name="Timesheet Use Markdown">
+        <xpath expr="//t[@t-esc='timesheet.name']" position="replace">
+            <div t-if="timesheet.name_markdown" t-field="timesheet.name_markdown" />
+            <t t-else="" t-esc="timesheet.name" />
+        </xpath>
+    </template>
+</odoo>
\ No newline at end of file
diff --git a/timesheet_description/views/timesheet_views.xml b/timesheet_description/views/timesheet_views.xml
new file mode 100644
index 00000000..68aa3f1f
--- /dev/null
+++ b/timesheet_description/views/timesheet_views.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="view_task_form2_inherit" model="ir.ui.view">
+        <field name="name">project.task.form.inherit</field>
+        <field name="model">project.task</field>
+        <field name="inherit_id" ref="hr_timesheet.view_task_form2_inherited" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='timesheet_ids']" position="attributes">
+                <attribute name="context">{'default_project_id': project_id, 'default_task_id': active_id}</attribute>
+            </xpath>
+            <xpath expr="//field[@name='timesheet_ids']/tree" position="attributes">
+                <attribute name="editable"/>
+            </xpath>
+            <xpath expr="//field[@name='timesheet_ids']" position="inside">
+                <form>
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="company_id" invisible="1"/>
+                                <field name="project_id" invisible="1"/>
+                                <field name="task_id" invisible="1"/>
+                                <field name="user_id" invisible="1" groups="hr_timesheet.group_timesheet_manager"/>
+                                <field name="employee_id" groups="hr_timesheet.group_timesheet_manager"/>
+                            </group>
+                            <group>
+                                <field name="date"/>
+                                <field name="unit_amount" string="Time Spent" widget="float_time"/>
+                            </group>
+                        </group>
+                        <field name="name" nolabel="1" widget="text" placeholder="Describe your activity (you can use markdown)" colspan="4"/>
+                    </sheet>
+                </form>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="hr_timesheet_line_tree_inherit" model="ir.ui.view">
+        <field name="name">account.analytic.line.tree.hr_timesheet.inherit</field>
+        <field name="model">account.analytic.line</field>
+        <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree" />
+        <field name="arch" type="xml">
+            <xpath expr="//tree" position="attributes">
+                <attribute name="editable"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/timesheet_description_sale/__init__.py b/timesheet_description_sale/__init__.py
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/timesheet_description_sale/__init__.py
@@ -0,0 +1 @@
+
diff --git a/timesheet_description_sale/__manifest__.py b/timesheet_description_sale/__manifest__.py
new file mode 100644
index 00000000..bc4afe69
--- /dev/null
+++ b/timesheet_description_sale/__manifest__.py
@@ -0,0 +1,21 @@
+{
+    'name': 'Timesheet Description Sale',
+    'version': '13.0.1.0.0',
+    'author': 'Hibou Corp. <hello@hibou.io>',
+    'website': 'https://hibou.io/',
+    'license': 'AGPL-3',
+    'category': 'Tools',
+    'complexity': 'easy',
+    'description': """
+Linker module to inject fields required by timesheets for sales.
+    """,
+    'depends': [
+        'timesheet_description',
+        'sale_timesheet',
+    ],
+    'data': [
+        'views/timesheet_views.xml',
+    ],
+    'installable': True,
+    'auto_install': True,
+}
diff --git a/timesheet_description_sale/views/timesheet_views.xml b/timesheet_description_sale/views/timesheet_views.xml
new file mode 100644
index 00000000..f4d48acd
--- /dev/null
+++ b/timesheet_description_sale/views/timesheet_views.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="view_task_form2_inherit" model="ir.ui.view">
+        <field name="name">project.task.form.inherit</field>
+        <field name="model">project.task</field>
+        <field name="inherit_id" ref="timesheet_description.view_task_form2_inherit" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='timesheet_ids']" position="attributes">
+                <attribute name="context">{'default_project_id': project_id, 'default_task_id': active_id}</attribute>
+            </xpath>
+            <xpath expr="//field[@name='timesheet_ids']/tree" position="attributes">
+                <attribute name="editable"/>
+            </xpath>
+            <xpath expr="//field[@name='timesheet_ids']/form//field[@name='project_id']" position="before">
+                <field name="timesheet_invoice_id" invisible="1"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/timesheet_invoice/__init__.py b/timesheet_invoice/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/timesheet_invoice/__manifest__.py b/timesheet_invoice/__manifest__.py
new file mode 100644
index 00000000..e3dca17c
--- /dev/null
+++ b/timesheet_invoice/__manifest__.py
@@ -0,0 +1,20 @@
+{
+    'name': 'Timesheet Invoice',
+    'version': '13.0.1.0.0',
+    'author': 'Hibou Corp. <hello@hibou.io>',
+    'website': 'https://hibou.io/',
+    'license': 'AGPL-3',
+    'category': 'Tools',
+    'complexity': 'easy',
+    'description': """
+Adds timesheet descriptions onto the invoice report/PDF.
+    """,
+    'depends': [
+        'sale_timesheet',
+    ],
+    'data': [
+        'invoice_views.xml',
+    ],
+    'installable': True,
+    'auto_install': False,
+}
diff --git a/timesheet_invoice/invoice_views.xml b/timesheet_invoice/invoice_views.xml
new file mode 100644
index 00000000..ff017598
--- /dev/null
+++ b/timesheet_invoice/invoice_views.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <template id="report_invoice_document_inherit" inherit_id="account.report_invoice_document">
+        <xpath expr="//div[@class='page']" position="inside">
+            <div class="container" t-if="o.timesheet_ids">
+                <hr/>
+                <h3>Timesheets</h3>
+                <table class="table table-sm">
+                    <thead>
+                      <tr class="active">
+                        <th>Date</th>
+                        <th class="col-md-6">Description</th>
+                        <th>Responsible</th>
+                        <th>Duration</th>
+                      </tr>
+                    </thead>
+                    <t t-foreach="o.timesheet_ids.mapped('project_id')" t-as="project">
+                        <tr class="bg-primary"><td><h4>Project</h4></td><td colspan="3"><h4 t-esc="project.name"/></td></tr>
+                        <t t-foreach="o.timesheet_ids.filtered(lambda l: l.project_id == project).mapped('task_id')" t-as="task">
+                            <tr class="bg-info"><td><h5>Task</h5></td><td colspan="3"><h5 t-esc="task.name"/></td></tr>
+                            <tr t-foreach="o.timesheet_ids.filtered(lambda l: l.project_id == project and l.task_id == task)" t-as="timesheet">
+                                <td><t t-esc="timesheet.date"/></td>
+                                <td><t t-esc="timesheet.name"/></td>
+                                <td><t t-esc="timesheet.sudo().user_id.name"/></td>
+                                <td><span t-field="timesheet.unit_amount" t-options="{&quot;widget&quot;: &quot;duration&quot;, &quot;unit&quot;: &quot;hour&quot;, &quot;round&quot;: &quot;minute&quot;}"/></td>
+                            </tr>
+                        </t>
+                    </t>
+                </table>
+            </div>
+        </xpath>
+    </template>
+</odoo>
\ No newline at end of file
diff --git a/website_product_cores/__init__.py b/website_product_cores/__init__.py
new file mode 100644
index 00000000..0358305d
--- /dev/null
+++ b/website_product_cores/__init__.py
@@ -0,0 +1 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
diff --git a/website_product_cores/__manifest__.py b/website_product_cores/__manifest__.py
new file mode 100644
index 00000000..33bd65c9
--- /dev/null
+++ b/website_product_cores/__manifest__.py
@@ -0,0 +1,23 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+{
+    'name': 'Website Product Cores',
+    'author': 'Hibou Corp. <hello@hibou.io>',
+    'version': '13.0.1.0.0',
+    'license': 'OPL-1',
+    'category': 'Website',
+    'description': """
+Removes Trash icon from Core Product
+    """,
+    'website': 'https://hibou.io/',
+    'depends': [
+        'product_cores',
+        'website_sale',
+    ],
+    'data': [
+        'views/templates.xml',
+    ],
+    'installable': True,
+    'application': False,
+    'auto_install': True,
+}
diff --git a/website_product_cores/views/templates.xml b/website_product_cores/views/templates.xml
new file mode 100644
index 00000000..247973b4
--- /dev/null
+++ b/website_product_cores/views/templates.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <template id="cart_lines_inherit" inherit_id="website_sale.cart_lines" >
+        <xpath expr="//td[4]" position="replace">
+            <td class="text-center td-qty">
+                <div class="css_quantity input-group mx-auto">
+                    <div t-if="not line.product_id.core_ok" class="input-group-prepend">
+                        <a t-attf-href="#" class="btn btn-link js_add_cart_json d-none d-md-inline-block" aria-label="Remove one" title="Remove one">
+                            <i class="fa fa-minus"></i>
+                        </a>
+                    </div>
+                    <input readonly="readonly" type="text" class="js_quantity form-control quantity" t-att-data-line-id="line.id" t-att-data-product-id="line.product_id.id" t-att-value="int(line.product_uom_qty) == line.product_uom_qty and int(line.product_uom_qty) or line.product_uom_qty" />
+                    <div t-if="not line.product_id.core_ok" class="input-group-append">
+                        <a t-attf-href="#" class="btn btn-link float_left js_add_cart_json d-none d-md-inline-block" aria-label="Add one" title="Add one">
+                            <i class="fa fa-plus"></i>
+                        </a>
+                    </div>
+                </div>
+            </td>
+        </xpath>
+        <xpath expr="//td[6]" position="replace">
+            <td class="td-action">
+                <div t-if="not line.product_id.core_ok">
+                    <a href='#' aria-label="Remove from cart" title="Remove from cart" class='js_delete_product no-decoration'> <small><i class='fa fa-trash-o'></i></small></a>
+                </div>
+            </td>
+        </xpath>
+    </template>
+    
+</odoo>
diff --git a/website_project_task/__init__.py b/website_project_task/__init__.py
new file mode 100644
index 00000000..9a7e03ed
--- /dev/null
+++ b/website_project_task/__init__.py
@@ -0,0 +1 @@
+from . import models
\ No newline at end of file
diff --git a/website_project_task/__manifest__.py b/website_project_task/__manifest__.py
new file mode 100644
index 00000000..ae58c2c7
--- /dev/null
+++ b/website_project_task/__manifest__.py
@@ -0,0 +1,25 @@
+{
+    'name': 'Website Project Tasks',
+    'version': '13.0.1.0.0',
+    'author': 'Hibou Corp. <hello@hibou.io>',
+    'website': 'https://hibou.io/',
+    'license': 'AGPL-3',
+    'category': 'Tools',
+    'complexity': 'easy',
+    'description': """
+This module adds options to Website Project:
+============================================
+
+* Tags on Tasks
+* Classes on Stages and Tags for CSS hooks.
+    """,
+    'depends': [
+        'project',
+    ],
+    'data': [
+        'views/project_task_templates.xml',
+    ],
+    'installable': True,
+    'auto_install': False,
+    'category': 'Hidden',
+}
diff --git a/website_project_task/models/__init__.py b/website_project_task/models/__init__.py
new file mode 100644
index 00000000..7095229c
--- /dev/null
+++ b/website_project_task/models/__init__.py
@@ -0,0 +1 @@
+from . import project
\ No newline at end of file
diff --git a/website_project_task/models/project.py b/website_project_task/models/project.py
new file mode 100644
index 00000000..9e6f298d
--- /dev/null
+++ b/website_project_task/models/project.py
@@ -0,0 +1,14 @@
+from odoo import api, exceptions, fields, models, _
+from werkzeug.urls import url_encode
+
+class ProjectTask(models.Model):
+    _name = 'project.task'
+    _inherit = ['project.task', 'portal.mixin']
+
+    def preview_task(self):
+        self.ensure_one()
+        return {
+            'type': 'ir.actions.act_url',
+            'target': 'self',
+            'url': self.get_portal_url(),
+        }
diff --git a/website_project_task/views/project_task_templates.xml b/website_project_task/views/project_task_templates.xml
new file mode 100644
index 00000000..25e704e1
--- /dev/null
+++ b/website_project_task/views/project_task_templates.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="view_task_form2_inherit" model="ir.ui.view">
+        <field name="name">project.task.form.inherit</field>
+        <field name="model">project.task</field>
+        <field name="inherit_id" ref="project.view_task_form2"/>
+        <field name="arch" type="xml">
+            <xpath expr="//div[@name='button_box']" position="inside">
+                <button name="preview_task" type="object" class="oe_stat_button" icon="fa-globe icon">
+                    <div class="o_field_widget o_stat_info">
+                        <span class="o_stat_text">Task</span>
+                        <span class="o_stat_text">Preview</span>
+                    </div>
+                </button>
+            </xpath>
+        </field>
+    </record>
+
+
+    <template id="my_tasks" inherit_id='project.portal_my_tasks' name="Stage Colors etc.">
+        <xpath expr="//td/span[hasclass('badge-info')]" position="attributes">
+            <attribute name="t-attf-class">badge badge-pill badge-info stage stage-{{ task.stage_id.name }}</attribute>
+        </xpath>
+    </template>
+
+
+    <template id="task_tag_grid" inherit_id='project.portal_my_tasks' customize_show="True" name="Task Tags on table">
+        <xpath expr="//t/t/t/t/thead/tr/th[1]" position="attributes">
+            <attribute name="class">col-md-8</attribute>
+        </xpath>
+        <xpath expr="//t/t/t/t/thead/tr/th[2]" position="after">
+            <th>Tags</th>
+        </xpath>
+        <!-- Strange number of columns -->
+        <xpath expr="//tbody/t/tr/td[1]" position="after">
+            <td>
+                <t t-foreach="task.tag_ids" t-as="tag">
+                    <span t-attf-class="label tag tag-color-{{ tag.color }} tag-{{ tag.name }}"><t t-esc="tag.name"/></span>
+                </t>
+            </td>
+        </xpath>
+    </template>
+
+    <template id="my_task" inherit_id='project.portal_my_task' name="Stage Colors etc.">
+        <xpath expr="//span[hasclass('badge-info')]" position="attributes">
+            <attribute name="t-attf-class">badge badge-pill badge-info stage stage-{{ task.stage_id.name }}</attribute>
+        </xpath>
+        <xpath expr="//h4" position="after">
+            <p t-if="task.tag_ids">
+                <span t-foreach="task.tag_ids" t-as="tag" t-attf-class="label tag tag-color-{{ tag.color }} tag-{{ tag.name }}" t-field="tag.name" />
+            </p>
+        </xpath>
+    </template>
+
+    <template id="my_task_todo" inherit_id='project.portal_my_task' name="Todo List (requires project_task_line)" customize_show="True" active="False">
+        <xpath expr="//div[@t-if='task.description']" position="before">
+            <t t-if="task.sudo().line_ids">
+                <div class="col-md-12">
+                    <strong>Todo List</strong>
+                    <ul class="list-unstyled">
+                        <li t-foreach="task.sudo().line_ids" t-as="line">
+                            <span t-if="line.kanban_state == 'normal'" class="text-muted"><i class="fa fa-circle"></i></span>
+                            <span t-if="line.kanban_state == 'done'" class="text-success"><i class="fa fa-check-circle"></i></span>
+                            <span t-if="line.kanban_state == 'blocked'" class="text-danger"><i class="fa fa-times-circle"></i></span>
+                            <span t-field="line.name"/>
+                        </li>
+                    </ul>
+                </div>
+            </t>
+        </xpath>
+    </template>
+
+</odoo>