diff --git a/quality_control_team/models/qc_team.py b/quality_control_team/models/qc_team.py
deleted file mode 100644
index 18eb16303..000000000
--- a/quality_control_team/models/qc_team.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2017 Eficent Business and IT Consulting Services S.L.
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo import api, fields, models
-
-
-class QualityControlTeam(models.Model):
-    _name = "qc.team"
-    _inherit = ['mail.thread']
-    _description = "Quality Control Team"
-    _order = "name"
-
-    @api.model
-    def _get_default_qc_team_id(self, user_id=None):
-        if not user_id:
-            user_id = self.env.uid
-        qc_team_id = None
-        if 'default_qc_team_id' in self.env.context:
-            qc_team_id = self.env['qc.team'].browse(
-                self.env.context.get('default_qc_team_id'))
-        if not qc_team_id or not qc_team_id.exists():
-            company_id = self.sudo(user_id).company_id.id
-            qc_team_id = self.env['qc.team'].sudo().search([
-                '|',
-                ('user_id', '=', user_id),
-                ('member_ids', '=', user_id),
-                '|',
-                ('company_id', '=', False),
-                ('company_id', 'child_of', [company_id])
-            ], limit=1)
-        if not qc_team_id:
-            default_team_id = self.env.ref(
-                'quality_control_team.qc_team_main', raise_if_not_found=False)
-            if default_team_id:
-                qc_team_id = default_team_id
-        return qc_team_id
-
-    name = fields.Char(
-        string='Quality Control Team', required=True)
-    active = fields.Boolean(default=True)
-    company_id = fields.Many2one(
-        comodel_name='res.company', string='Company',
-        default=lambda self: self.env['res.company']._company_default_get(
-            'qc.team'))
-    user_id = fields.Many2one(
-        comodel_name='res.users', string='Team Leader')
-    member_ids = fields.One2many(
-        comodel_name='res.users', inverse_name='qc_team_id',
-        string='Team Members')
-    reply_to = fields.Char(
-        string='Reply-To',
-        help="The email address put in the 'Reply-To' of all emails sent by "
-             "Odoo about cases in this QC team")
-    color = fields.Integer(string='Color Index', help="The color of the team")
-
-    @api.model
-    def create(self, values):
-        return super(
-            QualityControlTeam,
-            self.with_context(mail_create_nosubscribe=True)).create(values)
diff --git a/quality_control_team/tests/test_quality_control_team.py b/quality_control_team/tests/test_quality_control_team.py
deleted file mode 100644
index 77de167c4..000000000
--- a/quality_control_team/tests/test_quality_control_team.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2017 Eficent Business and IT Consulting Services S.L.
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo.tests.common import TransactionCase
-
-
-class TestQualityControlTeam(TransactionCase):
-
-    def setUp(self):
-        super(TestQualityControlTeam, self).setUp()
-        self.qc_team_obj = self.env['qc.team']
-        self.main_qc_team = self.env.ref('quality_control_team.qc_team_main')
-        self.other_company = self.env['res.company'].create({
-            'name': 'other company',
-        })
-        self.user_test = self.env['res.users'].create({
-            'name': 'Test User',
-            'login': 'testuser',
-            'company_id': self.other_company.id,
-            'company_ids': [(4, self.other_company.id)],
-        })
-
-    def test_default_qc_team(self):
-        """Test that the QC team is defaulted correctly."""
-        team = self.qc_team_obj._get_default_qc_team_id(
-            user_id=self.user_test.id)
-        self.assertEqual(team, self.main_qc_team)
-        test_team = self.qc_team_obj.create({
-            'name': 'Test Team',
-            'user_id': self.user_test.id,
-            'company_id': self.other_company.id,
-        })
-        team = self.qc_team_obj._get_default_qc_team_id(
-            user_id=self.user_test.id)
-        self.assertEqual(team, test_team)
diff --git a/quality_control_team/views/qc_team_dashboard.xml b/quality_control_team/views/qc_team_dashboard.xml
deleted file mode 100644
index 6025a2d7f..000000000
--- a/quality_control_team/views/qc_team_dashboard.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-<!-- Copyright 2017-19 Eficent Business and IT Consulting Services S.L.
- License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
-
-    <record id="qc_team_view_kanban" model="ir.ui.view" >
-        <field name="name">qc.team.dashboard</field>
-        <field name="model">qc.team</field>
-        <field name="arch" type="xml">
-            <kanban class="o_kanban_dashboard oe_background_grey" create="0">
-                <field name="name"/>
-                <field name="user_id"/>
-                <field name="member_ids"/>
-                <field name="color"/>
-                <templates>
-                    <t t-name="kanban-box">
-                        <div t-attf-class="#{kanban_color(record.color.raw_value)}">
-                            <div class="o_kanban_card_header">
-                                <div class="o_kanban_card_header_title">
-                                    <div class="o_primary"><field name="name"/></div>
-                                </div>
-                                <div class="o_kanban_manage_button_section">
-                                    <a class="o_kanban_manage_toggle_button" href="#"><i class="fa fa-ellipsis-v" role="img" aria-label="Manage" title="Manage"/></a>
-                                </div>
-                            </div>
-                            <div class="container o_kanban_card_content">
-                                <div class="row o_kanban_card_upper_content">
-                                    <div class="col-6 o_kanban_primary_left" name="card_left"/>
-                                    <div class="col-6 o_kanban_primary_right" name="card_right"/>
-                                </div>
-                            </div>
-
-                            <div class="container o_kanban_card_manage_pane dropdown-menu" role="menu">
-                                <div t-if="widget.editable" class="o_kanban_card_manage_settings row" groups="quality_control.group_quality_control_manager">
-                                    <div role="menuitem" aria-haspopup="true" class="col-8">
-                                        <ul class="oe_kanban_colorpicker" data-field="color" role="menu"/>
-                                    </div>
-                                    <div role="menuitem" class="col-4 text-right">
-                                        <a type="edit">Settings</a>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </t>
-                </templates>
-            </kanban>
-        </field>
-    </record>
-
-    <record id="qc_team_search" model="ir.ui.view">
-        <field name="name">Case Teams - Search</field>
-        <field name="model">qc.team</field>
-        <field name="arch" type="xml">
-            <search string="QC teams Search">
-                <field name="name"/>
-                <field name="user_id"/>
-                <filter name="personal" string="My Teams"
-                        domain="['|', ('member_ids', '=', uid), ('user_id', '=', uid)]"/>
-                <group expand="0" string="Group By...">
-                    <filter name="group_user_id" string="Team Leader" domain="[]" context="{'group_by':'user_id'}"/>
-                </group>
-            </search>
-        </field>
-    </record>
-
-    <record id="qc_team_dashboard_act" model="ir.actions.act_window">
-        <field name="name">Dashboard</field>
-        <field name="res_model">qc.team</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">kanban,form</field>
-        <field name="context">{'search_default_personal':1}</field>
-        <field name="help" type="html">
-            <p>Define a new quality control teams going to <b><i>Configuration >
-                Quality Control Teams</i></b>.
-            </p>
-        </field>
-    </record>
-
-    <menuitem id="menu_qc_team_act" action="qc_team_dashboard_act"
-              sequence="1" parent="quality_control.qc_menu" name="Dashboard"/>
-
-</odoo>
diff --git a/quality_control_team/views/qc_team_view.xml b/quality_control_team/views/qc_team_view.xml
deleted file mode 100644
index be01284db..000000000
--- a/quality_control_team/views/qc_team_view.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-<!-- Copyright 2017 Eficent Business and IT Consulting Services S.L.
- License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
-
-    <record id="qc_team_view_form" model="ir.ui.view">
-        <field name="name">qc.team.form</field>
-        <field name="model">qc.team</field>
-        <field name="arch" type="xml">
-            <form string="Quality Control Team">
-                <sheet>
-                    <div class="oe_button_box" name="button_box">
-                        <button name="toggle_active" type="object" class="oe_stat_button" icon="fa-archive">
-                            <field name="active" widget="boolean_button" options='{"terminology": "archive"}'/>
-                        </button>
-                    </div>
-                    <div class="oe_title">
-                        <label for="name" class="oe_edit_only" string="Quality Control team"/>
-                        <h1>
-                            <field name="name" placeholder="Quality Control Team name..."/>
-                        </h1>
-                        <div name="options_active"/>
-                    </div>
-                    <group>
-                        <group name="left">
-                            <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager']}"/>
-                        </group>
-                        <group name="right">
-                        </group>
-                    </group>
-                    <notebook>
-                        <page name="members" string="Team Members">
-                            <field name="member_ids" widget="many2many" options="{'not_delete': True}">
-                                <kanban quick_create="false" create="true" delete="true">
-                                    <field name="id"/>
-                                    <field name="name"/>
-                                    <templates>
-                                        <t t-name="kanban-box">
-                                            <div class="oe_kanban_global_click" style="max-width: 200px">
-                                                <div class="o_kanban_record_top">
-                                                    <img t-att-src="kanban_image('res.users', 'image_small', record.id.raw_value)" height="40" width="40" class="oe_avatar oe_kanban_avatar_smallbox mb0"/>
-                                                    <div class="o_kanban_record_headings ml8">
-                                                        <strong class="o_kanban_record_title"><field name="name"/></strong>
-                                                    </div>
-                                                    <a t-if="! read_only_mode" type="delete" class="text-danger">
-                                                        <i class="fa fa-times"></i>
-                                                    </a>
-                                                </div>
-                                            </div>
-                                        </t>
-                                    </templates>
-                                </kanban>
-                            </field>
-                        </page>
-                        <page string="More Info" name="more_info" groups="base.group_no_one">
-                            <group string="Company" groups="base.group_multi_company">
-                                <field name="company_id" options="{'no_create': True}"/>
-                            </group>
-                        </page>
-                    </notebook>
-                </sheet>
-                <div class="oe_chatter">
-                    <field name="message_follower_ids" widget="mail_followers"
-                           help="Follow this QC team to automatically track the events associated to users of this team."/>
-                    <field name="message_ids" widget="mail_thread"/>
-                </div>
-            </form>
-        </field>
-    </record>
-
-    <record id="qc_team_view_tree" model="ir.ui.view">
-        <field name="name">qc.team.tree</field>
-        <field name="model">qc.team</field>
-        <field name="field_parent">child_ids</field>
-        <field name="arch" type="xml">
-            <tree string="Quality Control Team">
-                <field name="name"/>
-                <field name="active" invisible="1"/>
-                <field name="user_id"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="qc_team_config_action" model="ir.actions.act_window">
-        <field name="name">Quality Control Teams</field>
-        <field name="res_model">qc.team</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-        <field name="help" type="html">
-            <p class="oe_view_nocontent_create">
-                Click here to define a new quality control team.
-            </p><p>
-                Use quality control team to organize your different
-                departments into separate teams. Each team will work in
-                its own list of processes, stages...
-            </p>
-        </field>
-    </record>
-
-    <menuitem name="Quality Control Teams"
-        id="qc_team_config_menu"
-        groups="base.group_system"
-        parent="quality_control.menu_qc_config"
-        action="qc_team_config_action"
-        sequence="10"/>
-
-</odoo>
diff --git a/quality_control_team/README.rst b/quality_control_team_oca/README.rst
similarity index 100%
rename from quality_control_team/README.rst
rename to quality_control_team_oca/README.rst
diff --git a/quality_control_team/__init__.py b/quality_control_team_oca/__init__.py
similarity index 100%
rename from quality_control_team/__init__.py
rename to quality_control_team_oca/__init__.py
diff --git a/quality_control_team/__manifest__.py b/quality_control_team_oca/__manifest__.py
similarity index 89%
rename from quality_control_team/__manifest__.py
rename to quality_control_team_oca/__manifest__.py
index 65f8f0922..1d161caba 100644
--- a/quality_control_team/__manifest__.py
+++ b/quality_control_team_oca/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Quality Control Team",
     "summary": "Adds quality control teams to handle different quality "
-               "control workflows",
+    "control workflows",
     "version": "12.0.1.1.1",
     "development_status": "Mature",
     "category": "Quality Control",
@@ -13,9 +13,7 @@
     "license": "AGPL-3",
     "application": False,
     "installable": True,
-    "depends": [
-        "quality_control",
-    ],
+    "depends": ["quality_control",],
     "data": [
         "security/ir.model.access.csv",
         "views/qc_team_view.xml",
diff --git a/quality_control_team/data/quality_control_team_data.xml b/quality_control_team_oca/data/quality_control_team_data.xml
similarity index 87%
rename from quality_control_team/data/quality_control_team_data.xml
rename to quality_control_team_oca/data/quality_control_team_data.xml
index f3f4a7524..66da23edf 100644
--- a/quality_control_team/data/quality_control_team_data.xml
+++ b/quality_control_team_oca/data/quality_control_team_data.xml
@@ -1,13 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2017 Eficent Business and IT Consulting Services S.L.
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
-
 <odoo>
 
     <data noupdate="0">
         <record model="qc.team" id="qc_team_main">
             <field name="name">Main QC Team</field>
-            <field name="member_ids" eval="[(4, ref('base.user_admin'))]"/>
+            <field name="member_ids" eval="[(4, ref('base.user_admin'))]" />
         </record>
     </data>
 
diff --git a/quality_control_team/i18n/de.po b/quality_control_team_oca/i18n/de.po
similarity index 100%
rename from quality_control_team/i18n/de.po
rename to quality_control_team_oca/i18n/de.po
diff --git a/quality_control_team/i18n/it.po b/quality_control_team_oca/i18n/it.po
similarity index 100%
rename from quality_control_team/i18n/it.po
rename to quality_control_team_oca/i18n/it.po
diff --git a/quality_control_team/i18n/pt.po b/quality_control_team_oca/i18n/pt.po
similarity index 100%
rename from quality_control_team/i18n/pt.po
rename to quality_control_team_oca/i18n/pt.po
diff --git a/quality_control_team/i18n/pt_BR.po b/quality_control_team_oca/i18n/pt_BR.po
similarity index 100%
rename from quality_control_team/i18n/pt_BR.po
rename to quality_control_team_oca/i18n/pt_BR.po
diff --git a/quality_control_team/i18n/quality_control_team.pot b/quality_control_team_oca/i18n/quality_control_team.pot
similarity index 100%
rename from quality_control_team/i18n/quality_control_team.pot
rename to quality_control_team_oca/i18n/quality_control_team.pot
diff --git a/quality_control_team/models/__init__.py b/quality_control_team_oca/models/__init__.py
similarity index 100%
rename from quality_control_team/models/__init__.py
rename to quality_control_team_oca/models/__init__.py
diff --git a/quality_control_team_oca/models/qc_team.py b/quality_control_team_oca/models/qc_team.py
new file mode 100644
index 000000000..7050aad2a
--- /dev/null
+++ b/quality_control_team_oca/models/qc_team.py
@@ -0,0 +1,69 @@
+# Copyright 2017 Eficent Business and IT Consulting Services S.L.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class QualityControlTeam(models.Model):
+    _name = "qc.team"
+    _inherit = ["mail.thread"]
+    _description = "Quality Control Team"
+    _order = "name"
+
+    @api.model
+    def _get_default_qc_team_id(self, user_id=None):
+        if not user_id:
+            user_id = self.env.uid
+        qc_team_id = None
+        if "default_qc_team_id" in self.env.context:
+            qc_team_id = self.env["qc.team"].browse(
+                self.env.context.get("default_qc_team_id")
+            )
+        if not qc_team_id or not qc_team_id.exists():
+            company_id = self.sudo(user_id).company_id.id
+            qc_team_id = (
+                self.env["qc.team"]
+                .sudo()
+                .search(
+                    [
+                        "|",
+                        ("user_id", "=", user_id),
+                        ("member_ids", "=", user_id),
+                        "|",
+                        ("company_id", "=", False),
+                        ("company_id", "child_of", [company_id]),
+                    ],
+                    limit=1,
+                )
+            )
+        if not qc_team_id:
+            default_team_id = self.env.ref(
+                "quality_control_team.qc_team_main", raise_if_not_found=False
+            )
+            if default_team_id:
+                qc_team_id = default_team_id
+        return qc_team_id
+
+    name = fields.Char(string="Quality Control Team", required=True)
+    active = fields.Boolean(default=True)
+    company_id = fields.Many2one(
+        comodel_name="res.company",
+        string="Company",
+        default=lambda self: self.env["res.company"]._company_default_get("qc.team"),
+    )
+    user_id = fields.Many2one(comodel_name="res.users", string="Team Leader")
+    member_ids = fields.One2many(
+        comodel_name="res.users", inverse_name="qc_team_id", string="Team Members"
+    )
+    reply_to = fields.Char(
+        string="Reply-To",
+        help="The email address put in the 'Reply-To' of all emails sent by "
+        "Odoo about cases in this QC team",
+    )
+    color = fields.Integer(string="Color Index", help="The color of the team")
+
+    @api.model
+    def create(self, values):
+        return super(
+            QualityControlTeam, self.with_context(mail_create_nosubscribe=True)
+        ).create(values)
diff --git a/quality_control_team/models/res_partner.py b/quality_control_team_oca/models/res_partner.py
similarity index 61%
rename from quality_control_team/models/res_partner.py
rename to quality_control_team_oca/models/res_partner.py
index 2a2a7969f..37b518f25 100644
--- a/quality_control_team/models/res_partner.py
+++ b/quality_control_team_oca/models/res_partner.py
@@ -5,7 +5,6 @@ from odoo import fields, models
 
 
 class ResPartner(models.Model):
-    _inherit = 'res.partner'
+    _inherit = "res.partner"
 
-    qc_team_id = fields.Many2one(
-        comodel_name='qc.team', string='Quality Control Team')
+    qc_team_id = fields.Many2one(comodel_name="qc.team", string="Quality Control Team")
diff --git a/quality_control_team/models/res_user.py b/quality_control_team_oca/models/res_user.py
similarity index 61%
rename from quality_control_team/models/res_user.py
rename to quality_control_team_oca/models/res_user.py
index 1066a0e35..67ea46874 100644
--- a/quality_control_team/models/res_user.py
+++ b/quality_control_team_oca/models/res_user.py
@@ -5,7 +5,6 @@ from odoo import fields, models
 
 
 class ResUsers(models.Model):
-    _inherit = 'res.users'
+    _inherit = "res.users"
 
-    qc_team_id = fields.Many2one(
-        comodel_name='qc.team', string='Quality Control Team')
+    qc_team_id = fields.Many2one(comodel_name="qc.team", string="Quality Control Team")
diff --git a/quality_control_team/readme/CONFIGURE.rst b/quality_control_team_oca/readme/CONFIGURE.rst
similarity index 100%
rename from quality_control_team/readme/CONFIGURE.rst
rename to quality_control_team_oca/readme/CONFIGURE.rst
diff --git a/quality_control_team/readme/CONTRIBUTORS.rst b/quality_control_team_oca/readme/CONTRIBUTORS.rst
similarity index 100%
rename from quality_control_team/readme/CONTRIBUTORS.rst
rename to quality_control_team_oca/readme/CONTRIBUTORS.rst
diff --git a/quality_control_team/readme/DESCRIPTION.rst b/quality_control_team_oca/readme/DESCRIPTION.rst
similarity index 100%
rename from quality_control_team/readme/DESCRIPTION.rst
rename to quality_control_team_oca/readme/DESCRIPTION.rst
diff --git a/quality_control_team/security/ir.model.access.csv b/quality_control_team_oca/security/ir.model.access.csv
similarity index 100%
rename from quality_control_team/security/ir.model.access.csv
rename to quality_control_team_oca/security/ir.model.access.csv
diff --git a/quality_control_team/static/description/icon.png b/quality_control_team_oca/static/description/icon.png
similarity index 100%
rename from quality_control_team/static/description/icon.png
rename to quality_control_team_oca/static/description/icon.png
diff --git a/quality_control_team/static/description/icon.svg b/quality_control_team_oca/static/description/icon.svg
similarity index 100%
rename from quality_control_team/static/description/icon.svg
rename to quality_control_team_oca/static/description/icon.svg
diff --git a/quality_control_team/static/description/index.html b/quality_control_team_oca/static/description/index.html
similarity index 100%
rename from quality_control_team/static/description/index.html
rename to quality_control_team_oca/static/description/index.html
diff --git a/quality_control_team/tests/__init__.py b/quality_control_team_oca/tests/__init__.py
similarity index 100%
rename from quality_control_team/tests/__init__.py
rename to quality_control_team_oca/tests/__init__.py
diff --git a/quality_control_team_oca/tests/test_quality_control_team.py b/quality_control_team_oca/tests/test_quality_control_team.py
new file mode 100644
index 000000000..82daea33c
--- /dev/null
+++ b/quality_control_team_oca/tests/test_quality_control_team.py
@@ -0,0 +1,34 @@
+# Copyright 2017 Eficent Business and IT Consulting Services S.L.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo.tests.common import TransactionCase
+
+
+class TestQualityControlTeam(TransactionCase):
+    def setUp(self):
+        super(TestQualityControlTeam, self).setUp()
+        self.qc_team_obj = self.env["qc.team"]
+        self.main_qc_team = self.env.ref("quality_control_team.qc_team_main")
+        self.other_company = self.env["res.company"].create({"name": "other company",})
+        self.user_test = self.env["res.users"].create(
+            {
+                "name": "Test User",
+                "login": "testuser",
+                "company_id": self.other_company.id,
+                "company_ids": [(4, self.other_company.id)],
+            }
+        )
+
+    def test_default_qc_team(self):
+        """Test that the QC team is defaulted correctly."""
+        team = self.qc_team_obj._get_default_qc_team_id(user_id=self.user_test.id)
+        self.assertEqual(team, self.main_qc_team)
+        test_team = self.qc_team_obj.create(
+            {
+                "name": "Test Team",
+                "user_id": self.user_test.id,
+                "company_id": self.other_company.id,
+            }
+        )
+        team = self.qc_team_obj._get_default_qc_team_id(user_id=self.user_test.id)
+        self.assertEqual(team, test_team)
diff --git a/quality_control_team_oca/views/qc_team_dashboard.xml b/quality_control_team_oca/views/qc_team_dashboard.xml
new file mode 100644
index 000000000..a349ad611
--- /dev/null
+++ b/quality_control_team_oca/views/qc_team_dashboard.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+<!-- Copyright 2017-19 Eficent Business and IT Consulting Services S.L.
+ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+
+    <record id="qc_team_view_kanban" model="ir.ui.view">
+        <field name="name">qc.team.dashboard</field>
+        <field name="model">qc.team</field>
+        <field name="arch" type="xml">
+            <kanban class="o_kanban_dashboard oe_background_grey" create="0">
+                <field name="name" />
+                <field name="user_id" />
+                <field name="member_ids" />
+                <field name="color" />
+                <templates>
+                    <t t-name="kanban-box">
+                        <div t-attf-class="#{kanban_color(record.color.raw_value)}">
+                            <div class="o_kanban_card_header">
+                                <div class="o_kanban_card_header_title">
+                                    <div class="o_primary"><field name="name" /></div>
+                                </div>
+                                <div class="o_kanban_manage_button_section">
+                                    <a class="o_kanban_manage_toggle_button" href="#"><i
+                                            class="fa fa-ellipsis-v"
+                                            role="img"
+                                            aria-label="Manage"
+                                            title="Manage"
+                                        /></a>
+                                </div>
+                            </div>
+                            <div class="container o_kanban_card_content">
+                                <div class="row o_kanban_card_upper_content">
+                                    <div
+                                        class="col-6 o_kanban_primary_left"
+                                        name="card_left"
+                                    />
+                                    <div
+                                        class="col-6 o_kanban_primary_right"
+                                        name="card_right"
+                                    />
+                                </div>
+                            </div>
+
+                            <div
+                                class="container o_kanban_card_manage_pane dropdown-menu"
+                                role="menu"
+                            >
+                                <div
+                                    t-if="widget.editable"
+                                    class="o_kanban_card_manage_settings row"
+                                    groups="quality_control.group_quality_control_manager"
+                                >
+                                    <div
+                                        role="menuitem"
+                                        aria-haspopup="true"
+                                        class="col-8"
+                                    >
+                                        <ul
+                                            class="oe_kanban_colorpicker"
+                                            data-field="color"
+                                            role="menu"
+                                        />
+                                    </div>
+                                    <div role="menuitem" class="col-4 text-right">
+                                        <a type="edit">Settings</a>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </t>
+                </templates>
+            </kanban>
+        </field>
+    </record>
+
+    <record id="qc_team_search" model="ir.ui.view">
+        <field name="name">Case Teams - Search</field>
+        <field name="model">qc.team</field>
+        <field name="arch" type="xml">
+            <search string="QC teams Search">
+                <field name="name" />
+                <field name="user_id" />
+                <filter
+                    name="personal"
+                    string="My Teams"
+                    domain="['|', ('member_ids', '=', uid), ('user_id', '=', uid)]"
+                />
+                <group expand="0" string="Group By...">
+                    <filter
+                        name="group_user_id"
+                        string="Team Leader"
+                        domain="[]"
+                        context="{'group_by':'user_id'}"
+                    />
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="qc_team_dashboard_act" model="ir.actions.act_window">
+        <field name="name">Dashboard</field>
+        <field name="res_model">qc.team</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">kanban,form</field>
+        <field name="context">{'search_default_personal':1}</field>
+        <field name="help" type="html">
+            <p>Define a new quality control teams going to <b><i>Configuration >
+                Quality Control Teams</i></b>.
+            </p>
+        </field>
+    </record>
+
+    <menuitem
+        id="menu_qc_team_act"
+        action="qc_team_dashboard_act"
+        sequence="1"
+        parent="quality_control.qc_menu"
+        name="Dashboard"
+    />
+
+</odoo>
diff --git a/quality_control_team_oca/views/qc_team_view.xml b/quality_control_team_oca/views/qc_team_view.xml
new file mode 100644
index 000000000..f7f7981e2
--- /dev/null
+++ b/quality_control_team_oca/views/qc_team_view.xml
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+<!-- Copyright 2017 Eficent Business and IT Consulting Services S.L.
+ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+
+    <record id="qc_team_view_form" model="ir.ui.view">
+        <field name="name">qc.team.form</field>
+        <field name="model">qc.team</field>
+        <field name="arch" type="xml">
+            <form string="Quality Control Team">
+                <sheet>
+                    <div class="oe_button_box" name="button_box">
+                        <button
+                            name="toggle_active"
+                            type="object"
+                            class="oe_stat_button"
+                            icon="fa-archive"
+                        >
+                            <field
+                                name="active"
+                                widget="boolean_button"
+                                options='{"terminology": "archive"}'
+                            />
+                        </button>
+                    </div>
+                    <div class="oe_title">
+                        <label
+                            for="name"
+                            class="oe_edit_only"
+                            string="Quality Control team"
+                        />
+                        <h1>
+                            <field
+                                name="name"
+                                placeholder="Quality Control Team name..."
+                            />
+                        </h1>
+                        <div name="options_active" />
+                    </div>
+                    <group>
+                        <group name="left">
+                            <field
+                                name="user_id"
+                                context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager']}"
+                            />
+                        </group>
+                        <group name="right">
+                        </group>
+                    </group>
+                    <notebook>
+                        <page name="members" string="Team Members">
+                            <field
+                                name="member_ids"
+                                widget="many2many"
+                                options="{'not_delete': True}"
+                            >
+                                <kanban
+                                    quick_create="false"
+                                    create="true"
+                                    delete="true"
+                                >
+                                    <field name="id" />
+                                    <field name="name" />
+                                    <templates>
+                                        <t t-name="kanban-box">
+                                            <div
+                                                class="oe_kanban_global_click"
+                                                style="max-width: 200px"
+                                            >
+                                                <div class="o_kanban_record_top">
+                                                    <img
+                                                        t-att-src="kanban_image('res.users', 'image_small', record.id.raw_value)"
+                                                        height="40"
+                                                        width="40"
+                                                        class="oe_avatar oe_kanban_avatar_smallbox mb0"
+                                                    />
+                                                    <div
+                                                        class="o_kanban_record_headings ml8"
+                                                    >
+                                                        <strong
+                                                            class="o_kanban_record_title"
+                                                        ><field name="name" /></strong>
+                                                    </div>
+                                                    <a
+                                                        t-if="! read_only_mode"
+                                                        type="delete"
+                                                        class="text-danger"
+                                                    >
+                                                        <i class="fa fa-times" />
+                                                    </a>
+                                                </div>
+                                            </div>
+                                        </t>
+                                    </templates>
+                                </kanban>
+                            </field>
+                        </page>
+                        <page
+                            string="More Info"
+                            name="more_info"
+                            groups="base.group_no_one"
+                        >
+                            <group string="Company" groups="base.group_multi_company">
+                                <field
+                                    name="company_id"
+                                    options="{'no_create': True}"
+                                />
+                            </group>
+                        </page>
+                    </notebook>
+                </sheet>
+                <div class="oe_chatter">
+                    <field
+                        name="message_follower_ids"
+                        widget="mail_followers"
+                        help="Follow this QC team to automatically track the events associated to users of this team."
+                    />
+                    <field name="message_ids" widget="mail_thread" />
+                </div>
+            </form>
+        </field>
+    </record>
+
+    <record id="qc_team_view_tree" model="ir.ui.view">
+        <field name="name">qc.team.tree</field>
+        <field name="model">qc.team</field>
+        <field name="field_parent">child_ids</field>
+        <field name="arch" type="xml">
+            <tree string="Quality Control Team">
+                <field name="name" />
+                <field name="active" invisible="1" />
+                <field name="user_id" />
+            </tree>
+        </field>
+    </record>
+
+    <record id="qc_team_config_action" model="ir.actions.act_window">
+        <field name="name">Quality Control Teams</field>
+        <field name="res_model">qc.team</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="help" type="html">
+            <p class="oe_view_nocontent_create">
+                Click here to define a new quality control team.
+            </p><p>
+                Use quality control team to organize your different
+                departments into separate teams. Each team will work in
+                its own list of processes, stages...
+            </p>
+        </field>
+    </record>
+
+    <menuitem
+        name="Quality Control Teams"
+        id="qc_team_config_menu"
+        groups="base.group_system"
+        parent="quality_control.menu_qc_config"
+        action="qc_team_config_action"
+        sequence="10"
+    />
+
+</odoo>
diff --git a/setup/quality_control_team_oca/odoo/addons/quality_control_team_oca b/setup/quality_control_team_oca/odoo/addons/quality_control_team_oca
new file mode 120000
index 000000000..42de2ca46
--- /dev/null
+++ b/setup/quality_control_team_oca/odoo/addons/quality_control_team_oca
@@ -0,0 +1 @@
+../../../../quality_control_team_oca
\ No newline at end of file
diff --git a/setup/quality_control_team_oca/setup.py b/setup/quality_control_team_oca/setup.py
new file mode 100644
index 000000000..28c57bb64
--- /dev/null
+++ b/setup/quality_control_team_oca/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)