From 90a4b942e36c1dac8ddacd372f979baf398ac17c Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Fri, 6 Aug 2010 15:06:30 +0530 Subject: [PATCH] -[IMP] purchase_requisition: Imrpove the yml bzr revid: sbh@tinyerp.com-20100806093630-rec32bhbszwxmtx1 --- .../test/purchase_requisition.yml | 10 +++++----- .../test/purchase_requisition_exclusive.yml | 19 ++++++++++--------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/addons/purchase_requisition/test/purchase_requisition.yml b/addons/purchase_requisition/test/purchase_requisition.yml index ce5f9635574..1564abf638f 100644 --- a/addons/purchase_requisition/test/purchase_requisition.yml +++ b/addons/purchase_requisition/test/purchase_requisition.yml @@ -17,6 +17,7 @@ - delay: 1 name: base.res_partner_asus qty: 5.0 + min_qty: 1.0 supply_method: buy type: product uom_id: product.product_uom_unit @@ -145,12 +146,12 @@ pick=self.browse(cr,uid,picking_id[0]) move =pick.move_lines[0] partial_datas = { - 'partner_id': 2, - 'address_id': 6, + 'partner_id': pick.address_id.partner_id.id, + 'address_id': pick.address_id.id, 'delivery_date' : time.strftime('%Y-%m-%d'), } partial_datas['move%s'%(move.id)]= { - 'product_id': move.product_id, + 'product_id': move.product_id.id, 'product_qty': move.product_qty, 'product_uom': move.product_uom.id, } @@ -171,7 +172,7 @@ 'delivery_date' : time.strftime('%Y-%m-%d'), } partial_datas['move%s'%(move.id)]= { - 'product_id': move.product_id, + 'product_id': move.product_id.id, 'product_qty': move.product_qty, 'product_uom': move.product_uom.id, } @@ -184,6 +185,5 @@ picking_id = self.search(cr, uid, [('origin','=','TEST/TENDER/0001'),('type','=','out')]) if picking_id: pick=self.browse(cr,uid,picking_id[0]) - print pick.state assert(pick.state == 'assigned'), _('Picking is not in available state') diff --git a/addons/purchase_requisition/test/purchase_requisition_exclusive.yml b/addons/purchase_requisition/test/purchase_requisition_exclusive.yml index 32c47836f23..7e798e59b35 100644 --- a/addons/purchase_requisition/test/purchase_requisition_exclusive.yml +++ b/addons/purchase_requisition/test/purchase_requisition_exclusive.yml @@ -17,6 +17,7 @@ - delay: 1 name: base.res_partner_asus qty: 5.0 + min_qty: 1.0 supply_method: buy type: product uom_id: product.product_uom_unit @@ -91,15 +92,15 @@ I confirm and validate the Request for Quotation of ASUStek. - !python {model: purchase.order}: | - partner_id=self.pool.get('res.partner').search(cr,uid,[('name','=','ASUStek')])[0] - req_obj = self.pool.get('purchase.requisition') - ids =req_obj.search(cr, uid, [('origin','=','Laptop ACER1')]) - purchase_id= self.search(cr, uid, [('partner_id','=',partner_id),('requisition_id','in',ids)])[0] - import netsvc - wf_service = netsvc.LocalService("workflow") - if purchase_id: - wf_service.trg_validate(uid, 'purchase.order',purchase_id,'purchase_confirm', cr) - wf_service.trg_validate(uid, 'purchase.order',purchase_id,'purchase_approve', cr) + partner_id=self.pool.get('res.partner').search(cr,uid,[('name','=','ASUStek')])[0] + req_obj = self.pool.get('purchase.requisition') + ids =req_obj.search(cr, uid, [('origin','=','Laptop ACER1')]) + purchase_id= self.search(cr, uid, [('partner_id','=',partner_id),('requisition_id','in',ids)])[0] + import netsvc + wf_service = netsvc.LocalService("workflow") + if purchase_id: + wf_service.trg_validate(uid, 'purchase.order',purchase_id,'purchase_confirm', cr) + wf_service.trg_validate(uid, 'purchase.order',purchase_id,'purchase_approve', cr) - I check that Request for Quotation of DistriPC is cancelled. -