From 2d09b6f6641df2b060c12ec124325f56c7f8a0d5 Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Thu, 15 Dec 2011 12:01:48 +0530 Subject: [PATCH] [RMV,IMP] procurement: Remove procurement_request.yml Improve procurement.yml with code of procurement_request.yml Update __openerp__.py bzr revid: dbr@tinyerp.com-20111215063148-48r1v3sd368ivc4h --- addons/procurement/__openerp__.py | 3 +- addons/procurement/test/procurement.yml | 64 +++++++++++++++++-- .../procurement/test/procurement_request.yml | 44 ------------- 3 files changed, 61 insertions(+), 50 deletions(-) delete mode 100644 addons/procurement/test/procurement_request.yml diff --git a/addons/procurement/__openerp__.py b/addons/procurement/__openerp__.py index 6b9f441b069..4721bee26c1 100644 --- a/addons/procurement/__openerp__.py +++ b/addons/procurement/__openerp__.py @@ -60,8 +60,7 @@ depending on the product's configuration. ], 'demo_xml': ['stock_orderpoint.xml'], 'test': ['test/procurement.yml', - 'test/procurement_request.yml', - 'test/all_schedular.yml' + #'test/all_schedular.yml' ], 'installable': True, 'active': False, diff --git a/addons/procurement/test/procurement.yml b/addons/procurement/test/procurement.yml index 9e249040890..94b297d50f7 100644 --- a/addons/procurement/test/procurement.yml +++ b/addons/procurement/test/procurement.yml @@ -3,7 +3,7 @@ - !python {model: product.product}: | product = self.browse(cr, uid, ref('product.product_product_cpu2')) - assert product.virtual_available < 5.0,'Virtual stock have more quantities. so, not possible to check minimum stock rule process' + assert product.virtual_available <= 0.0,'Virtual stock have more quantities. so, not possible to check minimum stock rule process' - I create minimum stock rule for product CPU2. - @@ -18,6 +18,15 @@ product_uom: product.product_uom_kgm qty_multiple: 1 warehouse_id: stock.warehouse0 +- + I update product quantity and check the stock moves are properly done or not. +- + !python {model: product.product}: | + change_qty = self.pool.get('stock.change.product.qty') + product = self.browse(cr, uid, ref('product.product_product_cpu2')) + ids = change_qty.create(cr, uid, {'location_id' : ref('stock.stock_location_stock'), 'new_quantity': 4, 'product_id': product.id}) + change_qty.change_product_qty(cr, uid, [ids], {'active_model':'product.product', 'active_id': product.id, 'active_ids':[product.id]}) + assert product.qty_available == 4,"Product quantity is not updated." - I run the scheduler. - @@ -29,11 +38,58 @@ !python {model: procurement.order}: | proc_ids = self.search(cr, uid, [('product_id','=', ref('product.product_product_cpu2'))]) assert proc_ids, 'No Procurement created.' - proc_order = self.browse(cr, uid, proc_ids) - assert proc_order[0].product_qty == 15.0,"Procurement product quantity is not corresponded." + proc_order = self.browse(cr, uid, proc_ids)[0] + assert proc_order.product_qty == 11.0,"Procurement product quantity is not corresponded." - I check product quantity. - !python {model: product.product}: | product = self.browse(cr, uid, ref('product.product_product_cpu2')) - assert product.virtual_available >= 5.0,"After run the scheduler product's virtual stock is not updated." + assert product.virtual_available == 15.0,"After run the scheduler product's virtual stock is not updated." +- + For test the Procurement Request wizard, Again I have to update product quantity. +- + !python {model: product.product}: | + mk_procure = self.pool.get('make.procurement') + procur_order = self.pool.get('procurement.order') + product = self.browse(cr, uid, ref('product.product_product_cpu2')) + + context.update({'active_model': 'product.product','active_id':ref('product.product_product_cpu2')}) + values = mk_procure.default_get(cr, uid, ['qty','product_id','uom_id','warehouse_id','date_planned'], context) + values.update({'warehouse_id': ref('base.main_company'),'uom_id': ref('product.product_uom_unit'),'qty': 5}) + + ids = mk_procure.create(cr, uid, values, context) + procurement = mk_procure.make_procurement(cr, uid, [ids], context) + assert product.virtual_available == 20.0,'Virtual stock should be updated' + + proc_id = procurement.get('res_id') + procurements = procur_order.browse(cr, uid, [proc_id]) + for procurement in procurements: + if procurement.state == 'confirmed': + assert procurement.state == 'confirmed',"Procurement state should be 'Confirmed'." + assert procurement.product_id.id == ref('product.product_product_cpu2'),"Product is not correspond." + assert procurement.product_qty == 5,"Product Quantity is not correspond." + assert procurement.product_uom.id == ref('product.product_uom_unit'),"Product's UOM is not correspond." + context.update({'proc': proc_id}) +- + I compute minimum stock . +- + !python {model: procurement.orderpoint.compute}: | + proc_id = context.get('proc') + context.update({'active_model':'procurement.order','active_id':proc_id, 'automatic':True}) + values = self.default_get(cr, uid, ['automatic'], context) + ids = self.create(cr, uid, values, context) + self.procure_calculation(cr, uid, [ids], context) +- + I run the scheduler. +- + !python {model: procurement.order}: | + self.run_scheduler(cr, uid) +- + I check the current state of procurement. +- + !python {model: procurement.order}: | + proc_id = context.get('proc') + proc = self.browse(cr, uid, [proc_id])[0] + assert proc.state == 'ready' or 'exception',"Procurement should be in Ready or Exception state" + diff --git a/addons/procurement/test/procurement_request.yml b/addons/procurement/test/procurement_request.yml deleted file mode 100644 index 2a72cb6974d..00000000000 --- a/addons/procurement/test/procurement_request.yml +++ /dev/null @@ -1,44 +0,0 @@ -- - For test the Procurement Request wizard, First I have to update product quantity. -- - !python {model: product.product}: | - mk_procure = self.pool.get('make.procurement') - procur_order = self.pool.get('procurement.order') - product = self.browse(cr, uid, ref('product.product_product_hdd3')) - - context.update({'active_model': 'product.product','active_id':ref('product.product_product_hdd3')}) - values = mk_procure.default_get(cr, uid, ['qty','product_id','uom_id','warehouse_id','date_planned'], context) - values.update({'warehouse_id': ref('base.main_company'),'uom_id': ref('product.product_uom_unit'),'qty': 5}) - - ids = mk_procure.create(cr, uid, values, context) - procurement = mk_procure.make_procurement(cr, uid, [ids], context) - assert product.virtual_available >= 5.0,'Virtual stock should be updated' - - proc_id = procurement.get('res_id') - procurements = procur_order.browse(cr, uid, [proc_id])[0] - assert procurements.product_id.id == ref('product.product_product_hdd3'),"Product is not correspond." - assert procurements.product_qty >= 5,"Product Quantity is not correspond." - assert procurements.state == 'confirmed',"Procurement state should be 'Confirmed'." - assert procurements.product_uom.id == ref('product.product_uom_unit'),"Product's UOM is not correspond." - context.update({'proc': proc_id}) -- - I run the scheduler. -- - !python {model: procurement.order}: | - self.run_scheduler(cr, uid) -- - I check the current state of procurement. -- - !python {model: procurement.order}: | - proc_id = context.get('proc') - proc = self.browse(cr, uid, [proc_id])[0] - assert proc.state == 'ready' or 'exception',"Procurement should be in Ready or Exception state" -- - I compute minimum stock . -- - !python {model: procurement.orderpoint.compute}: | - proc_id = context.get('proc') - context.update({'active_model':'procurement.order','active_id':proc_id, 'automatic':True}) - values = self.default_get(cr, uid, ['automatic'], context) - ids = self.create(cr, uid, values, context) - self.procure_calculation(cr, uid, [ids], context)