diff --git a/quality_control_mrp/README.rst b/quality_control_mrp/README.rst
new file mode 100644
index 000000000..297ba3160
--- /dev/null
+++ b/quality_control_mrp/README.rst
@@ -0,0 +1,52 @@
+.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
+   :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+   :alt: License: AGPL-3
+
+=================================
+MRP extension for quality control
+=================================
+
+This module defines a trigger that creates quality control inspections when a
+production order is finished.
+
+It also adds the shortcuts related to these inspections on production orders.
+
+
+Usage
+=====
+
+.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
+   :alt: Try me on Runbot
+   :target: https://runbot.odoo-community.org/runbot/129/8.0
+
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/manufacture/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us smashing it by providing a detailed and welcomed feedback `here <https://github.com/OCA/manufacture/issues/new?body=module:%20quality_control%0Aversion:%208.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+
+Credits
+=======
+
+Contributors
+------------
+* Pedro M. Baeza <pedro.baeza@serviciobaeza.com>
+* Oihane Crucelaegui <oihanecrucelaegi@avanzosc.es>
+
+Maintainer
+----------
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+This module is maintained by the OCA.
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+To contribute to this module, please visit http://odoo-community.org.
diff --git a/quality_control_mrp/__init__.py b/quality_control_mrp/__init__.py
new file mode 100644
index 000000000..7a3b0b9a1
--- /dev/null
+++ b/quality_control_mrp/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# (c) 2014 Serv. Tec. Avanzados - Pedro M. Baeza
+# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
+
+from . import models
diff --git a/quality_control_mrp/__openerp__.py b/quality_control_mrp/__openerp__.py
new file mode 100644
index 000000000..c88440fbe
--- /dev/null
+++ b/quality_control_mrp/__openerp__.py
@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+# (c) 2014 Serv. Tec. Avanzados - Pedro M. Baeza
+# (c) 2014 Oihane Crucelaegui - AvanzOSC
+# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
+
+{
+    "name": "Quality control - MRP",
+    "version": "8.0.1.0.0",
+    "category": "Quality control",
+    "license": "AGPL-3",
+    "author": "OdooMRP team, "
+              "AvanzOSC, "
+              "Serv. Tecnol. Avanzados - Pedro M. Baeza, "
+              "Odoo Community Association (OCA)",
+    "website": "http://www.odoomrp.com",
+    "contributors": [
+        "Pedro M. Baeza <pedro.baeza@serviciosbaeza.com>",
+        "Oihane Crucelaegui <oihanecrucelaegi@avanzosc.es>",
+    ],
+    "depends": [
+        "quality_control",
+        "quality_control_stock",
+        "mrp",
+    ],
+    "data": [
+        'data/quality_control_mrp_data.xml',
+        'views/qc_inspection_view.xml',
+        'views/mrp_production_view.xml',
+    ],
+    "installable": True,
+    "auto_install": True,
+}
diff --git a/quality_control_mrp/data/quality_control_mrp_data.xml b/quality_control_mrp/data/quality_control_mrp_data.xml
new file mode 100644
index 000000000..99a2de04a
--- /dev/null
+++ b/quality_control_mrp/data/quality_control_mrp_data.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+
+        <record model="qc.trigger" id="qc_trigger_mrp">
+            <field name="name">Production done</field>
+            <field name="company_id"></field>
+        </record>
+
+        <record id="req_link_mrp_production" model="res.request.link">
+            <field name="name">Manufacturing Order</field>
+            <field name="object">mrp.production</field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/quality_control_mrp/i18n/es.po b/quality_control_mrp/i18n/es.po
new file mode 100644
index 000000000..5110a9a94
--- /dev/null
+++ b/quality_control_mrp/i18n/es.po
@@ -0,0 +1,77 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * quality_control_mrp
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: odoomrp-wip (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-10-07 10:44+0000\n"
+"PO-Revision-Date: 2015-10-09 10:50+0000\n"
+"Last-Translator: Pedro M. Baeza <pedro.baeza@gmail.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/oca/odoomrp-wip-8-0/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: quality_control_mrp
+#: field:mrp.production,qc_inspections:0
+msgid "Inspections"
+msgstr "Inspecciones"
+
+#. module: quality_control_mrp
+#: help:mrp.production,qc_inspections:0
+msgid "Inspections related to this production."
+msgstr "Inspecciones relativas a esta producción."
+
+#. module: quality_control_mrp
+#: model:ir.model,name:quality_control_mrp.model_mrp_production
+#: model:res.request.link,name:quality_control_mrp.req_link_mrp_production
+msgid "Manufacturing Order"
+msgstr "Órden de producción"
+
+#. module: quality_control_mrp
+#: view:qc.inspection:quality_control_mrp.qc_inspection_search_view_production
+#: view:qc.inspection.line:quality_control_mrp.qc_inspection_line_search_production_view
+msgid "Product"
+msgstr "Product"
+
+#. module: quality_control_mrp
+#: view:qc.inspection:quality_control_mrp.qc_inspection_search_view_production
+#: field:qc.inspection,production:0
+msgid "Production"
+msgstr "Producción"
+
+#. module: quality_control_mrp
+#: model:qc.trigger,name:quality_control_mrp.qc_trigger_mrp
+msgid "Production done"
+msgstr "Producción realizada"
+
+#. module: quality_control_mrp
+#: view:qc.inspection.line:quality_control_mrp.qc_inspection_line_search_production_view
+#: field:qc.inspection.line,production:0
+msgid "Production order"
+msgstr "Orden de producción"
+
+#. module: quality_control_mrp
+#: model:ir.model,name:quality_control_mrp.model_qc_inspection
+msgid "Quality control inspection"
+msgstr "Inspección del control de calidad"
+
+#. module: quality_control_mrp
+#: model:ir.model,name:quality_control_mrp.model_qc_inspection_line
+msgid "Quality control inspection line"
+msgstr "Línea de inspección de control de calidad"
+
+#. module: quality_control_mrp
+#: model:ir.actions.act_window,name:quality_control_mrp.action_qc_inspection_per_production
+msgid "Quality inspections from production order"
+msgstr ""
+
+#. module: quality_control_mrp
+#: view:mrp.production:quality_control_mrp.mrp_production_qc_view
+msgid "inspections"
+msgstr "inspecciones"
diff --git a/quality_control_mrp/i18n/fr.po b/quality_control_mrp/i18n/fr.po
new file mode 100644
index 000000000..0613425f0
--- /dev/null
+++ b/quality_control_mrp/i18n/fr.po
@@ -0,0 +1,77 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * quality_control_mrp
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: odoomrp-wip (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-10-07 10:44+0000\n"
+"PO-Revision-Date: 2015-09-10 16:41+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: French (http://www.transifex.com/oca/odoomrp-wip-8-0/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. module: quality_control_mrp
+#: field:mrp.production,qc_inspections:0
+msgid "Inspections"
+msgstr ""
+
+#. module: quality_control_mrp
+#: help:mrp.production,qc_inspections:0
+msgid "Inspections related to this production."
+msgstr ""
+
+#. module: quality_control_mrp
+#: model:ir.model,name:quality_control_mrp.model_mrp_production
+#: model:res.request.link,name:quality_control_mrp.req_link_mrp_production
+msgid "Manufacturing Order"
+msgstr ""
+
+#. module: quality_control_mrp
+#: view:qc.inspection:quality_control_mrp.qc_inspection_search_view_production
+#: view:qc.inspection.line:quality_control_mrp.qc_inspection_line_search_production_view
+msgid "Product"
+msgstr "Article"
+
+#. module: quality_control_mrp
+#: view:qc.inspection:quality_control_mrp.qc_inspection_search_view_production
+#: field:qc.inspection,production:0
+msgid "Production"
+msgstr ""
+
+#. module: quality_control_mrp
+#: model:qc.trigger,name:quality_control_mrp.qc_trigger_mrp
+msgid "Production done"
+msgstr ""
+
+#. module: quality_control_mrp
+#: view:qc.inspection.line:quality_control_mrp.qc_inspection_line_search_production_view
+#: field:qc.inspection.line,production:0
+msgid "Production order"
+msgstr ""
+
+#. module: quality_control_mrp
+#: model:ir.model,name:quality_control_mrp.model_qc_inspection
+msgid "Quality control inspection"
+msgstr ""
+
+#. module: quality_control_mrp
+#: model:ir.model,name:quality_control_mrp.model_qc_inspection_line
+msgid "Quality control inspection line"
+msgstr ""
+
+#. module: quality_control_mrp
+#: model:ir.actions.act_window,name:quality_control_mrp.action_qc_inspection_per_production
+msgid "Quality inspections from production order"
+msgstr ""
+
+#. module: quality_control_mrp
+#: view:mrp.production:quality_control_mrp.mrp_production_qc_view
+msgid "inspections"
+msgstr ""
diff --git a/quality_control_mrp/i18n/pt_BR.po b/quality_control_mrp/i18n/pt_BR.po
new file mode 100644
index 000000000..060b0ceba
--- /dev/null
+++ b/quality_control_mrp/i18n/pt_BR.po
@@ -0,0 +1,77 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * quality_control_mrp
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: odoomrp-wip (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-10-07 10:44+0000\n"
+"PO-Revision-Date: 2015-10-09 03:43+0000\n"
+"Last-Translator: danimaribeiro <danimaribeiro@gmail.com>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/oca/odoomrp-wip-8-0/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. module: quality_control_mrp
+#: field:mrp.production,qc_inspections:0
+msgid "Inspections"
+msgstr ""
+
+#. module: quality_control_mrp
+#: help:mrp.production,qc_inspections:0
+msgid "Inspections related to this production."
+msgstr ""
+
+#. module: quality_control_mrp
+#: model:ir.model,name:quality_control_mrp.model_mrp_production
+#: model:res.request.link,name:quality_control_mrp.req_link_mrp_production
+msgid "Manufacturing Order"
+msgstr "Ordem de Produção"
+
+#. module: quality_control_mrp
+#: view:qc.inspection:quality_control_mrp.qc_inspection_search_view_production
+#: view:qc.inspection.line:quality_control_mrp.qc_inspection_line_search_production_view
+msgid "Product"
+msgstr "Produto"
+
+#. module: quality_control_mrp
+#: view:qc.inspection:quality_control_mrp.qc_inspection_search_view_production
+#: field:qc.inspection,production:0
+msgid "Production"
+msgstr "Produção"
+
+#. module: quality_control_mrp
+#: model:qc.trigger,name:quality_control_mrp.qc_trigger_mrp
+msgid "Production done"
+msgstr ""
+
+#. module: quality_control_mrp
+#: view:qc.inspection.line:quality_control_mrp.qc_inspection_line_search_production_view
+#: field:qc.inspection.line,production:0
+msgid "Production order"
+msgstr ""
+
+#. module: quality_control_mrp
+#: model:ir.model,name:quality_control_mrp.model_qc_inspection
+msgid "Quality control inspection"
+msgstr ""
+
+#. module: quality_control_mrp
+#: model:ir.model,name:quality_control_mrp.model_qc_inspection_line
+msgid "Quality control inspection line"
+msgstr ""
+
+#. module: quality_control_mrp
+#: model:ir.actions.act_window,name:quality_control_mrp.action_qc_inspection_per_production
+msgid "Quality inspections from production order"
+msgstr ""
+
+#. module: quality_control_mrp
+#: view:mrp.production:quality_control_mrp.mrp_production_qc_view
+msgid "inspections"
+msgstr ""
diff --git a/quality_control_mrp/i18n/sl.po b/quality_control_mrp/i18n/sl.po
new file mode 100644
index 000000000..21dc60e70
--- /dev/null
+++ b/quality_control_mrp/i18n/sl.po
@@ -0,0 +1,78 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * quality_control_mrp
+# 
+# Translators:
+# Matjaž Mozetič <m.mozetic@matmoz.si>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: odoomrp-wip (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-10-07 10:44+0000\n"
+"PO-Revision-Date: 2015-09-20 19:04+0000\n"
+"Last-Translator: Matjaž Mozetič <m.mozetic@matmoz.si>\n"
+"Language-Team: Slovenian (http://www.transifex.com/oca/odoomrp-wip-8-0/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+
+#. module: quality_control_mrp
+#: field:mrp.production,qc_inspections:0
+msgid "Inspections"
+msgstr "Inšpekcije"
+
+#. module: quality_control_mrp
+#: help:mrp.production,qc_inspections:0
+msgid "Inspections related to this production."
+msgstr "Inšpekcije vezane na to proizvodnjo."
+
+#. module: quality_control_mrp
+#: model:ir.model,name:quality_control_mrp.model_mrp_production
+#: model:res.request.link,name:quality_control_mrp.req_link_mrp_production
+msgid "Manufacturing Order"
+msgstr "Proizvodni nalog"
+
+#. module: quality_control_mrp
+#: view:qc.inspection:quality_control_mrp.qc_inspection_search_view_production
+#: view:qc.inspection.line:quality_control_mrp.qc_inspection_line_search_production_view
+msgid "Product"
+msgstr "Proizvod"
+
+#. module: quality_control_mrp
+#: view:qc.inspection:quality_control_mrp.qc_inspection_search_view_production
+#: field:qc.inspection,production:0
+msgid "Production"
+msgstr "Proizvodnja"
+
+#. module: quality_control_mrp
+#: model:qc.trigger,name:quality_control_mrp.qc_trigger_mrp
+msgid "Production done"
+msgstr "Proizvodnja opravljena"
+
+#. module: quality_control_mrp
+#: view:qc.inspection.line:quality_control_mrp.qc_inspection_line_search_production_view
+#: field:qc.inspection.line,production:0
+msgid "Production order"
+msgstr "Proizvodni nalog"
+
+#. module: quality_control_mrp
+#: model:ir.model,name:quality_control_mrp.model_qc_inspection
+msgid "Quality control inspection"
+msgstr "Inšpekcija nadzora kvalitete"
+
+#. module: quality_control_mrp
+#: model:ir.model,name:quality_control_mrp.model_qc_inspection_line
+msgid "Quality control inspection line"
+msgstr "Inšpekcijska postavka kontrole kakovosti"
+
+#. module: quality_control_mrp
+#: model:ir.actions.act_window,name:quality_control_mrp.action_qc_inspection_per_production
+msgid "Quality inspections from production order"
+msgstr "Inšpekcije kvalitete iz proizvodnega naloga"
+
+#. module: quality_control_mrp
+#: view:mrp.production:quality_control_mrp.mrp_production_qc_view
+msgid "inspections"
+msgstr "inšpekcije"
diff --git a/quality_control_mrp/models/__init__.py b/quality_control_mrp/models/__init__.py
new file mode 100644
index 000000000..01f09e84b
--- /dev/null
+++ b/quality_control_mrp/models/__init__.py
@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+# (c) 2014 Serv. Tec. Avanzados - Pedro M. Baeza
+# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
+
+from . import qc_inspection
+from . import mrp_production
diff --git a/quality_control_mrp/models/mrp_production.py b/quality_control_mrp/models/mrp_production.py
new file mode 100644
index 000000000..fe12c123f
--- /dev/null
+++ b/quality_control_mrp/models/mrp_production.py
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+# (c) 2014 Serv. Tec. Avanzados - Pedro M. Baeza
+# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
+
+from openerp import models, fields, api
+from openerp.addons.quality_control.models.qc_trigger_line import\
+    _filter_trigger_lines
+
+
+class MrpProduction(models.Model):
+    _inherit = 'mrp.production'
+
+    @api.one
+    @api.depends('qc_inspections')
+    def _count_inspections(self):
+        self.created_inspections = len(self.qc_inspections)
+
+    qc_inspections = fields.One2many(
+        comodel_name='qc.inspection', inverse_name='production', copy=False,
+        string='Inspections', help="Inspections related to this production.")
+    created_inspections = fields.Integer(
+        compute="_count_inspections", string="Created inspections")
+
+    @api.model
+    def action_produce(self, production_id, production_qty, production_mode,
+                       wiz=False):
+        res = super(MrpProduction, self).action_produce(
+            production_id, production_qty, production_mode, wiz=wiz)
+        if production_mode == 'consume_produce':
+            inspection_model = self.env['qc.inspection']
+            for move in self.move_created_ids2:
+                qc_trigger = self.env.ref('quality_control_mrp.qc_trigger_mrp')
+                trigger_lines = set()
+                for model in ['qc.trigger.product_category_line',
+                              'qc.trigger.product_template_line',
+                              'qc.trigger.product_line']:
+                    trigger_lines = trigger_lines.union(
+                        self.env[model].get_trigger_line_for_product(
+                            qc_trigger, move.product_id))
+                for trigger_line in _filter_trigger_lines(trigger_lines):
+                    inspection_model._make_inspection(move, trigger_line)
+        return res
diff --git a/quality_control_mrp/models/qc_inspection.py b/quality_control_mrp/models/qc_inspection.py
new file mode 100644
index 000000000..15c9a6ede
--- /dev/null
+++ b/quality_control_mrp/models/qc_inspection.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# (c) 2014 Serv. Tec. Avanzados - Pedro M. Baeza
+# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
+
+from openerp import models, fields, api
+
+
+class QcInspection(models.Model):
+    _inherit = 'qc.inspection'
+
+    @api.one
+    @api.depends('object_id')
+    def get_production(self):
+        self.production = False
+        if self.object_id:
+            if self.object_id._name == 'stock.move':
+                self.production = self.object_id.production_id
+
+    production = fields.Many2one(
+        comodel_name="mrp.production", compute="get_production", store=True)
+
+
+class QcInspectionLine(models.Model):
+    _inherit = 'qc.inspection.line'
+
+    production = fields.Many2one(
+        comodel_name="mrp.production", related="inspection_id.production",
+        store=True, string="Production order")
diff --git a/quality_control_mrp/static/description/icon.png b/quality_control_mrp/static/description/icon.png
new file mode 100644
index 000000000..a86ac2216
Binary files /dev/null and b/quality_control_mrp/static/description/icon.png differ
diff --git a/quality_control_mrp/tests/__init__.py b/quality_control_mrp/tests/__init__.py
new file mode 100644
index 000000000..bb13e6fe1
--- /dev/null
+++ b/quality_control_mrp/tests/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# (c) 2015 Oihane Crucelaegui - AvanzOSC
+# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
+
+from . import test_quality_control_mrp
diff --git a/quality_control_mrp/tests/test_quality_control_mrp.py b/quality_control_mrp/tests/test_quality_control_mrp.py
new file mode 100644
index 000000000..7aefdabd9
--- /dev/null
+++ b/quality_control_mrp/tests/test_quality_control_mrp.py
@@ -0,0 +1,80 @@
+# -*- coding: utf-8 -*-
+# (c) 2015 Oihane Crucelaegui - AvanzOSC
+# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
+
+from openerp.tests.common import TransactionCase
+
+
+class TestQualityControlMrp(TransactionCase):
+
+    def setUp(self):
+        super(TestQualityControlMrp, self).setUp()
+        self.production_model = self.env['mrp.production']
+        self.qc_trigger_model = self.env['qc.trigger']
+        self.product = self.env.ref('product.product_product_4')
+        self.test = self.env.ref('quality_control.qc_test_1')
+        self.trigger = self.env.ref('quality_control_mrp.qc_trigger_mrp')
+        self.production1 = self.production_model.create({
+            'product_id': self.product.id,
+            'product_uom': self.product.uom_id.id,
+        })
+        self.production1.action_confirm()
+        self.production1.action_assign()
+
+    def test_inspection_create_for_product(self):
+        self.product.qc_triggers = [(
+            0, 0, {
+                'trigger': self.trigger.id,
+                'test': self.test.id,
+            }
+        )]
+        self.production1.action_produce(
+            self.production1.id, self.production1.product_qty,
+            'consume_produce')
+        self.assertEqual(self.production1.created_inspections, 1,
+                         'Only one inspection must be created')
+
+    def test_inspection_create_for_template(self):
+        self.product.product_tmpl_id.qc_triggers = [(
+            0, 0, {
+                'trigger': self.trigger.id,
+                'test': self.test.id,
+            }
+        )]
+        self.production1.action_produce(
+            self.production1.id, self.production1.product_qty,
+            'consume_produce')
+        self.assertEqual(self.production1.created_inspections, 1,
+                         'Only one inspection must be created')
+
+    def test_inspection_create_for_category(self):
+        self.product.categ_id.qc_triggers = [(
+            0, 0, {
+                'trigger': self.trigger.id,
+                'test': self.test.id,
+            }
+        )]
+        self.production1.action_produce(
+            self.production1.id, self.production1.product_qty,
+            'consume_produce')
+        self.assertEqual(self.production1.created_inspections, 1,
+                         'Only one inspection must be created')
+
+    def test_inspection_create_only_one(self):
+        self.product.qc_triggers = [(
+            0, 0, {
+                'trigger': self.trigger.id,
+                'test': self.test.id,
+            }
+        )]
+        self.product.categ_id.qc_triggers = [(
+            0, 0, {
+                'trigger': self.trigger.id,
+                'test': self.test.id,
+            }
+        )]
+        self.production1.action_produce(
+            self.production1.id, self.production1.product_qty,
+            'consume_produce')
+        self.assertEqual(self.production1.created_inspections, 1,
+                         'Only one inspection must be created')
diff --git a/quality_control_mrp/views/mrp_production_view.xml b/quality_control_mrp/views/mrp_production_view.xml
new file mode 100644
index 000000000..2b4e9b8e6
--- /dev/null
+++ b/quality_control_mrp/views/mrp_production_view.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <record id="action_qc_inspection_per_production" model="ir.actions.act_window">
+            <field name="name">Quality inspections from production order</field>
+            <field name="res_model">qc.inspection</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('production', '=', active_id)]</field>
+        </record>
+
+        <record model="ir.ui.view" id="mrp.mrp_production_buttons">
+            <field name="name">mrp.production.buttons</field>
+            <field name="model">mrp.production</field>
+            <field name="inherit_id" ref="mrp.mrp_production_form_view" />
+            <field name="arch" type="xml">
+                <div class="oe_title" position="after">
+                    <div class="oe_right oe_button_box" name="buttons">
+                    </div>
+                </div>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="mrp_production_qc_view">
+            <field name="name">mrp.production.form.qc</field>
+            <field name="model">mrp.production</field>
+            <field name="inherit_id" ref="mrp.mrp_production_buttons" />
+            <field name="groups_id"
+                   eval="[(4, ref('quality_control.group_quality_control_user'))]" />
+            <field name="arch" type="xml">
+                <div name="buttons" position="inside">
+                    <button class="oe_inline oe_stat_button"
+                            type="action"
+                            name="%(action_qc_inspection_per_production)d"
+                            icon="fa-bookmark-o">
+                        <field name="created_inspections"
+                               widget="statinfo"
+                               string="inspections" />
+                    </button>
+                </div>
+            </field>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/quality_control_mrp/views/qc_inspection_view.xml b/quality_control_mrp/views/qc_inspection_view.xml
new file mode 100644
index 000000000..d806b6a14
--- /dev/null
+++ b/quality_control_mrp/views/qc_inspection_view.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+
+        <record model="ir.ui.view" id="qc_inspection_form_view_production">
+            <field name="name">qc.inspection.form.view.production</field>
+            <field name="model">qc.inspection</field>
+            <field name="inherit_id" ref="quality_control.qc_inspection_form_view" />
+            <field name="groups_id"
+                   eval="[(4, ref('mrp.group_mrp_user'))]" />
+            <field name="arch" type="xml">
+                <field name="product" position="after">
+                    <field name="production" />
+                </field>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="qc_inspection_tree_view_production">
+            <field name="name">qc.inspection.tree.view.production</field>
+            <field name="model">qc.inspection</field>
+            <field name="inherit_id" ref="quality_control.qc_inspection_tree_view" />
+            <field name="groups_id"
+                   eval="[(4, ref('mrp.group_mrp_user'))]" />
+            <field name="arch" type="xml">
+                <field name="product" position="after">
+                    <field name="production" />
+                </field>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="qc_inspection_search_view_production">
+            <field name="name">qc.inspection.search.view.production</field>
+            <field name="model">qc.inspection</field>
+            <field name="inherit_id" ref="quality_control.qc_inspection_search_view" />
+            <field name="groups_id"
+                   eval="[(4, ref('mrp.group_mrp_user'))]" />
+            <field name="arch" type="xml">
+                <filter string="Product" position="after">
+                    <filter string="Production" domain="[]"
+                            context="{'group_by': 'production'}" />
+                </filter>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="qc_inspection_line_tree_production_view">
+            <field name="name">qc.inspection.line.tree.production</field>
+            <field name="model">qc.inspection.line</field>
+            <field name="inherit_id" ref="quality_control.qc_inspection_line_tree_view"/>
+            <field name="groups_id"
+                   eval="[(4, ref('mrp.group_mrp_user'))]" />
+            <field name="arch" type="xml">
+                <field name="product" position="after">
+                    <field name="production" />
+                </field>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="qc_inspection_line_search_production_view">
+            <field name="name">qc.inspection.line.search.production</field>
+            <field name="model">qc.inspection.line</field>
+            <field name="inherit_id" ref="quality_control.qc_inspection_line_search_view" />
+            <field name="groups_id"
+                   eval="[(4, ref('mrp.group_mrp_user'))]" />
+            <field name="arch" type="xml">
+                <field name="product" position="after">
+                    <field name="production" />
+                </field>
+                <filter string="Product" position="after">
+                    <filter string="Production order" domain="[]"
+                            context="{'group_by': 'production'}" />
+                </filter>
+            </field>
+        </record>
+
+    </data>
+</openerp>