[MERGE] fix: setting product_uom_qty instead of product_qty
bzr revid: qdp-launchpad@openerp.com-20130806155211-jjd6q1hocjhgccaf
This commit is contained in:
commit
a992a789e7
|
@ -52,7 +52,7 @@ class change_production_qty(osv.osv_memory):
|
|||
def _update_product_to_produce(self, cr, uid, prod, qty, context=None):
|
||||
move_lines_obj = self.pool.get('stock.move')
|
||||
for m in prod.move_created_ids:
|
||||
move_lines_obj.write(cr, uid, [m.id], {'product_qty': qty})
|
||||
move_lines_obj.write(cr, uid, [m.id], {'product_uom_qty': qty})
|
||||
|
||||
def change_prod_qty(self, cr, uid, ids, context=None):
|
||||
"""
|
||||
|
@ -93,11 +93,11 @@ class change_production_qty(osv.osv_memory):
|
|||
product_move = dict((mv.product_id.id, mv.id) for mv in prod.picking_id.move_lines)
|
||||
for r in product_details:
|
||||
if r['product_id'] == move.product_id.id:
|
||||
move_obj.write(cr, uid, [move.id], {'product_qty': r['product_qty']})
|
||||
move_obj.write(cr, uid, [move.id], {'product_uom_qty': r['product_qty']})
|
||||
if r['product_id'] in product_move:
|
||||
move_obj.write(cr, uid, [product_move[r['product_id']]], {'product_qty': r['product_qty']})
|
||||
move_obj.write(cr, uid, [product_move[r['product_id']]], {'product_uom_qty': r['product_qty']})
|
||||
if prod.move_prod_id:
|
||||
move_obj.write(cr, uid, [prod.move_prod_id.id], {'product_qty' : wiz_qty.product_qty})
|
||||
move_obj.write(cr, uid, [prod.move_prod_id.id], {'product_uom_qty' : wiz_qty.product_qty})
|
||||
self._update_product_to_produce(cr, uid, prod, wiz_qty.product_qty, context=context)
|
||||
return {}
|
||||
|
||||
|
|
|
@ -148,12 +148,12 @@ class change_production_qty(osv.osv_memory):
|
|||
prod_obj = self.pool.get('mrp.production')
|
||||
for m in prod.move_created_ids:
|
||||
if m.product_id.id == prod.product_id.id:
|
||||
move_lines_obj.write(cr, uid, [m.id], {'product_qty': qty})
|
||||
move_lines_obj.write(cr, uid, [m.id], {'product_uom_qty': qty})
|
||||
else:
|
||||
for sub_product_line in prod.bom_id.sub_products:
|
||||
if sub_product_line.product_id.id == m.product_id.id:
|
||||
factor = prod_obj._get_subproduct_factor(cr, uid, prod.id, m.id, context=context)
|
||||
subproduct_qty = sub_product_line.subproduct_type == 'variable' and qty * factor or sub_product_line.product_qty
|
||||
move_lines_obj.write(cr, uid, [m.id], {'product_qty': subproduct_qty})
|
||||
move_lines_obj.write(cr, uid, [m.id], {'product_uom_qty': subproduct_qty})
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
@ -508,7 +508,7 @@ class mrp_repair(osv.osv):
|
|||
move_id = move_obj.create(cr, uid, {
|
||||
'name': move.name,
|
||||
'product_id': move.product_id.id,
|
||||
'product_qty': move.product_uom_qty,
|
||||
'product_uom_qty': move.product_uom_qty,
|
||||
'product_uom': move.product_uom.id,
|
||||
'partner_id': repair.address_id and repair.address_id.id or False,
|
||||
'location_id': move.location_id.id,
|
||||
|
|
|
@ -723,7 +723,7 @@ class pos_order(osv.osv):
|
|||
'picking_id': picking_id,
|
||||
'product_id': line.product_id.id,
|
||||
'product_uos_qty': abs(line.qty),
|
||||
'product_qty': abs(line.qty),
|
||||
'product_uom_qty': abs(line.qty),
|
||||
'tracking_id': False,
|
||||
'state': 'draft',
|
||||
'location_id': location_id,
|
||||
|
|
|
@ -133,7 +133,7 @@ class pos_return(osv.osv_memory):
|
|||
qty = record.quantity
|
||||
amount += qty * line.price_unit
|
||||
stock_move_obj.create(cr, uid, {
|
||||
'product_qty': qty ,
|
||||
'product_uom_qty': qty,
|
||||
'product_uos_qty': uom_obj._compute_qty(cr, uid, qty ,line.product_id.uom_id.id),
|
||||
'picking_id': new_picking,
|
||||
'product_uom': line.product_id.uom_id.id,
|
||||
|
@ -217,7 +217,7 @@ class add_product(osv.osv_memory):
|
|||
'date':date_cur
|
||||
})
|
||||
stock_move_obj.create(cr, uid, {
|
||||
'product_qty': qty,
|
||||
'product_uom_qty': qty,
|
||||
'product_uos_qty': uom_obj._compute_qty(cr, uid, prod_id.uom_id.id, qty, prod_id.uom_id.id),
|
||||
'picking_id':new_picking,
|
||||
'product_uom':prod_id.uom_id.id,
|
||||
|
@ -291,7 +291,7 @@ class add_product(osv.osv_memory):
|
|||
else:
|
||||
qty = line.qty
|
||||
stock_move_obj.create(cr, uid, {
|
||||
'product_qty': qty,
|
||||
'product_uom_qty': qty,
|
||||
'product_uos_qty': uom_obj._compute_qty(cr, uid, qty, line.product_id.uom_id.id),
|
||||
'picking_id':new_picking,
|
||||
'product_uom':line.product_id.uom_id.id,
|
||||
|
|
|
@ -1014,6 +1014,7 @@ class stock_move(osv.osv):
|
|||
'state': 'draft',
|
||||
'priority': '1',
|
||||
'product_qty': 1.0,
|
||||
'product_uom_qty': 1.0,
|
||||
'scrapped': False,
|
||||
'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
|
||||
'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.move', context=c),
|
||||
|
|
Loading…
Reference in New Issue