From b90834e0e7ad5787f2370cfdfc5d8176b1598432 Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Wed, 5 Dec 2012 15:25:33 +0530
Subject: [PATCH] [IMP] add kg in to net weight improve pickaging field

bzr revid: shp@tinyerp.com-20121205095533-8a41to3zm6p8830q
---
 addons/delivery/delivery_view.xml |  7 +++-
 addons/delivery/stock.py          |  2 ++
 addons/product/product_view.xml   | 56 +++++++++++--------------------
 3 files changed, 28 insertions(+), 37 deletions(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index c79a8be06fe..f52b6a18d6f 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -248,7 +248,12 @@
                         <field name="weight" class="oe_inline"/>
                         <field name="weight_uom_id" nolabel="1" class="oe_inline"/>
                     </div>
-                         <field name="weight_net" groups="base.group_no_one"/>
+                     <label for="weight_net" string="Net Weight"/>
+                    <div>
+                         <field name="weight_net"  groups="base.group_no_one" class="oe_inline"/>
+                         <field name="weight_net_uom_id" nolabel="1" class="oe_inline"/>
+                     </div>
+                       
                 </field>
             </field>
         </record>
diff --git a/addons/delivery/stock.py b/addons/delivery/stock.py
index ae42a440f83..0116ea0d9c9 100644
--- a/addons/delivery/stock.py
+++ b/addons/delivery/stock.py
@@ -67,6 +67,7 @@ class stock_picking(osv.osv):
         'carrier_tracking_ref': fields.char('Carrier Tracking Ref', size=32),
         'number_of_packages': fields.integer('Number of Packages'),
         'weight_uom_id': fields.many2one('product.uom', 'Unit of Measure', required=True,readonly="1",help="Unit of Measure (Unit of Measure) is the unit of measurement for Weight",),
+        'weight_net_uom_id':fields.many2one('product.uom', 'Unit of Measure', required=True,readonly="1",help="Unit of Measure (Unit of Measure) is the unit of measurement for Weight",),
         }
 
     def _prepare_shipping_invoice_line(self, cr, uid, picking, invoice, context=None):
@@ -136,6 +137,7 @@ class stock_picking(osv.osv):
 
     _defaults = {
         'weight_uom_id': lambda self,cr,uid,c: self.pool.get('product.uom').search(cr, uid, [('name', '=', _('kg'))], context=c)[0],
+        'weight_net_uom_id':lambda self,cr,uid,c: self.pool.get('product.uom').search(cr, uid, [('name', '=', _('kg'))], context=c)[0],
     }
 
 stock_picking()
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 3822cf12eab..f1554f08346 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -547,42 +547,26 @@
             <field name="model">product.packaging</field>
             <field name="arch" type="xml">
                 <form string="Packaging" version="7.0">
-                    <group col="6">
-                         <field name="product_id"/>
-                         <newline/>
-                         <field name="ean"/>
-                         <newline/>
-                         <field name="qty"/>
-                         <field name="ul"/>
-                         <newline/>
-                         <field name="weight_ul"/>
-                         <newline/>
-                         <separator colspan="6" string="Palletization"/>
-                         <field name="ul_qty"/>
-                         <field name="rows"/>
-                         <newline/>
-                         <field name="weight"/>
-                         <separator colspan="6" string="Pallet Dimension"/>
-                         <label for="height" string="Height"/>
-                         <div>
-                            <field name="height" class="oe_inline"/>
-                            <field name="height_uom_id" nolabel="1" class="oe_inline"/>
-                         </div>
-                          <label for="width" string="Width"/>
-                         <div>
-                            <field name="width" class="oe_inline"/>
-                            <field name="width_uom_id" nolabel="1" class="oe_inline"/>
-                         </div>
-                         <newline/>
-                         <label for="length" string="Length"/>
-                         <div>
-                            <field name="length" class="oe_inline"/>
-                            <field name="length_uom_id" nolabel="1" class="oe_inline"/>
-                         </div>
-                         <newline/>
-                         <separator colspan="6" string="Other Info"/>
-                         <field colspan="4" name="name"/>
-                     </group>
+                    <group col="4">
+                        <field name="product_id"/>
+                        <newline/>
+                        <field name="ean"/>
+                        <field name="sequence" invisible="1"/>
+                        <newline/>
+                        <field name="qty"/>
+                        <field name="ul"/>
+                        <field name="weight_ul"/>
+                        <separator colspan="4" string="Palletization"/>
+                        <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>
                 </form>
             </field>
         </record>