Merge lp:~mallorymarcot/unifield-server/us-5108 into lp:unifield-server

[jftempo]

[lp:~mallorymarcot/unifield-server/us-5108]

4968. By Mallory MARCOT on 2018-10-11

US-5220 [IMP] GTIN size to 255

Unmerged revisions

4968. By Mallory MARCOT on 2018-10-11

US-5220 [IMP] GTIN size to 255

4967. By Mallory MARCOT on 2018-09-17

US-5108 [IMP] change Packaging field type from varchar to numeric

4966. By Mallory MARCOT on 2018-09-17

US-4715 [MERGE] with UF10.0 trunk

4965. By Mallory MARCOT on 2018-06-22

US-4715 [IMP] add new field 'SDE Proof Of Concept' on product.product

=== modified file 'bin/addons/product_attributes/product_attributes.py'
--- bin/addons/product_attributes/product_attributes.py	2018-08-06 13:07:33 +0000
+++ bin/addons/product_attributes/product_attributes.py	2018-10-11 10:12:13 +0000
@@ -299,6 +299,18 @@
 product_template()
 
 
+class product_sde_proof_of_concept(osv.osv):
+    _name = 'product.sde.proof.of.concept'
+
+    _columns = {
+        'product_id': fields.many2one('product.product', 'Product'),
+        'gtin': fields.char(size=255, string='GTIN'),
+        'packaging': fields.float(string='Packaging', digits=(16,2)),
+    }
+
+product_sde_proof_of_concept()
+
+
 class product_attributes(osv.osv):
     _inherit = "product.product"
 
@@ -906,6 +918,7 @@
         'vat_ok': fields.function(_get_vat_ok, method=True, type='boolean', string='VAT OK', store=False, readonly=True),
         'uf_write_date': fields.datetime(_('Write date')),
         'uf_create_date': fields.datetime(_('Creation date')),
+        'sde_proof_of_concept': fields.one2many('product.sde.proof.of.concept', 'product_id', 'SDE Proof Of Concept'),
     }
 
     # US-43: Remove the default_get that set value on Product Creator field. By removing the required = True value
 
=== modified file 'bin/addons/product_attributes/product_attributes_view.xml'
--- bin/addons/product_attributes/product_attributes_view.xml	2018-02-28 10:36:26 +0000
+++ bin/addons/product_attributes/product_attributes_view.xml	2018-10-11 10:12:13 +0000
@@ -158,6 +158,13 @@
                                 <field name="closed_article" colspan="2"/>
                                 <field name="manufacturer_ref" attrs="{'invisible': [('closed_article', '=', 'no')]}" />
                                 <field name="manufacturer_txt" attrs="{'invisible': [('closed_article', '=', 'no')]}" />
+                                <separator string="SDE Proof Of Concept" colspan="2"/>
+                                <field name="sde_proof_of_concept" nolabel="1" mode="tree" colspan="2">
+                                    <tree editable="top">
+                                        <field name="gtin" />
+                                        <field name="packaging" />
+                                    </tree>
+                                </field>
                             </group>
                             <group colspan="2" col="2">
                                 <separator string="Form" colspan="2" />