summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBharat R. Devnani (OpenERP) <bde@tinyerp.com>2013-08-06 18:39:39 +0530
committerBharat R. Devnani (OpenERP) <bde@tinyerp.com>2013-08-06 18:39:39 +0530
commita513fcceee545f75b32fe515ea28bfcc693e7d19 (patch)
treec76dc5d6bc96df1c22ca341cf2901790c7ac0e7f
parent11d431010bdd529e8bce3b1fe8ef4ecf2208d9a5 (diff)
[ADD] added value for the field product_uom_qty
bzr revid: bde@tinyerp.com-20130806130939-44o690pv6c31d9dj
-rw-r--r--addons/mrp/wizard/change_production_qty.py8
-rw-r--r--addons/mrp_byproduct/mrp_byproduct.py4
-rw-r--r--addons/mrp_repair/mrp_repair.py1
-rw-r--r--addons/point_of_sale/point_of_sale.py1
-rw-r--r--addons/point_of_sale/wizard/pos_return.py5
-rw-r--r--addons/stock/stock.py1
-rw-r--r--addons/stock/wizard/stock_return_picking.py1
7 files changed, 14 insertions, 7 deletions
diff --git a/addons/mrp/wizard/change_production_qty.py b/addons/mrp/wizard/change_production_qty.py
index 41b6022a178..f31cbd61124 100644
--- a/addons/mrp/wizard/change_production_qty.py
+++ b/addons/mrp/wizard/change_production_qty.py
@@ -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_qty': qty, '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_qty': r['product_qty'], '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_qty': r['product_qty'], '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_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)
return {}
diff --git a/addons/mrp_byproduct/mrp_byproduct.py b/addons/mrp_byproduct/mrp_byproduct.py
index 9e4a8cb5c8b..40042c9aae6 100644
--- a/addons/mrp_byproduct/mrp_byproduct.py
+++ b/addons/mrp_byproduct/mrp_byproduct.py
@@ -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_qty': qty, '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_qty': subproduct_qty, 'product_uom_qty': subproduct_qty})
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index b2979350a2f..f7184e1f3fd 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -509,6 +509,7 @@ class mrp_repair(osv.osv):
'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,
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 2bb9b945efd..2a981f9f9e5 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -724,6 +724,7 @@ class pos_order(osv.osv):
'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,
diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py
index 92bb6721f08..0ca7746d1b5 100644
--- a/addons/point_of_sale/wizard/pos_return.py
+++ b/addons/point_of_sale/wizard/pos_return.py
@@ -133,7 +133,8 @@ class pos_return(osv.osv_memory):
qty = record.quantity
amount += qty * line.price_unit
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),
'picking_id': new_picking,
'product_uom': line.product_id.uom_id.id,
@@ -218,6 +219,7 @@ class add_product(osv.osv_memory):
})
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,
@@ -292,6 +294,7 @@ class add_product(osv.osv_memory):
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,
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 08ec525f816..a26a7d84f5b 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -991,6 +991,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),
diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index 1e1961d977d..ed904bfc7c4 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -195,6 +195,7 @@ class stock_return_picking(osv.osv_memory):
returned_lines += 1
new_move=move_obj.copy(cr, uid, move.id, {
'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),
'picking_id': new_picking,
'state': 'draft',