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 @@
-
+
-
-
-
-
-
-
+
@@ -293,11 +288,7 @@
-
-
-
-
-
+
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):