diff --git a/quality_control/README.rst b/quality_control/README.rst
index 5726462b0..62770fc46 100644
--- a/quality_control/README.rst
+++ b/quality_control/README.rst
@@ -51,6 +51,12 @@ Usage
    :target: https://runbot.odoo-community.org/runbot/129/8.0
 
 
+Known issues / Roadmap
+======================
+
+* Make translatable the trigger name.
+
+
 Bug Tracker
 ===========
 
diff --git a/quality_control_stock/README.rst b/quality_control_stock/README.rst
new file mode 100644
index 000000000..116962b20
--- /dev/null
+++ b/quality_control_stock/README.rst
@@ -0,0 +1,57 @@
+.. 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
+
+===================================
+Stock extension for quality control
+===================================
+
+This module defines triggers that creates inspections when stock moves are done.
+
+It also adds some shortcuts on picking and lots to these inspections.
+
+
+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
+
+
+Known issues / Roadmap
+======================
+
+* Put trigger in all languages.
+
+
+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_stock/__init__.py b/quality_control_stock/__init__.py
new file mode 100644
index 000000000..15f6ce448
--- /dev/null
+++ b/quality_control_stock/__init__.py
@@ -0,0 +1,15 @@
+# -*- 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
+from openerp import SUPERUSER_ID
+
+
+def post_init_hook(cr, registry):
+    # Create QC triggers
+    picking_type_ids = registry['stock.picking.type'].search(
+        cr, SUPERUSER_ID, [])
+    for picking_type_id in picking_type_ids:
+        registry['stock.picking.type']._create_qc_trigger(
+            cr, SUPERUSER_ID, picking_type_id)
diff --git a/quality_control_stock/__openerp__.py b/quality_control_stock/__openerp__.py
new file mode 100644
index 000000000..f1eaa316d
--- /dev/null
+++ b/quality_control_stock/__openerp__.py
@@ -0,0 +1,33 @@
+# -*- 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 - Stock",
+    "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",
+        "stock",
+    ],
+    "data": [
+        "data/quality_control_stock_data.xml",
+        "views/qc_inspection_view.xml",
+        "views/stock_picking_view.xml",
+        "views/stock_production_lot_view.xml",
+    ],
+    "post_init_hook": "post_init_hook",
+    "installable": True,
+    "auto_install": True,
+}
diff --git a/quality_control_stock/data/quality_control_stock_data.xml b/quality_control_stock/data/quality_control_stock_data.xml
new file mode 100644
index 000000000..fc75ef6e5
--- /dev/null
+++ b/quality_control_stock/data/quality_control_stock_data.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+
+    <data>
+        <record id="req_link_stock_move" model="res.request.link">
+            <field name="name">Stock Move</field>
+            <field name="object">stock.move</field>
+        </record>
+
+        <record id="req_link_stock_picking" model="res.request.link">
+            <field name="name">Picking List</field>
+            <field name="object">stock.picking</field>
+        </record>
+
+        <record id="req_link_stock_production_lot" model="res.request.link">
+            <field name="name">Lot</field>
+            <field name="object">stock.production.lot</field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/quality_control_stock/i18n/es.po b/quality_control_stock/i18n/es.po
new file mode 100644
index 000000000..4e20d7a75
--- /dev/null
+++ b/quality_control_stock/i18n/es.po
@@ -0,0 +1,144 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * quality_control_stock
+# 
+# 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_stock
+#: field:stock.picking,qc_inspections:0
+#: field:stock.production.lot,qc_inspections:0
+msgid "Inspections"
+msgstr "Inspecciones"
+
+#. module: quality_control_stock
+#: help:stock.production.lot,qc_inspections:0
+msgid "Inspections related to this lot."
+msgstr "Inspecciones relativas a este lote."
+
+#. module: quality_control_stock
+#: help:stock.picking,qc_inspections:0
+msgid "Inspections related to this picking."
+msgstr "Inspecciones relativas a este albarán."
+
+#. module: quality_control_stock
+#: view:qc.inspection:quality_control_stock.qc_inspection_search_view_picking
+#: field:qc.inspection,lot:0
+#: view:qc.inspection.line:quality_control_stock.qc_inspection_line_search_stock_view
+#: field:qc.inspection.line,lot:0
+#: model:res.request.link,name:quality_control_stock.req_link_stock_production_lot
+msgid "Lot"
+msgstr "Lote"
+
+#. module: quality_control_stock
+#: model:ir.model,name:quality_control_stock.model_stock_production_lot
+msgid "Lot/Serial"
+msgstr "Lote/Nº de serie"
+
+#. module: quality_control_stock
+#: view:qc.inspection:quality_control_stock.qc_inspection_search_view_picking
+#: field:qc.inspection,picking:0
+#: view:qc.inspection.line:quality_control_stock.qc_inspection_line_search_stock_view
+#: field:qc.inspection.line,picking:0
+msgid "Picking"
+msgstr "Albarán"
+
+#. module: quality_control_stock
+#: model:ir.model,name:quality_control_stock.model_stock_picking
+#: model:res.request.link,name:quality_control_stock.req_link_stock_picking
+msgid "Picking List"
+msgstr "Albarán"
+
+#. module: quality_control_stock
+#: field:qc.trigger,picking_type:0
+msgid "Picking type"
+msgstr "Tipo de albarán"
+
+#. module: quality_control_stock
+#: view:qc.inspection:quality_control_stock.qc_inspection_search_view_picking
+#: view:qc.inspection.line:quality_control_stock.qc_inspection_line_search_stock_view
+msgid "Product"
+msgstr "Producto"
+
+#. module: quality_control_stock
+#: model:ir.model,name:quality_control_stock.model_qc_inspection
+msgid "Quality control inspection"
+msgstr "Inspección del control de calidad"
+
+#. module: quality_control_stock
+#: model:ir.model,name:quality_control_stock.model_qc_inspection_line
+msgid "Quality control inspection line"
+msgstr "Línea de inspección de control de calidad"
+
+#. module: quality_control_stock
+#: model:ir.model,name:quality_control_stock.model_qc_trigger
+msgid "Quality control trigger"
+msgstr "Disparador del control de calidad"
+
+#. module: quality_control_stock
+#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_lot_done
+msgid "Quality inspection from lot done"
+msgstr "Inspecciones desde lote realizadas"
+
+#. module: quality_control_stock
+#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_lot_passed
+msgid "Quality inspection from lot passed"
+msgstr "Inspecciones desde lote pasadas"
+
+#. module: quality_control_stock
+#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_picking_done
+msgid "Quality inspection from picking done"
+msgstr "Inspecciones desde albarán realizadas"
+
+#. module: quality_control_stock
+#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_picking_passed
+msgid "Quality inspection from picking passed"
+msgstr "Inspecciones desde albarán realizadas"
+
+#. module: quality_control_stock
+#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_lot
+msgid "Quality inspections from lot"
+msgstr "Inspecciones desde lote"
+
+#. module: quality_control_stock
+#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_lot_failed
+msgid "Quality inspections from lot failed"
+msgstr "Inspecciones desde lote fallidas"
+
+#. module: quality_control_stock
+#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_picking
+msgid "Quality inspections from picking"
+msgstr "Inspecciones desde albarán"
+
+#. module: quality_control_stock
+#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_picking_failed
+msgid "Quality inspections from picking failed"
+msgstr "Inspecciones desde albarán falladas"
+
+#. module: quality_control_stock
+#: model:res.request.link,name:quality_control_stock.req_link_stock_move
+msgid "Stock Move"
+msgstr "Movimiento de stock"
+
+#. module: quality_control_stock
+#: model:ir.model,name:quality_control_stock.model_stock_picking_type
+msgid "The picking type determines the picking view"
+msgstr ""
+
+#. module: quality_control_stock
+#: view:stock.picking:quality_control_stock.stock_picking_qc_view
+#: view:stock.production.lot:quality_control_stock.stock_lot_qc_view
+msgid "inspections"
+msgstr "inspecciones"
diff --git a/quality_control_stock/i18n/fr.po b/quality_control_stock/i18n/fr.po
new file mode 100644
index 000000000..b94f7cb7a
--- /dev/null
+++ b/quality_control_stock/i18n/fr.po
@@ -0,0 +1,144 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * quality_control_stock
+# 
+# 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:38+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_stock
+#: field:stock.picking,qc_inspections:0
+#: field:stock.production.lot,qc_inspections:0
+msgid "Inspections"
+msgstr ""
+
+#. module: quality_control_stock
+#: help:stock.production.lot,qc_inspections:0
+msgid "Inspections related to this lot."
+msgstr ""
+
+#. module: quality_control_stock
+#: help:stock.picking,qc_inspections:0
+msgid "Inspections related to this picking."
+msgstr ""
+
+#. module: quality_control_stock
+#: view:qc.inspection:quality_control_stock.qc_inspection_search_view_picking
+#: field:qc.inspection,lot:0
+#: view:qc.inspection.line:quality_control_stock.qc_inspection_line_search_stock_view
+#: field:qc.inspection.line,lot:0
+#: model:res.request.link,name:quality_control_stock.req_link_stock_production_lot
+msgid "Lot"
+msgstr "Lot"
+
+#. module: quality_control_stock
+#: model:ir.model,name:quality_control_stock.model_stock_production_lot
+msgid "Lot/Serial"
+msgstr "Lot/n° de série"
+
+#. module: quality_control_stock
+#: view:qc.inspection:quality_control_stock.qc_inspection_search_view_picking
+#: field:qc.inspection,picking:0
+#: view:qc.inspection.line:quality_control_stock.qc_inspection_line_search_stock_view
+#: field:qc.inspection.line,picking:0
+msgid "Picking"
+msgstr ""
+
+#. module: quality_control_stock
+#: model:ir.model,name:quality_control_stock.model_stock_picking
+#: model:res.request.link,name:quality_control_stock.req_link_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: quality_control_stock
+#: field:qc.trigger,picking_type:0
+msgid "Picking type"
+msgstr ""
+
+#. module: quality_control_stock
+#: view:qc.inspection:quality_control_stock.qc_inspection_search_view_picking
+#: view:qc.inspection.line:quality_control_stock.qc_inspection_line_search_stock_view
+msgid "Product"
+msgstr "Article"
+
+#. module: quality_control_stock
+#: model:ir.model,name:quality_control_stock.model_qc_inspection
+msgid "Quality control inspection"
+msgstr ""
+
+#. module: quality_control_stock
+#: model:ir.model,name:quality_control_stock.model_qc_inspection_line
+msgid "Quality control inspection line"
+msgstr ""
+
+#. module: quality_control_stock
+#: model:ir.model,name:quality_control_stock.model_qc_trigger
+msgid "Quality control trigger"
+msgstr ""
+
+#. module: quality_control_stock
+#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_lot_done
+msgid "Quality inspection from lot done"
+msgstr ""
+
+#. module: quality_control_stock
+#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_lot_passed
+msgid "Quality inspection from lot passed"
+msgstr ""
+
+#. module: quality_control_stock
+#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_picking_done
+msgid "Quality inspection from picking done"
+msgstr ""
+
+#. module: quality_control_stock
+#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_picking_passed
+msgid "Quality inspection from picking passed"
+msgstr ""
+
+#. module: quality_control_stock
+#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_lot
+msgid "Quality inspections from lot"
+msgstr ""
+
+#. module: quality_control_stock
+#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_lot_failed
+msgid "Quality inspections from lot failed"
+msgstr ""
+
+#. module: quality_control_stock
+#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_picking
+msgid "Quality inspections from picking"
+msgstr ""
+
+#. module: quality_control_stock
+#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_picking_failed
+msgid "Quality inspections from picking failed"
+msgstr ""
+
+#. module: quality_control_stock
+#: model:res.request.link,name:quality_control_stock.req_link_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: quality_control_stock
+#: model:ir.model,name:quality_control_stock.model_stock_picking_type
+msgid "The picking type determines the picking view"
+msgstr ""
+
+#. module: quality_control_stock
+#: view:stock.picking:quality_control_stock.stock_picking_qc_view
+#: view:stock.production.lot:quality_control_stock.stock_lot_qc_view
+msgid "inspections"
+msgstr ""
diff --git a/quality_control_stock/i18n/pt_BR.po b/quality_control_stock/i18n/pt_BR.po
new file mode 100644
index 000000000..79fc0c706
--- /dev/null
+++ b/quality_control_stock/i18n/pt_BR.po
@@ -0,0 +1,144 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * quality_control_stock
+# 
+# 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_stock
+#: field:stock.picking,qc_inspections:0
+#: field:stock.production.lot,qc_inspections:0
+msgid "Inspections"
+msgstr ""
+
+#. module: quality_control_stock
+#: help:stock.production.lot,qc_inspections:0
+msgid "Inspections related to this lot."
+msgstr ""
+
+#. module: quality_control_stock
+#: help:stock.picking,qc_inspections:0
+msgid "Inspections related to this picking."
+msgstr ""
+
+#. module: quality_control_stock
+#: view:qc.inspection:quality_control_stock.qc_inspection_search_view_picking
+#: field:qc.inspection,lot:0
+#: view:qc.inspection.line:quality_control_stock.qc_inspection_line_search_stock_view
+#: field:qc.inspection.line,lot:0
+#: model:res.request.link,name:quality_control_stock.req_link_stock_production_lot
+msgid "Lot"
+msgstr ""
+
+#. module: quality_control_stock
+#: model:ir.model,name:quality_control_stock.model_stock_production_lot
+msgid "Lot/Serial"
+msgstr "Lote/Serial"
+
+#. module: quality_control_stock
+#: view:qc.inspection:quality_control_stock.qc_inspection_search_view_picking
+#: field:qc.inspection,picking:0
+#: view:qc.inspection.line:quality_control_stock.qc_inspection_line_search_stock_view
+#: field:qc.inspection.line,picking:0
+msgid "Picking"
+msgstr "Separação"
+
+#. module: quality_control_stock
+#: model:ir.model,name:quality_control_stock.model_stock_picking
+#: model:res.request.link,name:quality_control_stock.req_link_stock_picking
+msgid "Picking List"
+msgstr "Lista de separação"
+
+#. module: quality_control_stock
+#: field:qc.trigger,picking_type:0
+msgid "Picking type"
+msgstr ""
+
+#. module: quality_control_stock
+#: view:qc.inspection:quality_control_stock.qc_inspection_search_view_picking
+#: view:qc.inspection.line:quality_control_stock.qc_inspection_line_search_stock_view
+msgid "Product"
+msgstr "Produto"
+
+#. module: quality_control_stock
+#: model:ir.model,name:quality_control_stock.model_qc_inspection
+msgid "Quality control inspection"
+msgstr ""
+
+#. module: quality_control_stock
+#: model:ir.model,name:quality_control_stock.model_qc_inspection_line
+msgid "Quality control inspection line"
+msgstr ""
+
+#. module: quality_control_stock
+#: model:ir.model,name:quality_control_stock.model_qc_trigger
+msgid "Quality control trigger"
+msgstr ""
+
+#. module: quality_control_stock
+#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_lot_done
+msgid "Quality inspection from lot done"
+msgstr ""
+
+#. module: quality_control_stock
+#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_lot_passed
+msgid "Quality inspection from lot passed"
+msgstr ""
+
+#. module: quality_control_stock
+#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_picking_done
+msgid "Quality inspection from picking done"
+msgstr ""
+
+#. module: quality_control_stock
+#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_picking_passed
+msgid "Quality inspection from picking passed"
+msgstr ""
+
+#. module: quality_control_stock
+#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_lot
+msgid "Quality inspections from lot"
+msgstr ""
+
+#. module: quality_control_stock
+#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_lot_failed
+msgid "Quality inspections from lot failed"
+msgstr ""
+
+#. module: quality_control_stock
+#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_picking
+msgid "Quality inspections from picking"
+msgstr ""
+
+#. module: quality_control_stock
+#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_picking_failed
+msgid "Quality inspections from picking failed"
+msgstr ""
+
+#. module: quality_control_stock
+#: model:res.request.link,name:quality_control_stock.req_link_stock_move
+msgid "Stock Move"
+msgstr "Movimentação de estoque"
+
+#. module: quality_control_stock
+#: model:ir.model,name:quality_control_stock.model_stock_picking_type
+msgid "The picking type determines the picking view"
+msgstr ""
+
+#. module: quality_control_stock
+#: view:stock.picking:quality_control_stock.stock_picking_qc_view
+#: view:stock.production.lot:quality_control_stock.stock_lot_qc_view
+msgid "inspections"
+msgstr ""
diff --git a/quality_control_stock/i18n/sl.po b/quality_control_stock/i18n/sl.po
new file mode 100644
index 000000000..9f73fed1a
--- /dev/null
+++ b/quality_control_stock/i18n/sl.po
@@ -0,0 +1,145 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * quality_control_stock
+# 
+# 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_stock
+#: field:stock.picking,qc_inspections:0
+#: field:stock.production.lot,qc_inspections:0
+msgid "Inspections"
+msgstr "Inšpekcije"
+
+#. module: quality_control_stock
+#: help:stock.production.lot,qc_inspections:0
+msgid "Inspections related to this lot."
+msgstr "Inšpekcije vezane na ta lot."
+
+#. module: quality_control_stock
+#: help:stock.picking,qc_inspections:0
+msgid "Inspections related to this picking."
+msgstr "Inšpekcije vezane na ta zbirnik."
+
+#. module: quality_control_stock
+#: view:qc.inspection:quality_control_stock.qc_inspection_search_view_picking
+#: field:qc.inspection,lot:0
+#: view:qc.inspection.line:quality_control_stock.qc_inspection_line_search_stock_view
+#: field:qc.inspection.line,lot:0
+#: model:res.request.link,name:quality_control_stock.req_link_stock_production_lot
+msgid "Lot"
+msgstr "Lot"
+
+#. module: quality_control_stock
+#: model:ir.model,name:quality_control_stock.model_stock_production_lot
+msgid "Lot/Serial"
+msgstr "Lot/serijska št."
+
+#. module: quality_control_stock
+#: view:qc.inspection:quality_control_stock.qc_inspection_search_view_picking
+#: field:qc.inspection,picking:0
+#: view:qc.inspection.line:quality_control_stock.qc_inspection_line_search_stock_view
+#: field:qc.inspection.line,picking:0
+msgid "Picking"
+msgstr "Zbirnik"
+
+#. module: quality_control_stock
+#: model:ir.model,name:quality_control_stock.model_stock_picking
+#: model:res.request.link,name:quality_control_stock.req_link_stock_picking
+msgid "Picking List"
+msgstr "Zbirnik"
+
+#. module: quality_control_stock
+#: field:qc.trigger,picking_type:0
+msgid "Picking type"
+msgstr "Tip zbirnika"
+
+#. module: quality_control_stock
+#: view:qc.inspection:quality_control_stock.qc_inspection_search_view_picking
+#: view:qc.inspection.line:quality_control_stock.qc_inspection_line_search_stock_view
+msgid "Product"
+msgstr "Proizvod"
+
+#. module: quality_control_stock
+#: model:ir.model,name:quality_control_stock.model_qc_inspection
+msgid "Quality control inspection"
+msgstr "Inšpekcija nadzora kvalitete"
+
+#. module: quality_control_stock
+#: model:ir.model,name:quality_control_stock.model_qc_inspection_line
+msgid "Quality control inspection line"
+msgstr "Inšpekcijska postavka kontrole kakovosti"
+
+#. module: quality_control_stock
+#: model:ir.model,name:quality_control_stock.model_qc_trigger
+msgid "Quality control trigger"
+msgstr "Sprožilec kontrole kakovosti"
+
+#. module: quality_control_stock
+#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_lot_done
+msgid "Quality inspection from lot done"
+msgstr "Opravljene inšpekcije kakovosti na lotu"
+
+#. module: quality_control_stock
+#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_lot_passed
+msgid "Quality inspection from lot passed"
+msgstr "Izpolnjene inšpekcije kakovosti na lotu"
+
+#. module: quality_control_stock
+#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_picking_done
+msgid "Quality inspection from picking done"
+msgstr "Opravljene inšpekcije kakovosti na zbirniku"
+
+#. module: quality_control_stock
+#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_picking_passed
+msgid "Quality inspection from picking passed"
+msgstr "Izpolnjene inšpekcije kakovosti na zbirniku"
+
+#. module: quality_control_stock
+#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_lot
+msgid "Quality inspections from lot"
+msgstr "Inšpekcije kakovosti na lotu"
+
+#. module: quality_control_stock
+#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_lot_failed
+msgid "Quality inspections from lot failed"
+msgstr "Neuspešne inšpekcije kakovosti na lotu"
+
+#. module: quality_control_stock
+#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_picking
+msgid "Quality inspections from picking"
+msgstr "Inšpekcije kakovosti na zbirniku"
+
+#. module: quality_control_stock
+#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_picking_failed
+msgid "Quality inspections from picking failed"
+msgstr "Neuspešne inšpekcije kakovosti na zbirniku"
+
+#. module: quality_control_stock
+#: model:res.request.link,name:quality_control_stock.req_link_stock_move
+msgid "Stock Move"
+msgstr "Premik zaloge"
+
+#. module: quality_control_stock
+#: model:ir.model,name:quality_control_stock.model_stock_picking_type
+msgid "The picking type determines the picking view"
+msgstr "Tip zbirnika določi prikaz zbirnika"
+
+#. module: quality_control_stock
+#: view:stock.picking:quality_control_stock.stock_picking_qc_view
+#: view:stock.production.lot:quality_control_stock.stock_lot_qc_view
+msgid "inspections"
+msgstr "inšpekcije"
diff --git a/quality_control_stock/models/__init__.py b/quality_control_stock/models/__init__.py
new file mode 100644
index 000000000..61f4c2b9e
--- /dev/null
+++ b/quality_control_stock/models/__init__.py
@@ -0,0 +1,9 @@
+# -*- 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_trigger
+from . import qc_inspection
+from . import stock_picking_type
+from . import stock_picking
+from . import stock_production_lot
diff --git a/quality_control_stock/models/qc_inspection.py b/quality_control_stock/models/qc_inspection.py
new file mode 100644
index 000000000..a7bd4cc52
--- /dev/null
+++ b/quality_control_stock/models/qc_inspection.py
@@ -0,0 +1,68 @@
+# -*- 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_picking(self):
+        self.picking = False
+        if self.object_id:
+            if self.object_id._name == 'stock.move':
+                self.picking = self.object_id.picking_id
+            elif self.object_id._name == 'stock.picking':
+                self.picking = self.object_id
+            elif self.object_id._name == 'stock.pack.operation':
+                self.picking = self.object_id.picking_id
+
+    @api.one
+    @api.depends('object_id')
+    def get_lot(self):
+        self.lot = False
+        if self.object_id:
+            if self.object_id._name == 'stock.pack.operation':
+                self.lot = self.object_id.lot_id
+            elif self.object_id._name == 'stock.move':
+                self.lot = self.object_id.lot_ids[:1]
+
+    @api.one
+    @api.depends('object_id')
+    def _get_product(self):
+        """Overriden for getting the product from a stock move."""
+        super(QcInspection, self)._get_product()
+        if self.object_id:
+            if self.object_id._name == 'stock.move':
+                self.product = self.object_id.product_id
+            elif self.object_id._name == 'stock.pack.operation':
+                self.product = self.object_id.product_id
+
+    @api.one
+    @api.depends('object_id')
+    def _get_qty(self):
+        super(QcInspection, self)._get_qty()
+        if self.object_id:
+            if self.object_id._name == 'stock.move':
+                self.qty = self.object_id.product_qty
+            elif self.object_id._name == 'stock.pack.operation':
+                self.qty = self.object_id.product_qty
+
+    picking = fields.Many2one(
+        comodel_name="stock.picking", compute="get_picking", store=True)
+    lot = fields.Many2one(
+        comodel_name='stock.production.lot', compute="get_lot", store=True)
+
+
+class QcInspectionLine(models.Model):
+    _inherit = 'qc.inspection.line'
+
+    picking = fields.Many2one(
+        comodel_name="stock.picking", related="inspection_id.picking",
+        store=True)
+    lot = fields.Many2one(
+        comodel_name="stock.production.lot", related="inspection_id.lot",
+        store=True)
diff --git a/quality_control_stock/models/qc_trigger.py b/quality_control_stock/models/qc_trigger.py
new file mode 100644
index 000000000..5c0d7816e
--- /dev/null
+++ b/quality_control_stock/models/qc_trigger.py
@@ -0,0 +1,12 @@
+# -*- 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
+
+
+class QcTrigger(models.Model):
+    _inherit = 'qc.trigger'
+
+    picking_type = fields.Many2one(
+        comodel_name="stock.picking.type", readonly=True, ondelete="cascade")
diff --git a/quality_control_stock/models/stock_picking.py b/quality_control_stock/models/stock_picking.py
new file mode 100644
index 000000000..1583d9bd6
--- /dev/null
+++ b/quality_control_stock/models/stock_picking.py
@@ -0,0 +1,54 @@
+# -*- 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 StockPicking(models.Model):
+    _inherit = 'stock.picking'
+
+    @api.one
+    @api.depends('qc_inspections', 'qc_inspections.state')
+    def _count_inspections(self):
+        self.created_inspections = len(self.qc_inspections)
+        self.passed_inspections = len([x for x in self.qc_inspections if
+                                       x.state == 'success'])
+        self.failed_inspections = len([x for x in self.qc_inspections if
+                                       x.state == 'failed'])
+        self.done_inspections = (self.passed_inspections +
+                                 self.failed_inspections)
+
+    qc_inspections = fields.One2many(
+        comodel_name='qc.inspection', inverse_name='picking', copy=False,
+        string='Inspections', help="Inspections related to this picking.")
+    created_inspections = fields.Integer(
+        compute="_count_inspections", string="Created inspections")
+    done_inspections = fields.Integer(
+        compute="_count_inspections", string="Done inspections")
+    passed_inspections = fields.Integer(
+        compute="_count_inspections", string="Inspections OK")
+    failed_inspections = fields.Integer(
+        compute="_count_inspections", string="Inspections failed")
+
+    @api.multi
+    def do_transfer(self):
+        res = super(StockPicking, self).do_transfer()
+        inspection_model = self.env['qc.inspection']
+        for operation in self.pack_operation_ids:
+            qc_trigger = self.env['qc.trigger'].search(
+                [('picking_type', '=', self.picking_type_id.id)])
+            trigger_lines = set()
+            for model in ['qc.trigger.product_category_line',
+                          'qc.trigger.product_template_line',
+                          'qc.trigger.product_line']:
+                partner = (self.partner_id
+                           if qc_trigger.partner_selectable else False)
+                trigger_lines = trigger_lines.union(
+                    self.env[model].get_trigger_line_for_product(
+                        qc_trigger, operation.product_id, partner=partner))
+            for trigger_line in _filter_trigger_lines(trigger_lines):
+                inspection_model._make_inspection(operation, trigger_line)
+        return res
diff --git a/quality_control_stock/models/stock_picking_type.py b/quality_control_stock/models/stock_picking_type.py
new file mode 100644
index 000000000..7010cf3ba
--- /dev/null
+++ b/quality_control_stock/models/stock_picking_type.py
@@ -0,0 +1,35 @@
+# -*- 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, api
+
+
+class StockPickingType(models.Model):
+    _inherit = 'stock.picking.type'
+
+    @api.multi
+    def _create_qc_trigger(self):
+        qc_trigger = {
+            'name': self.complete_name,
+            'company_id': self.warehouse_id.company_id.id,
+            'picking_type': self.id,
+            'partner_selectable': True,
+        }
+        return self.env['qc.trigger'].sudo().create(qc_trigger)
+
+    @api.model
+    def create(self, vals):
+        picking_type = super(StockPickingType, self).create(vals)
+        picking_type._create_qc_trigger()
+        return picking_type
+
+    @api.multi
+    def write(self, vals):
+        res = super(StockPickingType, self).write(vals)
+        if vals.get('name') or vals.get('warehouse_id'):
+            qc_trigger_model = self.env['qc.trigger'].sudo()
+            qc_trigger = qc_trigger_model.search(
+                [('picking_type', '=', self.id)])
+            qc_trigger.name = self.complete_name
+        return res
diff --git a/quality_control_stock/models/stock_production_lot.py b/quality_control_stock/models/stock_production_lot.py
new file mode 100644
index 000000000..aeff0ad90
--- /dev/null
+++ b/quality_control_stock/models/stock_production_lot.py
@@ -0,0 +1,32 @@
+# -*- 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 StockProductionLot(models.Model):
+    _inherit = 'stock.production.lot'
+
+    @api.one
+    @api.depends('qc_inspections', 'qc_inspections.state')
+    def _count_inspections(self):
+        self.created_inspections = len(self.qc_inspections)
+        self.passed_inspections = len([x for x in self.qc_inspections if
+                                       x.state == 'success'])
+        self.failed_inspections = len([x for x in self.qc_inspections if
+                                       x.state == 'failed'])
+        self.done_inspections = (self.passed_inspections +
+                                 self.failed_inspections)
+
+    qc_inspections = fields.One2many(
+        comodel_name='qc.inspection', inverse_name='lot', copy=False,
+        string='Inspections', help="Inspections related to this lot.")
+    created_inspections = fields.Integer(
+        compute="_count_inspections", string="Created inspections")
+    done_inspections = fields.Integer(
+        compute="_count_inspections", string="Done inspections")
+    passed_inspections = fields.Integer(
+        compute="_count_inspections", string="Inspections OK")
+    failed_inspections = fields.Integer(
+        compute="_count_inspections", string="Inspections failed")
diff --git a/quality_control_stock/static/description/icon.png b/quality_control_stock/static/description/icon.png
new file mode 100644
index 000000000..84b3a163a
Binary files /dev/null and b/quality_control_stock/static/description/icon.png differ
diff --git a/quality_control_stock/tests/__init__.py b/quality_control_stock/tests/__init__.py
new file mode 100644
index 000000000..3dd12a3d9
--- /dev/null
+++ b/quality_control_stock/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_stock
diff --git a/quality_control_stock/tests/test_quality_control_stock.py b/quality_control_stock/tests/test_quality_control_stock.py
new file mode 100644
index 000000000..000dcf43c
--- /dev/null
+++ b/quality_control_stock/tests/test_quality_control_stock.py
@@ -0,0 +1,231 @@
+# -*- 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 TestQualityControl(TransactionCase):
+
+    def setUp(self):
+        super(TestQualityControl, self).setUp()
+        self.picking_model = self.env['stock.picking']
+        self.inspection_model = self.env['qc.inspection']
+        self.qc_trigger_model = self.env['qc.trigger']
+        self.picking_type_model = self.env['stock.picking.type']
+        self.product = self.env.ref('product.product_product_4')
+        self.partner1 = self.env.ref('base.res_partner_2')
+        self.partner2 = self.env.ref('base.res_partner_4')
+        self.test = self.env.ref('quality_control.qc_test_1')
+        self.picking_type = self.env.ref('stock.picking_type_out')
+        self.sequence = self.env.ref('stock.seq_type_picking_out')
+        inspection_lines = (
+            self.inspection_model._prepare_inspection_lines(self.test))
+        self.inspection1 = self.inspection_model.create({
+            'name': 'Test Inspection',
+            'inspection_lines': inspection_lines,
+        })
+        self.trigger = self.qc_trigger_model.search(
+            [('picking_type', '=', self.picking_type.id)])
+        self.lot = self.env['stock.production.lot'].create({
+            'name': 'Lot for tests',
+            'product_id': self.product.id,
+        })
+        move_vals = {
+            'name': self.product.name,
+            'product_id': self.product.id,
+            'product_uom': self.product.uom_id.id,
+            'location_id': self.picking_type.default_location_src_id.id,
+            'location_dest_id': self.picking_type.default_location_dest_id.id,
+        }
+        self.picking1 = self.picking_model.create({
+            'partner_id': self.partner1.id,
+            'picking_type_id': self.picking_type.id,
+            'move_lines': [(0, 0, move_vals)],
+        })
+        self.picking1.action_confirm()
+        self.picking1.force_assign()
+        self.picking1.do_prepare_partial()
+        for line in self.picking1.pack_operation_ids.filtered(
+                lambda r: r.product_id == self.product):
+            line.write({'lot_id': self.lot.id})
+
+    def test_inspection_create_for_product(self):
+        self.product.qc_triggers = [(
+            0, 0, {
+                'trigger': self.trigger.id,
+                'test': self.test.id,
+            }
+        )]
+        self.picking1.do_transfer()
+        self.assertEqual(self.picking1.created_inspections, 1,
+                         'Only one inspection must be created')
+        self.assertEqual(self.picking1.qc_inspections[:1].test, self.test,
+                         'Wrong test picked when creating inspection.')
+
+    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.picking1.do_transfer()
+        self.assertEqual(self.picking1.created_inspections, 1,
+                         'Only one inspection must be created')
+        self.assertEqual(self.picking1.qc_inspections[:1].test, self.test,
+                         'Wrong test picked when creating inspection.')
+
+    def test_inspection_create_for_category(self):
+        self.product.categ_id.qc_triggers = [(
+            0, 0, {
+                'trigger': self.trigger.id,
+                'test': self.test.id,
+            }
+        )]
+        self.picking1.do_transfer()
+        self.assertEqual(self.picking1.created_inspections, 1,
+                         'Only one inspection must be created')
+        self.assertEqual(self.picking1.qc_inspections[:1].test, self.test,
+                         'Wrong test picked when creating inspection.')
+
+    def test_inspection_create_for_product_partner(self):
+        self.product.qc_triggers = [(
+            0, 0, {
+                'trigger': self.trigger.id,
+                'test': self.test.id,
+                'partners': [(6, 0, self.partner1.ids)],
+            }
+        )]
+        self.picking1.do_transfer()
+        self.assertEqual(self.picking1.created_inspections, 1,
+                         'Only one inspection must be created')
+        self.assertEqual(self.picking1.qc_inspections[:1].test, self.test,
+                         'Wrong test picked when creating inspection.')
+
+    def test_inspection_create_for_template_partner(self):
+        self.product.product_tmpl_id.qc_triggers = [(
+            0, 0, {
+                'trigger': self.trigger.id,
+                'test': self.test.id,
+                'partners': [(6, 0, self.partner1.ids)],
+            }
+        )]
+        self.picking1.do_transfer()
+        self.assertEqual(self.picking1.created_inspections, 1,
+                         'Only one inspection must be created')
+        self.assertEqual(self.picking1.qc_inspections[:1].test, self.test,
+                         'Wrong test picked when creating inspection.')
+
+    def test_inspection_create_for_category_partner(self):
+        self.product.categ_id.qc_triggers = [(
+            0, 0, {
+                'trigger': self.trigger.id,
+                'test': self.test.id,
+                'partners': [(6, 0, self.partner1.ids)],
+            }
+        )]
+        self.picking1.do_transfer()
+        self.assertEqual(self.picking1.created_inspections, 1,
+                         'Only one inspection must be created')
+        self.assertEqual(self.picking1.qc_inspections[:1].test, self.test,
+                         'Wrong test picked when creating inspection.')
+
+    def test_inspection_create_for_product_wrong_partner(self):
+        self.product.qc_triggers = [(
+            0, 0, {
+                'trigger': self.trigger.id,
+                'test': self.test.id,
+                'partners': [(6, 0, self.partner2.ids)],
+            }
+        )]
+        self.picking1.do_transfer()
+        self.assertEqual(self.picking1.created_inspections, 0,
+                         'No inspection must be created')
+
+    def test_inspection_create_for_template_wrong_partner(self):
+        self.product.product_tmpl_id.qc_triggers = [(
+            0, 0, {
+                'trigger': self.trigger.id,
+                'test': self.test.id,
+                'partners': [(6, 0, self.partner2.ids)],
+            }
+        )]
+        self.picking1.do_transfer()
+        self.assertEqual(self.picking1.created_inspections, 0,
+                         'No inspection must be created')
+
+    def test_inspection_create_for_category_wrong_partner(self):
+        self.product.categ_id.qc_triggers = [(
+            0, 0, {
+                'trigger': self.trigger.id,
+                'test': self.test.id,
+                'partners': [(6, 0, self.partner2.ids)],
+            }
+        )]
+        self.picking1.do_transfer()
+        self.assertEqual(self.picking1.created_inspections, 0,
+                         'No 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.picking1.do_transfer()
+        self.assertEqual(self.picking1.created_inspections, 1,
+                         'Only one inspection must be created')
+        self.assertEqual(self.picking1.qc_inspections[:1].test, self.test,
+                         'Wrong test picked when creating inspection.')
+        self.assertEqual(self.lot.created_inspections, 1,
+                         'Only one inspection must be created')
+        self.assertEqual(self.lot.qc_inspections[:1].test, self.test,
+                         'Wrong test picked when creating inspection.')
+
+    def test_picking_type(self):
+        picking_type = self.picking_type_model.create({
+            'name': 'Test Picking Type',
+            'sequence_id': self.sequence.id,
+            'code': 'outgoing',
+        })
+        trigger = self.qc_trigger_model.search(
+            [('picking_type', '=', picking_type.id)])
+        self.assertEqual(len(trigger), 1,
+                         'One trigger must have been created.')
+        self.assertEqual(trigger.name, picking_type.complete_name,
+                         'Trigger name must match picking type name.')
+        picking_type.write({
+            'name': 'Test Name Change',
+        })
+        self.assertEqual(trigger.name, picking_type.complete_name,
+                         'Trigger name must match picking type name.')
+
+    def test_qc_inspection_picking(self):
+        self.inspection1.write({
+            'object_id': '%s,%d' % (self.picking1._model,
+                                    self.picking1.id),
+        })
+        self.assertEquals(self.inspection1.picking,
+                          self.picking1)
+
+    def test_qc_inspection_stock_move(self):
+        self.inspection1.write({
+            'object_id': '%s,%d' % (self.picking1.move_lines[:1]._model,
+                                    self.picking1.move_lines[:1].id),
+        })
+        self.assertEquals(self.inspection1.picking,
+                          self.picking1)
+        self.assertEquals(self.inspection1.lot,
+                          self.picking1.move_lines[:1].lot_ids[:1])
+        self.assertEquals(self.inspection1.product,
+                          self.picking1.move_lines[:1].product_id)
+        self.assertEquals(self.inspection1.qty,
+                          self.picking1.move_lines[:1].product_qty)
diff --git a/quality_control_stock/views/qc_inspection_view.xml b/quality_control_stock/views/qc_inspection_view.xml
new file mode 100644
index 000000000..3e3d949dc
--- /dev/null
+++ b/quality_control_stock/views/qc_inspection_view.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+
+        <record model="ir.ui.view" id="qc_inspection_form_view_picking">
+            <field name="name">qc.inspection.form.view.picking</field>
+            <field name="model">qc.inspection</field>
+            <field name="inherit_id" ref="quality_control.qc_inspection_form_view" />
+            <field name="arch" type="xml">
+                <field name="product" position="after">
+                    <field name="picking" />
+                    <field name="lot" groups="stock.group_production_lot" />
+                </field>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="qc_inspection_tree_view_picking">
+            <field name="name">qc.inspection.tree.view.picking</field>
+            <field name="model">qc.inspection</field>
+            <field name="inherit_id" ref="quality_control.qc_inspection_tree_view" />
+            <field name="arch" type="xml">
+                <field name="product" position="after">
+                    <field name="picking" />
+                    <field name="lot" groups="stock.group_production_lot" />
+                </field>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="qc_inspection_search_view_picking">
+            <field name="name">qc.inspection.search.view.picking</field>
+            <field name="model">qc.inspection</field>
+            <field name="inherit_id" ref="quality_control.qc_inspection_search_view" />
+            <field name="arch" type="xml">
+                <filter string="Product" position="after">
+                    <filter string="Picking"
+                            domain="[]"
+                            context="{'group_by': 'picking'}" />
+                    <filter string="Lot"
+                            domain="[]"
+                            groups="stock.group_production_lot"
+                            context="{'group_by': 'lot'}" />
+                </filter>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="qc_inspection_line_tree_stock_view">
+            <field name="name">qc.inspection.line.tree.stock</field>
+            <field name="model">qc.inspection.line</field>
+            <field name="inherit_id" ref="quality_control.qc_inspection_line_tree_view"/>
+            <field name="arch" type="xml">
+                <field name="product" position="after">
+                    <field name="picking" />
+                    <field name="lot" />
+                </field>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="qc_inspection_line_search_stock_view">
+            <field name="name">qc.inspection.line.search.stock</field>
+            <field name="model">qc.inspection.line</field>
+            <field name="inherit_id" ref="quality_control.qc_inspection_line_search_view" />
+            <field name="arch" type="xml">
+                <field name="product" position="after">
+                    <field name="picking" />
+                    <field name="lot" />
+                </field>
+                <filter string="Product" position="after">
+                    <filter string="Picking"
+                            domain="[]"
+                            context="{'group_by': 'picking'}" />
+                    <filter string="Lot"
+                            domain="[]"
+                            context="{'group_by': 'lot'}" />
+                </filter>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/quality_control_stock/views/stock_picking_view.xml b/quality_control_stock/views/stock_picking_view.xml
new file mode 100644
index 000000000..1ebb16078
--- /dev/null
+++ b/quality_control_stock/views/stock_picking_view.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+
+        <record id="action_qc_inspection_per_picking" model="ir.actions.act_window">
+            <field name="name">Quality inspections from picking</field>
+            <field name="res_model">qc.inspection</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('picking', '=', active_id)]</field>
+        </record>
+
+        <record id="action_qc_inspection_per_picking_done" model="ir.actions.act_window">
+            <field name="name">Quality inspection from picking done</field>
+            <field name="res_model">qc.inspection</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('picking', '=', active_id), ('state', 'not in', ['draft', 'waiting'])]</field>
+        </record>
+
+        <record id="action_qc_inspection_per_picking_passed" model="ir.actions.act_window">
+            <field name="name">Quality inspection from picking passed</field>
+            <field name="res_model">qc.inspection</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('picking', '=', active_id), ('state', '=', 'success')]</field>
+        </record>
+
+        <record id="action_qc_inspection_per_picking_failed" model="ir.actions.act_window">
+            <field name="name">Quality inspections from picking failed</field>
+            <field name="res_model">qc.inspection</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('picking', '=', active_id), ('state', '=', 'failed')]</field>
+        </record>
+
+        <record model="ir.ui.view" id="stock_picking_qc_view">
+            <field name="name">stock.picking.qc.view</field>
+            <field name="model">stock.picking</field>
+            <field name="inherit_id" ref="stock.view_picking_form" />
+            <field name="groups_id"
+                   eval="[(4, ref('quality_control.group_quality_control_user'))]" />
+            <field name="arch" type="xml">
+                <div class="oe_right oe_button_box" position="inside">
+                    <button class="oe_inline oe_stat_button"
+                            type="action"
+                            name="%(action_qc_inspection_per_picking)d"
+                            icon="fa-list">
+                        <field name="created_inspections"
+                               widget="statinfo"
+                               string="inspections" />
+                    </button>
+                    <button class="oe_inline oe_stat_button"
+                            type="action"
+                            name="%(action_qc_inspection_per_picking_done)d"
+                            icon="fa-pencil">
+                        <field name="done_inspections" widget="statinfo" />
+                    </button>
+                    <button class="oe_inline oe_stat_button"
+                            type="action"
+                            name="%(action_qc_inspection_per_picking_passed)d"
+                            icon="fa-thumbs-o-up">
+                        <field name="passed_inspections" widget="statinfo" />
+                    </button>
+                    <button class="oe_inline oe_stat_button"
+                            type="action"
+                            name="%(action_qc_inspection_per_picking_failed)d"
+                            icon="fa-thumbs-o-down">
+                        <field name="failed_inspections" widget="statinfo" />
+                    </button>
+                </div>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/quality_control_stock/views/stock_production_lot_view.xml b/quality_control_stock/views/stock_production_lot_view.xml
new file mode 100644
index 000000000..9ec36c207
--- /dev/null
+++ b/quality_control_stock/views/stock_production_lot_view.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+
+        <record id="action_qc_inspection_per_lot" model="ir.actions.act_window">
+            <field name="name">Quality inspections from lot</field>
+            <field name="res_model">qc.inspection</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('lot', '=', active_id)]</field>
+        </record>
+
+        <record id="action_qc_inspection_per_lot_done" model="ir.actions.act_window">
+            <field name="name">Quality inspection from lot done</field>
+            <field name="res_model">qc.inspection</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('lot', '=', active_id), ('state', 'not in', ['draft', 'waiting'])]</field>
+        </record>
+
+        <record id="action_qc_inspection_per_lot_passed" model="ir.actions.act_window">
+            <field name="name">Quality inspection from lot passed</field>
+            <field name="res_model">qc.inspection</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('lot', '=', active_id), ('state', '=', 'success')]</field>
+        </record>
+
+        <record id="action_qc_inspection_per_lot_failed" model="ir.actions.act_window">
+            <field name="name">Quality inspections from lot failed</field>
+            <field name="res_model">qc.inspection</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('lot', '=', active_id), ('state', '=', 'failed')]</field>
+        </record>
+
+        <record model="ir.ui.view" id="stock_lot_qc_view">
+            <field name="name">stock.production.lot.qc.view</field>
+            <field name="model">stock.production.lot</field>
+            <field name="inherit_id" ref="stock.view_production_lot_form" />
+            <field name="groups_id"
+                   eval="[(4, ref('quality_control.group_quality_control_user'))]" />
+            <field name="arch" type="xml">
+                <div class="oe_button_box oe_right" position="inside">
+                    <button class="oe_inline oe_stat_button"
+                            type="action"
+                            name="%(action_qc_inspection_per_lot)d"
+                            icon="fa-list">
+                        <field name="created_inspections"
+                               widget="statinfo"
+                               string="inspections" />
+                    </button>
+                    <button class="oe_inline oe_stat_button"
+                            type="action"
+                            name="%(action_qc_inspection_per_lot_done)d"
+                            icon="fa-pencil">
+                        <field name="done_inspections" widget="statinfo" />
+                    </button>
+                    <button class="oe_inline oe_stat_button"
+                            type="action"
+                            name="%(action_qc_inspection_per_lot_passed)d"
+                            icon="fa-thumbs-o-up">
+                        <field name="passed_inspections" widget="statinfo" />
+                    </button>
+                    <button class="oe_inline oe_stat_button"
+                            type="action"
+                            name="%(action_qc_inspection_per_lot_failed)d"
+                            icon="fa-thumbs-o-down">
+                        <field name="failed_inspections" widget="statinfo" />
+                    </button>
+                </div>
+            </field>
+        </record>
+
+    </data>
+</openerp>