odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[REMOVE] remove weight net uom and improve order sequence for stock.move. 

bzr revid: nco@tinyerp.com-20121206101445-zntwb2tk3kl40rs4
This commit is contained in:
Nimesh (Open ERP) 2012-12-06 15:44:45 +05:30
parent c4f8c58253
commit 621dd7ba64
3 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
addons/delivery/delivery_view.xml
View File

@ -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>

4
addons/delivery/stock.py
View File

@ -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()

2
addons/stock/stock.py
View File

@ -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):