diff --git a/quality_control_team/README.rst b/quality_control_team/README.rst
index 887063bff..f1ba5c663 100644
--- a/quality_control_team/README.rst
+++ b/quality_control_team/README.rst
@@ -1,5 +1,5 @@
-.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
-   :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+   :target: https://www.gnu.org/licenses/agpl-3.0-standalone.html
    :alt: License: AGPL-3
 
 ====================
@@ -38,7 +38,7 @@ Credits
 Images
 ------
 
-* Odoo Community Association: `Icon <https://github.com/OCA/maintainer-tools/blob/master/template/module/static/description/icon.svg>`_.
+* Odoo Community Association: `Icon <https://odoo-community.org/logo.png>`_.
 
 Contributors
 ------------
diff --git a/quality_control_team/i18n/quality_control_team.pot b/quality_control_team/i18n/quality_control_team.pot
new file mode 100644
index 000000000..e30607481
--- /dev/null
+++ b/quality_control_team/i18n/quality_control_team.pot
@@ -0,0 +1,410 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* quality_control_team
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 9.0c\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_res_users_property_account_payable_id
+msgid "Account Payable"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_res_users_property_account_receivable_id
+msgid "Account Receivable"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_qc_team_message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_qc_team_active
+msgid "Active"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_res_users_bank_account_count
+msgid "Bank"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.actions.act_window,help:quality_control_team.qc_team_config_action
+msgid "Click here to define a new quality control team."
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_qc_team_color
+msgid "Color Index"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_res_users_ref_company_ids
+msgid "Companies that refers to partner"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_qc_team_company_id
+#: model:ir.ui.view,arch_db:quality_control_team.qc_team_view_form
+msgid "Company"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_res_users_contract_ids
+#: model:ir.model.fields,field_description:quality_control_team.field_res_users_contracts_count
+msgid "Contracts"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_res_users_payment_method_count
+msgid "Count Payment Method"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_qc_team_create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_qc_team_create_date
+msgid "Created on"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_res_users_currency_id
+msgid "Currency"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_res_users_property_payment_term_id
+msgid "Customer Payment Term"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.actions.act_window,name:quality_control_team.qc_team_dashboard_act
+#: model:ir.ui.menu,name:quality_control_team.menu_qc_team_act
+msgid "Dashboard"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,help:quality_control_team.field_qc_team_message_last_post
+msgid "Date of the last message posted on the record."
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.actions.act_window,help:quality_control_team.qc_team_dashboard_act
+msgid "Define a new quality control teams going to <b><i>Configuration &gt;\n"
+"                Quality Control Teams</i></b>."
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_qc_team_display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_res_users_property_account_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.ui.view,arch_db:quality_control_team.qc_team_view_form
+msgid "Follow this QC team to automatically track the events associated to users of this team."
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_qc_team_message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_qc_team_message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_qc_team_message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.ui.view,arch_db:quality_control_team.qc_team_search
+msgid "Group By..."
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_res_users_has_unreconciled_entries
+msgid "Has unreconciled entries"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_qc_team_id
+msgid "ID"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,help:quality_control_team.field_qc_team_message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,help:quality_control_team.field_qc_team_message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_res_users_invoice_ids
+msgid "Invoices"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_qc_team_message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_res_users_issued_total
+#: model:ir.model.fields,field_description:quality_control_team.field_res_users_journal_item_count
+msgid "Journal Items"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_qc_team_message_last_post
+msgid "Last Message Date"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_qc_team___last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_qc_team_write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_qc_team_write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,help:quality_control_team.field_res_users_last_time_entries_checked
+msgid "Last time the invoices & payments matching was performed for this partner. It is set either if there's not at least an unreconciled debit and an unreconciled credit or if you click the \"Done\" button."
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_res_users_last_time_entries_checked
+msgid "Latest Invoices & Payments Matching Date"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_qc_team_message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.ui.view,arch_db:quality_control_team.qc_team_view_kanban
+msgid "More <i class=\"fa fa-caret-down\"/>"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.ui.view,arch_db:quality_control_team.qc_team_view_form
+msgid "More Info"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.ui.view,arch_db:quality_control_team.qc_team_search
+msgid "My Teams"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_qc_team_message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,help:quality_control_team.field_qc_team_message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,help:quality_control_team.field_qc_team_message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model,name:quality_control_team.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_res_users_debit_limit
+msgid "Payable Limit"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_res_users_payment_method_ids
+msgid "Payment Methods"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.ui.view,arch_db:quality_control_team.qc_team_search
+msgid "QC teams Search"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model,name:quality_control_team.model_qc_team
+#: model:ir.model.fields,field_description:quality_control_team.field_qc_team_name
+#: model:ir.model.fields,field_description:quality_control_team.field_res_partner_qc_team_id
+#: model:ir.model.fields,field_description:quality_control_team.field_res_users_qc_team_id
+#: model:ir.ui.view,arch_db:quality_control_team.qc_team_view_form
+#: model:ir.ui.view,arch_db:quality_control_team.qc_team_view_tree
+msgid "Quality Control Team"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.ui.view,arch_db:quality_control_team.qc_team_view_form
+msgid "Quality Control Team name..."
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.actions.act_window,name:quality_control_team.qc_team_config_action
+#: model:ir.ui.menu,name:quality_control_team.qc_team_config_menu
+msgid "Quality Control Teams"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.ui.view,arch_db:quality_control_team.qc_team_view_form
+msgid "Quality Control team"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_qc_team_reply_to
+msgid "Reply-To"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.ui.view,arch_db:quality_control_team.qc_team_view_kanban
+msgid "Settings"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_qc_team_user_id
+#: model:ir.ui.view,arch_db:quality_control_team.qc_team_search
+msgid "Team Leader"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_qc_team_member_ids
+#: model:ir.ui.view,arch_db:quality_control_team.qc_team_view_form
+msgid "Team Members"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,help:quality_control_team.field_qc_team_color
+msgid "The color of the team"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,help:quality_control_team.field_qc_team_reply_to
+msgid "The email address put in the 'Reply-To' of all emails sent by Odoo about cases in this QC team"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,help:quality_control_team.field_res_users_property_account_position_id
+msgid "The fiscal position will determine taxes and accounts used for the partner."
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,help:quality_control_team.field_res_users_has_unreconciled_entries
+msgid "The partner has at least one unreconciled debit and credit since last time the invoices & payments matching was performed."
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,help:quality_control_team.field_res_users_property_account_payable_id
+msgid "This account will be used instead of the default one as the payable account for the current partner"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,help:quality_control_team.field_res_users_property_account_receivable_id
+msgid "This account will be used instead of the default one as the receivable account for the current partner"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,help:quality_control_team.field_res_users_property_supplier_payment_term_id
+msgid "This payment term will be used instead of the default one for purchase orders and vendor bills"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,help:quality_control_team.field_res_users_property_payment_term_id
+msgid "This payment term will be used instead of the default one for sale orders and customer invoices"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_res_users_total_invoiced
+msgid "Total Invoiced"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_res_users_debit
+msgid "Total Payable"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_res_users_credit
+msgid "Total Receivable"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,help:quality_control_team.field_res_users_credit
+msgid "Total amount this customer owes you."
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,help:quality_control_team.field_res_users_debit
+msgid "Total amount you have to pay to this vendor."
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_qc_team_message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_qc_team_message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.actions.act_window,help:quality_control_team.qc_team_config_action
+msgid "Use quality control team to organize your different\n"
+"                departments into separate teams. Each team will work in\n"
+"                its own list of processes, stages..."
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model,name:quality_control_team.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,help:quality_control_team.field_res_users_currency_id
+msgid "Utility field to express amount currency"
+msgstr ""
+
+#. module: quality_control_team
+#: model:ir.model.fields,field_description:quality_control_team.field_res_users_property_supplier_payment_term_id
+msgid "Vendor Payment Term"
+msgstr ""
+
diff --git a/quality_control_team/tests/__init__.py b/quality_control_team/tests/__init__.py
new file mode 100644
index 000000000..dd9c09d06
--- /dev/null
+++ b/quality_control_team/tests/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import test_quality_control_team
diff --git a/quality_control_team/tests/test_quality_control_team.py b/quality_control_team/tests/test_quality_control_team.py
new file mode 100644
index 000000000..3d7a4da9d
--- /dev/null
+++ b/quality_control_team/tests/test_quality_control_team.py
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+# Copyright 2017 Eficent Business and IT Consulting Services S.L.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from openerp.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
index 6c2b26492..b1721984a 100644
--- a/quality_control_team/views/qc_team_dashboard.xml
+++ b/quality_control_team/views/qc_team_dashboard.xml
@@ -31,24 +31,7 @@
                             </div>
 
                             <div class="container o_kanban_card_manage_pane o_invisible">
-                                <div class="row">
-                                    <!--<div class="col-xs-4 o_kanban_card_manage_section o_kanban_manage_view">-->
-                                        <!--<div class="o_kanban_card_manage_title">-->
-                                            <!--<span>View</span>-->
-                                        <!--</div>-->
-                                    <!--</div>-->
-                                    <!--<div class="col-xs-4 o_kanban_card_manage_section o_kanban_manage_new">-->
-                                        <!--<div class="o_kanban_card_manage_title">-->
-                                            <!--<span>New</span>-->
-                                        <!--</div>-->
-                                    <!--</div>-->
-                                    <!--<div class="col-xs-4 o_kanban_card_manage_section o_kanban_manage_reports">-->
-                                        <!--<div class="o_kanban_card_manage_title">-->
-                                            <!--<span>Reports</span>-->
-                                        <!--</div>-->
-                                    <!--</div>-->
-                                </div>
-
+                                <div class="row"/>
                                 <div t-if="widget.editable" class="o_kanban_card_manage_settings row">
                                     <div class="col-xs-8">
                                         <ul class="oe_kanban_colorpicker" data-field="color"/>