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

[ADD] added value for the field product_uom_qty 

bzr revid: bde@tinyerp.com-20130806130939-44o690pv6c31d9dj
This commit is contained in:
Bharat R. Devnani (OpenERP) 2013-08-06 18:39:39 +05:30
parent 11d431010b
commit a513fcceee
7 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/mrp/wizard/change_production_qty.py
View File

@ -52,7 +52,7 @@ class change_production_qty(osv.osv_memory):
def _update_product_to_produce(self, cr, uid, prod, qty, context=None): def _update_product_to_produce(self, cr, uid, prod, qty, context=None):
move_lines_obj = self.pool.get('stock.move') move_lines_obj = self.pool.get('stock.move')
for m in prod.move_created_ids: 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_qty': qty, 'product_uom_qty': qty})
def change_prod_qty(self, cr, uid, ids, context=None): 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) product_move = dict((mv.product_id.id, mv.id) for mv in prod.picking_id.move_lines)
for r in product_details: for r in product_details:
if r['product_id'] == move.product_id.id: 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_qty': r['product_qty'], 'product_uom_qty': r['product_qty']})
if r['product_id'] in product_move: 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_qty': r['product_qty'], 'product_uom_qty': r['product_qty']})
if prod.move_prod_id: 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_qty' : wiz_qty.product_qty, 'product_uom_qty': r['product_qty']})
self._update_product_to_produce(cr, uid, prod, wiz_qty.product_qty, context=context) self._update_product_to_produce(cr, uid, prod, wiz_qty.product_qty, context=context)
return {} return {}

4
addons/mrp_byproduct/mrp_byproduct.py
View File

@ -148,12 +148,12 @@ class change_production_qty(osv.osv_memory):
prod_obj = self.pool.get('mrp.production') prod_obj = self.pool.get('mrp.production')
for m in prod.move_created_ids: for m in prod.move_created_ids:
if m.product_id.id == prod.product_id.id: 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_qty': qty, 'product_uom_qty': qty})
else: else:
for sub_product_line in prod.bom_id.sub_products: for sub_product_line in prod.bom_id.sub_products:
if sub_product_line.product_id.id == m.product_id.id: 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) 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 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_qty': subproduct_qty, 'product_uom_qty': subproduct_qty})
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/mrp_repair/mrp_repair.py
View File

@ -509,6 +509,7 @@ class mrp_repair(osv.osv):
'name': move.name, 'name': move.name,
'product_id': move.product_id.id, 'product_id': move.product_id.id,
'product_qty': move.product_uom_qty, 'product_qty': move.product_uom_qty,
'product_uom_qty': move.product_uom_qty,
'product_uom': move.product_uom.id, 'product_uom': move.product_uom.id,
'partner_id': repair.address_id and repair.address_id.id or False, 'partner_id': repair.address_id and repair.address_id.id or False,
'location_id': move.location_id.id, 'location_id': move.location_id.id,

1
addons/point_of_sale/point_of_sale.py
View File

@ -724,6 +724,7 @@ class pos_order(osv.osv):
'product_id': line.product_id.id, 'product_id': line.product_id.id,
'product_uos_qty': abs(line.qty), 'product_uos_qty': abs(line.qty),
'product_qty': abs(line.qty), 'product_qty': abs(line.qty),
'product_uom_qty': abs(line.qty),
'tracking_id': False, 'tracking_id': False,
'state': 'draft', 'state': 'draft',
'location_id': location_id, 'location_id': location_id,

5
addons/point_of_sale/wizard/pos_return.py
View File

@ -133,7 +133,8 @@ class pos_return(osv.osv_memory):
qty = record.quantity qty = record.quantity
amount += qty * line.price_unit amount += qty * line.price_unit
stock_move_obj.create(cr, uid, { stock_move_obj.create(cr, uid, {
'product_qty': qty , 'product_qty': qty,
'product_uom_qty': qty,
'product_uos_qty': uom_obj._compute_qty(cr, uid, qty ,line.product_id.uom_id.id), 'product_uos_qty': uom_obj._compute_qty(cr, uid, qty ,line.product_id.uom_id.id),
'picking_id': new_picking, 'picking_id': new_picking,
'product_uom': line.product_id.uom_id.id, 'product_uom': line.product_id.uom_id.id,
@ -218,6 +219,7 @@ class add_product(osv.osv_memory):
}) })
stock_move_obj.create(cr, uid, { stock_move_obj.create(cr, uid, {
'product_qty': qty, '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), 'product_uos_qty': uom_obj._compute_qty(cr, uid, prod_id.uom_id.id, qty, prod_id.uom_id.id),
'picking_id':new_picking, 'picking_id':new_picking,
'product_uom':prod_id.uom_id.id, 'product_uom':prod_id.uom_id.id,
@ -292,6 +294,7 @@ class add_product(osv.osv_memory):
qty = line.qty qty = line.qty
stock_move_obj.create(cr, uid, { stock_move_obj.create(cr, uid, {
'product_qty': qty, 'product_qty': qty,
'product_uom_qty': qty,
'product_uos_qty': uom_obj._compute_qty(cr, uid, qty, line.product_id.uom_id.id), 'product_uos_qty': uom_obj._compute_qty(cr, uid, qty, line.product_id.uom_id.id),
'picking_id':new_picking, 'picking_id':new_picking,
'product_uom':line.product_id.uom_id.id, 'product_uom':line.product_id.uom_id.id,

1
addons/stock/stock.py
View File

@ -991,6 +991,7 @@ class stock_move(osv.osv):
'state': 'draft', 'state': 'draft',
'priority': '1', 'priority': '1',
'product_qty': 1.0, 'product_qty': 1.0,
'product_uom_qty': 1.0,
'scrapped': False, 'scrapped': False,
'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), '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), 'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.move', context=c),

1
addons/stock/wizard/stock_return_picking.py
View File

@ -195,6 +195,7 @@ class stock_return_picking(osv.osv_memory):
returned_lines += 1 returned_lines += 1
new_move=move_obj.copy(cr, uid, move.id, { new_move=move_obj.copy(cr, uid, move.id, {
'product_qty': new_qty, 'product_qty': new_qty,
'product_uom_qty': new_qty,
'product_uos_qty': uom_obj._compute_qty(cr, uid, move.product_uom.id, new_qty, move.product_uos.id), 'product_uos_qty': uom_obj._compute_qty(cr, uid, move.product_uom.id, new_qty, move.product_uos.id),
'picking_id': new_picking, 'picking_id': new_picking,
'state': 'draft', 'state': 'draft',