[9.0][MIG] quality_control

OCA · Jun 6, 2017 · 6d262f5 · 6d262f5
1 parent 329e614
commit 6d262f5
Show file tree

Hide file tree

Showing 20 changed files with 510 additions and 531 deletions.
diff --git a/quality_control/README.rst b/quality_control/README.rst
@@ -2,9 +2,9 @@
    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
    :alt: License: AGPL-3
 
-===================================
-Quality control management for Odoo
-===================================
+===============
+Quality control
+===============
 
 This module provides a generic infrastructure for quality tests. The idea is
 that it can be later reused for doing quality inspections on production lots
@@ -48,7 +48,7 @@ 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
+   :target: https://runbot.odoo-community.org/runbot/129/9.0
 
 
 Known issues / Roadmap
@@ -73,6 +73,7 @@ Contributors
 * Pedro M. Baeza <[email protected]>
 * Oihane Crucelaegui <[email protected]>
 * Ana Juaristi <[email protected]>
+* Lois Rilo <[email protected]>
 
 Maintainer
 ----------

diff --git a/quality_control/__openerp__.py b/quality_control/__openerp__.py
@@ -1,24 +1,21 @@
 # -*- coding: utf-8 -*-
-# (c) 2010 NaN Projectes de Programari Lliure, S.L. (http://www.NaN-tic.com)
-# (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
+# Copyright 2010 NaN Projectes de Programari Lliure, S.L.
+# Copyright 2014 Serv. Tec. Avanzados - Pedro M. Baeza
+# Copyright 2014 Oihane Crucelaegui - AvanzOSC
+# Copyright 2017 Eficent Business and IT Consulting Services S.L.
+# License AGPL-3.0 - See http://www.gnu.org/licenses/agpl-3.0.html
 
 {
     "name": "Quality control",
-    "version": "8.0.1.3.0",
+    "version": "9.0.1.3.0",
     "category": "Quality control",
     "license": "AGPL-3",
     "author": "OdooMRP team, "
               "AvanzOSC, "
               "Serv. Tecnol. Avanzados - Pedro M. Baeza, "
+              "Eficent, "
               "Odoo Community Association (OCA)",
     "website": "http://www.odoomrp.com",
-    "contributors": [
-        "Pedro M. Baeza <[email protected]>",
-        "Oihane Crucelaegui <[email protected]>",
-        "Ana Juaristi <[email protected]>",
-    ],
     "depends": [
         "product",
     ],

diff --git a/quality_control/data/quality_control_data.xml b/quality_control/data/quality_control_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
+<odoo>
     <data noupdate="1">
         <record id="qc_test_template_category_generic" model="qc.test.category">
             <field name="name">Generic</field>
@@ -16,16 +16,11 @@
     </data>
 
     <data>
-        <record id="seq_type_qc_inspection" model="ir.sequence.type">
-            <field name="name">Quality inspection</field>
-            <field name="code">qc.inspection</field>
-        </record>
-
         <record id="seq_qc_inspection" model="ir.sequence">
             <field name="name">Quality inspection</field>
             <field name="code">qc.inspection</field>
             <field name="prefix">QC-</field>
             <field name="padding">6</field>
         </record>
     </data>
-</openerp>
+</odoo>
diff --git a/quality_control/models/product_category.py b/quality_control/models/product_category.py
@@ -2,7 +2,7 @@
 ##############################################################################
 # For copyright and license notices, see __openerp__.py file in root directory
 ##############################################################################
-from openerp import models, fields
+from openerp import fields, models
 
 
 class ProductCategory(models.Model):

diff --git a/quality_control/models/product_product.py b/quality_control/models/product_product.py
@@ -2,7 +2,7 @@
 ##############################################################################
 # For copyright and license notices, see __openerp__.py file in root directory
 ##############################################################################
-from openerp import models, fields
+from openerp import fields, models
 
 
 class ProductProduct(models.Model):

diff --git a/quality_control/models/product_template.py b/quality_control/models/product_template.py
@@ -2,7 +2,7 @@
 ##############################################################################
 # For copyright and license notices, see __openerp__.py file in root directory
 ##############################################################################
-from openerp import models, fields
+from openerp import fields, models
 
 
 class ProductTemplate(models.Model):

diff --git a/quality_control/models/qc_inspection.py b/quality_control/models/qc_inspection.py
@@ -2,7 +2,7 @@
 ##############################################################################
 # For copyright and license notices, see __openerp__.py file in root directory
 ##############################################################################
-from openerp import models, fields, api, exceptions, _
+from openerp import api, exceptions, fields, models, _
 import openerp.addons.decimal_precision as dp
 
 

diff --git a/quality_control/models/qc_test.py b/quality_control/models/qc_test.py
@@ -2,7 +2,7 @@
 ##############################################################################
 # For copyright and license notices, see __openerp__.py file in root directory
 ##############################################################################
-from openerp import models, fields, api, exceptions, _
+from openerp import api, exceptions, fields, models, _
 import openerp.addons.decimal_precision as dp
 
 

diff --git a/quality_control/models/qc_test_category.py b/quality_control/models/qc_test_category.py
@@ -2,7 +2,7 @@
 ##############################################################################
 # For copyright and license notices, see __openerp__.py file in root directory
 ##############################################################################
-from openerp import models, fields, api, exceptions, _
+from openerp import api, exceptions, fields, models, _
 
 
 class QcTestTemplateCategory(models.Model):

diff --git a/quality_control/models/qc_trigger.py b/quality_control/models/qc_trigger.py
@@ -2,7 +2,7 @@
 ##############################################################################
 # For copyright and license notices, see __openerp__.py file in root directory
 ##############################################################################
-from openerp import models, fields
+from openerp import fields, models
 
 
 class QcTrigger(models.Model):

diff --git a/quality_control/models/qc_trigger_line.py b/quality_control/models/qc_trigger_line.py
@@ -2,7 +2,7 @@
 ##############################################################################
 # For copyright and license notices, see __openerp__.py file in root directory
 ##############################################################################
-from openerp import models, fields
+from openerp import fields, models
 
 
 def _filter_trigger_lines(trigger_lines):

diff --git a/quality_control/views/product_category_view.xml b/quality_control/views/product_category_view.xml
@@ -1,26 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
 
-        <record model="ir.ui.view" id="product_category_qc_form_view">
-            <field name="name">product.category.qc</field>
-            <field name="model">product.category</field>
-            <field name="inherit_id" ref="product.product_category_form_view"/>
-            <field name="arch" type="xml">
-                <sheet position="inside">
-                    <group name="qc" string="Quality control">
-                        <field name="qc_triggers" nolabel="1">
-                            <tree string="Quality control triggers" editable="bottom">
-                                <field name="trigger" widget="selection" />
-                                <field name="test" />
-                                <field name="user" />
-                                <field name="partners" widget="many2many_tags" />
-                            </tree>
-                        </field>
-                    </group>
-                </sheet>
-            </field>
-        </record>
+    <record model="ir.ui.view" id="product_category_qc_form_view">
+        <field name="name">product.category.qc</field>
+        <field name="model">product.category</field>
+        <field name="inherit_id" ref="product.product_category_form_view"/>
+        <field name="arch" type="xml">
+            <group name="first" position="after">
+                <group name="qc" string="Quality control">
+                    <field name="qc_triggers" nolabel="1">
+                        <tree string="Quality control triggers" editable="bottom">
+                            <field name="trigger" widget="selection" />
+                            <field name="test" />
+                            <field name="user" />
+                            <field name="partners" widget="many2many_tags" />
+                        </tree>
+                    </field>
+                </group>
+            </group>
+        </field>
+    </record>
 
-    </data>
 </openerp>
diff --git a/quality_control/views/product_template_view.xml b/quality_control/views/product_template_view.xml
@@ -1,26 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
+<odoo>
 
-        <record model="ir.ui.view" id="product_template_qc_form_view">
-            <field name="name">product.template.qc</field>
-            <field name="model">product.template</field>
-            <field name="inherit_id" ref="product.product_template_form_view"/>
-            <field name="arch" type="xml">
-                <page string="Inventory" position="inside">
-                    <group name="qc" string="Quality control">
-                        <field name="qc_triggers" nolabel="1">
-                            <tree string="Quality control triggers" editable="bottom">
-                                <field name="trigger" widget="selection"/>
-                                <field name="test"/>
-                                <field name="user" />
-                                <field name="partners" widget="many2many_tags" />
-                            </tree>
-                        </field>
-                    </group>
-                </page>
-            </field>
-        </record>
+    <record model="ir.ui.view" id="product_template_qc_form_view">
+        <field name="name">product.template.qc</field>
+        <field name="model">product.template</field>
+        <field name="inherit_id" ref="product.product_template_form_view"/>
+        <field name="arch" type="xml">
+            <xpath expr="//page[2]" position="inside">
+                <group name="qc" string="Quality control">
+                    <field name="qc_triggers" nolabel="1">
+                        <tree string="Quality control triggers" editable="bottom">
+                            <field name="trigger" widget="selection"/>
+                            <field name="test"/>
+                            <field name="user" />
+                            <field name="partners" widget="many2many_tags" />
+                        </tree>
+                    </field>
+                </group>
+            </xpath>
+        </field>
+    </record>
 
-    </data>
-</openerp>
+</odoo>