[IMP] Add ul for palletization on packaging and put dimensions on ul

bzr revid: jco@openerp.com-20140320121335-cnjfecg115t8fa7t

diff --git a/addons/product/product.py b/addons/product/product.py
index 9169ec9..2d568e0 100644 (file)
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -219,6 +219,10 @@ class product_ul(osv.osv):
     _columns = {
         'name' : fields.char('Name', select=True, required=True, translate=True),
         'type' : fields.selection([('unit','Unit'),('pack','Pack'),('box', 'Box'), ('pallet', 'Pallet')], 'Type', required=True),
+        'height': fields.float('Height', help='The height of the package'),
+        'width': fields.float('Width', help='The width of the package'),
+        'length': fields.float('Length', help='The length of the package'),
+        'weight': fields.float('Empty Package Weight'),
     }
 
 
@@ -937,6 +941,7 @@ class product_packaging(osv.osv):
             help="The total number of products you can put by pallet or box."),
         'ul' : fields.many2one('product.ul', 'Type of Package', required=True),
         'ul_qty' : fields.integer('Package by layer', help='The number of packages by layer'),
+        'ul_container': fields.many2one('product.ul', 'Container Type of Package'),
         'rows' : fields.integer('Number of Layers', required=True,
             help='The number of layers on a pallet or box'),
         'product_id' : fields.many2one('product.product', 'Product', select=1, ondelete='cascade', required=True),
@@ -944,10 +949,6 @@ class product_packaging(osv.osv):
         'code' : fields.char('Code', help="The code of the transport unit."),
         'weight': fields.float('Total Package Weight',
             help='The weight of a full package, pallet or box.'),
-        'weight_ul': fields.float('Empty Package Weight'),
-        'height': fields.float('Height', help='The height of the package'),
-        'width': fields.float('Width', help='The width of the package'),
-        'length': fields.float('Length', help='The length of the package'),
     }
 
 

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 756fa66..ef5c2cd 100644 (file)
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -180,15 +180,11 @@
                                             <newline/>
                                             <field name="qty"/>
                                             <field name="ul"/>
-                                            <field name="weight_ul"/>
                                             <separator colspan="4" string="Palletization"/>
+                                            <field name="ul_container"/>
                                             <field name="ul_qty"/>
                                             <field name="rows"/>
                                             <field name="weight"/>
-                                            <separator colspan="4" string="Pallet Dimension"/>
-                                            <field name="height"/>
-                                            <field name="width"/>
-                                            <field name="length"/>
                                         </group>
                                         <separator colspan="4" string="Description"/>
                                         <field name="name"/>
@@ -585,6 +581,12 @@
                         <field name="name"/>
                         <field name="type"/>
                     </group>
+                    <group>
+                        <field name="height"/>
+                        <field name="width"/>
+                        <field name="length"/>
+                        <field name="weight"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -626,6 +628,7 @@
                     <field name="ean"/>
                     <field name="qty"/>
                     <field name="ul"/>
+                    <field name="ul_container"/>
                 </tree>
             </field>
         </record>
@@ -643,15 +646,11 @@
                         <newline/>
                         <field name="qty"/>
                         <field name="ul"/>
-                        <field name="weight_ul"/>
                         <separator colspan="4" string="Palletization"/>
+                        <field name="ul_container"/>
                         <field name="ul_qty"/>
                         <field name="rows"/>
                         <field name="weight"/>
-                        <separator colspan="4" string="Pallet Dimension"/>
-                        <field name="height"/>
-                        <field name="width"/>
-                        <field name="length"/>
                         <separator colspan="4" string="Other Info"/>
                         <field colspan="4" name="name"/>
                     </group>