From 2788ae87e3510a1798878209c182a8ec5d3e4532 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Tue, 6 Aug 2013 17:48:56 +0200 Subject: [PATCH] [REF] no need to pass product_qty as it's a computed field bzr revid: qdp-launchpad@openerp.com-20130806154856-msym9zsqufyx6nlx --- addons/mrp/wizard/change_production_qty.py | 6 +++--- addons/mrp_byproduct/mrp_byproduct.py | 4 ++-- addons/mrp_repair/mrp_repair.py | 1 - addons/point_of_sale/point_of_sale.py | 1 - addons/point_of_sale/wizard/pos_return.py | 3 --- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/addons/mrp/wizard/change_production_qty.py b/addons/mrp/wizard/change_production_qty.py index f31cbd61124..addedbeb6c6 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, 'product_uom_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,9 +93,9 @@ 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'], 'product_uom_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'], 'product_uom_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, 'product_uom_qty': r['product_qty']}) self._update_product_to_produce(cr, uid, prod, wiz_qty.product_qty, context=context) diff --git a/addons/mrp_byproduct/mrp_byproduct.py b/addons/mrp_byproduct/mrp_byproduct.py index 40042c9aae6..ef923656342 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, 'product_uom_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, 'product_uom_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: diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py index f7184e1f3fd..6e8a56ad7f0 100644 --- a/addons/mrp_repair/mrp_repair.py +++ b/addons/mrp_repair/mrp_repair.py @@ -508,7 +508,6 @@ 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, diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py index 2a981f9f9e5..91a56e329ef 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/addons/point_of_sale/point_of_sale.py @@ -723,7 +723,6 @@ 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', diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py index 0ca7746d1b5..eeba6cab676 100644 --- a/addons/point_of_sale/wizard/pos_return.py +++ b/addons/point_of_sale/wizard/pos_return.py @@ -133,7 +133,6 @@ 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, @@ -218,7 +217,6 @@ 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, @@ -293,7 +291,6 @@ 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,