From 6b3cea185a830e90d189d46bb8378da7f589211a Mon Sep 17 00:00:00 2001 From: "uco (Open ERP)" Date: Thu, 29 Jul 2010 15:14:49 +0530 Subject: [PATCH 01/13] [IMP] mrp: Yaml improved. bzr revid: uco@tinyerp.com-20100729094449-pwwijfucbm9bnax5 --- addons/mrp/test/mrp_phantom_bom.yml | 21 ++++++++++++++++++--- addons/mrp/test/mrp_procurement.yml | 4 ++-- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/addons/mrp/test/mrp_phantom_bom.yml b/addons/mrp/test/mrp_phantom_bom.yml index bd1a5cbdec0..97778408b05 100644 --- a/addons/mrp/test/mrp_phantom_bom.yml +++ b/addons/mrp/test/mrp_phantom_bom.yml @@ -256,7 +256,22 @@ - !python {model: stock.partial.picking}: | pick_obj = self.pool.get('stock.picking') - picking_ids = pick_obj.search(cr, uid, [('type','=','in')]) - self.view_init(cr, uid, ['date'],context={'active_ids': picking_ids}) - self.do_partial(cr, uid, [1], context={'active_ids': picking_ids}) + picking_ids = pick_obj.search(cr, uid, [('address_id.name','=','Tang'),('state','=','assigned')]) + partial = self.browse(cr, uid, 1, context) + partial_datas = { + 'delivery_date': partial.date + } + for pick in pick_obj.browse(cr, uid, picking_ids): + for m in pick.move_lines: + partial_datas['move%s'%(m.id)] = { + 'product_id': m.product_id.id, + 'product_qty': m.product_qty, + 'product_uom': m.product_uom.id + } + if (pick.type == 'in') and (m.product_id.cost_method == 'average'): + partial_datas['move%s'%(m.id)].update({ + 'product_price': m.product_price, + 'product_currency': m.product_currency + }) + pick_obj.do_partial(cr, uid, picking_ids, partial_datas, context=context) diff --git a/addons/mrp/test/mrp_procurement.yml b/addons/mrp/test/mrp_procurement.yml index b86d49cca3a..cf9e5d9cb50 100644 --- a/addons/mrp/test/mrp_procurement.yml +++ b/addons/mrp/test/mrp_procurement.yml @@ -42,7 +42,7 @@ seller_ids: - delay: 1 name: base.res_partner_maxtor - qty: 300.0 + min_qty: 300.0 standard_price: 1.0 supply_method: buy type: product @@ -68,7 +68,7 @@ seller_ids: - delay: 1 name: base.res_partner_asus - qty: 100.0 + min_qty: 100.0 standard_price: 1.0 supply_method: buy type: product From c12b167e50fac935289f5f65bba8324dc5bd1e99 Mon Sep 17 00:00:00 2001 From: "uco (Open ERP)" Date: Thu, 29 Jul 2010 19:13:54 +0530 Subject: [PATCH 02/13] [IMP] stock_planning: Changed icons on button. bzr revid: uco@tinyerp.com-20100729134354-mux7nmn69slrww0w --- .../wizard/stock_planning_create_periods_view.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml index 4d0f9ae6a82..35b55b8f4e7 100644 --- a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml +++ b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml @@ -13,10 +13,11 @@ - -