[IMP]:delivery:indentation
bzr revid: apa@tinyerp.com-20120822113336-d9wl1lhdi25n7jvg
This commit is contained in:
parent
10c19dc350
commit
0e116ffb56
|
@ -343,6 +343,5 @@
|
||||||
</xpath>
|
</xpath>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
</data>
|
</data>
|
||||||
</openerp>
|
</openerp>
|
||||||
|
|
|
@ -210,23 +210,20 @@ class stock_picking_in(osv.osv):
|
||||||
def _cal_weight(self, cr, uid, ids, name, args, context=None):
|
def _cal_weight(self, cr, uid, ids, name, args, context=None):
|
||||||
return self.pool.get('stock.picking')._cal_weight(cr, uid, ids, name, args, context=context)
|
return self.pool.get('stock.picking')._cal_weight(cr, uid, ids, name, args, context=context)
|
||||||
|
|
||||||
|
|
||||||
def _get_picking_line(self, cr, uid, ids, context=None):
|
def _get_picking_line(self, cr, uid, ids, context=None):
|
||||||
return self.pool.get('stock.picking')._get_picking_line(cr, uid, ids, context=context)
|
return self.pool.get('stock.picking')._get_picking_line(cr, uid, ids, context=context)
|
||||||
|
|
||||||
_columns = {
|
_columns = {
|
||||||
|
|
||||||
'weight': fields.function(_cal_weight, type='float', string='Weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_weight',
|
'weight': fields.function(_cal_weight, type='float', string='Weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_weight',
|
||||||
store={
|
store={
|
||||||
'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['move_lines'], 20),
|
'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['move_lines'], 20),
|
||||||
'stock.move': (_get_picking_line, ['product_id','product_qty','product_uom','product_uos_qty'], 20),
|
'stock.move': (_get_picking_line, ['product_id','product_qty','product_uom','product_uos_qty'], 20),
|
||||||
}),
|
}),
|
||||||
'weight_net': fields.function(_cal_weight, type='float', string='Net Weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_weight',
|
'weight_net': fields.function(_cal_weight, type='float', string='Net Weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_weight',
|
||||||
store={
|
store={
|
||||||
'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['move_lines'], 20),
|
'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['move_lines'], 20),
|
||||||
'stock.move': (_get_picking_line, ['product_id','product_qty','product_uom','product_uos_qty'], 20),
|
'stock.move': (_get_picking_line, ['product_id','product_qty','product_uom','product_uos_qty'], 20),
|
||||||
}),
|
}),
|
||||||
|
|
||||||
}
|
}
|
||||||
stock_picking_in()
|
stock_picking_in()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue