From 621dd7ba64f155c40de009f65d935accc04b35ae Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Thu, 6 Dec 2012 15:44:45 +0530
Subject: [PATCH] [REMOVE] remove weight net uom and improve order sequence for
 stock.move.

bzr revid: nco@tinyerp.com-20121206101445-zntwb2tk3kl40rs4
---
 addons/delivery/delivery_view.xml | 15 +++------------
 addons/delivery/stock.py          |  4 ----
 addons/stock/stock.py             |  2 +-
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index f52b6a18d6f..ff19659a830 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -243,17 +243,12 @@
             <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
                 <field name="company_id" position="before">
-                   <label for="weight" string="Weight"/>
+                    <label for="weight" string="Weight"/>
                     <div>
                         <field name="weight" class="oe_inline"/>
                         <field name="weight_uom_id" nolabel="1" class="oe_inline"/>
                     </div>
-                     <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 name="weight_net"  groups="base.group_no_one" class="oe_inline"/>
                 </field>
             </field>
         </record>
@@ -293,11 +288,7 @@
                         <field name="weight" class="oe_inline"/>
                         <field name="weight_uom_id" nolabel="1" class="oe_inline"/>
                     </div>
-                    <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 name="weight_net" groups="base.group_no_one" class="oe_inline"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/delivery/stock.py b/addons/delivery/stock.py
index 0116ea0d9c9..ffd4398e0dd 100644
--- a/addons/delivery/stock.py
+++ b/addons/delivery/stock.py
@@ -67,7 +67,6 @@ 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):
@@ -137,7 +136,6 @@ 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()
@@ -177,11 +175,9 @@ class stock_move(osv.osv):
                  'stock.move': (lambda self, cr, uid, ids, c=None: ids, ['product_id', 'product_qty', 'product_uom'], 20),
                  }),
         '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",),
         }
     _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_move()
 
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 684c984dfa2..87a024d533a 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1606,7 +1606,7 @@ class stock_move(osv.osv):
 
     _name = "stock.move"
     _description = "Stock Move"
-    _order = 'id desc, picking_id'
+    _order = 'date_expected desc, id'
     _log_create = False
 
     def action_partial_move(self, cr, uid, ids, context=None):