diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index c2c5a053eab..6663cefb444 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -1127,15 +1127,9 @@ class procurement_order(osv.osv): } def _run(self, cr, uid, procurement, context=None): - print "dans le run de purchase" - print procurement - print procurement.rule_id if procurement.rule_id: print procurement.rule_id.action - #a = procurement.rule_id and procurement.rule_id.name or 'pas de rule' - #print a if procurement.rule_id and procurement.rule_id.action == 'buy': - print "go pour make_po" #make a purchase order for the procurement return self.make_po(cr, uid, [procurement.id], context=context)[procurement.id] return super(procurement_order, self)._run(cr, uid, procurement, context=context) diff --git a/addons/stock_complex_routes/test/dropship.yml b/addons/stock_complex_routes/test/dropship.yml index 276d6b33bbd..ab2d972af2b 100644 --- a/addons/stock_complex_routes/test/dropship.yml +++ b/addons/stock_complex_routes/test/dropship.yml @@ -54,20 +54,11 @@ from openerp import netsvc sale_record = self.pool.get("sale.order").browse(cr, uid, ref('sale_order_drp_shpng')) procurement_order = self.pool.get("procurement.group").browse(cr, uid, sale_record.procurement_group_id.id).procurement_ids[0] - print 'procurement_order', procurement_order.state - print 'test', procurement_order.purchase_line_id.order_id - print 'test rule', procurement_order.rule_id.action - print 'test route sequence', [(r.name, r.sequence) for r in procurement_order.route_ids] - rule_seq = [] - for route in procurement_order.route_ids: - rule_seq += [(ru.name, ru.route_sequence, ru.sequence) for ru in route.pull_ids] - print '####RULES SEQ####', rule_seq purchase_id = procurement_order.purchase_line_id.order_id.id wf_service = netsvc.LocalService('workflow') wf_service.trg_validate(uid, 'purchase.order', purchase_id, 'purchase_confirm', cr) po_id = self.pool.get('purchase.order').search(cr, uid, [('partner_id', '=', ref('supplier_dropship'))]) - print 'PO_id', po_id, 'purchase_id', purchase_id, self.browse(cr, uid, purchase_id).state assert self.browse(cr, uid, purchase_id).state == 'approved', 'Purchase order should be in the approved state' - Use 'Receive Products' button to immediately view this picking, it should have created a picking with 200 pieces diff --git a/addons/stock_complex_routes/test/procurementexception.yml b/addons/stock_complex_routes/test/procurementexception.yml index 199ad26401e..164fcb6b1b8 100644 --- a/addons/stock_complex_routes/test/procurementexception.yml +++ b/addons/stock_complex_routes/test/procurementexception.yml @@ -7,9 +7,9 @@ standard_price: 15.00 categ_id: product.product_category_1 - - I create a sales order with this product with route crossdock. + I create a sales order with this product with route dropship. - - !record {model: sale.order, id: sale_order_route_crossdock}: + !record {model: sale.order, id: sale_order_route_dropship01}: partner_id: base.res_partner_2 partner_invoice_id: base.res_partner_address_3 partner_shipping_id: base.res_partner_address_3 @@ -18,17 +18,17 @@ order_line: - product_id: product_with_no_seller product_uom_qty: 1 - route_id: stock_location.route_warehouse0_crossdock + route_id: route_drop_shipping - I confirm the sales order. - - !workflow {model: sale.order, ref: sale_order_route_crossdock, action: order_confirm} + !workflow {model: sale.order, ref: sale_order_route_dropship01, action: order_confirm} - I check there is a procurement in exception that has the procurement group of the sales order created before. - !python {model: procurement.order}: | self.run_scheduler(cr, uid) - sale_id = self.pool.get('sale.order').browse(cr, uid, ref("sale_order_route_crossdock")) + sale_id = self.pool.get('sale.order').browse(cr, uid, ref("sale_order_route_dropship01")) proc_id = self.search(cr, uid, [('group_id.name', '=', sale_id.name), ('state', '=', 'exception')]) assert proc_id, 'No Procurement!' - @@ -43,21 +43,21 @@ I run the Procurement. - !python {model: procurement.order}: | - sale_id = self.pool.get('sale.order').browse(cr, uid, ref("sale_order_route_crossdock")) + sale_id = self.pool.get('sale.order').browse(cr, uid, ref("sale_order_route_dropship01")) proc_id = self.search(cr, uid, [('group_id.name', '=', sale_id.name), ('state', '=', 'exception')]) self.run(cr, uid, proc_id) - I check the status changed there is no procurement order in exception any more from that procurement group - !python {model: procurement.order}: | - sale_id = self.pool.get('sale.order').browse(cr, uid, ref("sale_order_route_crossdock")) + sale_id = self.pool.get('sale.order').browse(cr, uid, ref("sale_order_route_dropship01")) proc_id = self.search(cr, uid, [('group_id.name', '=', sale_id.name), ('state', '=', 'exception')]) assert not proc_id, 'Procurement should be in running state' - I check a purchase quotation was created. - !python {model: procurement.order}: | - sale_id = self.pool.get('sale.order').browse(cr, uid, ref("sale_order_route_crossdock")) + sale_id = self.pool.get('sale.order').browse(cr, uid, ref("sale_order_route_dropship01")) proc_ids = self.search(cr, uid, [('group_id.name', '=', sale_id.name)]) purchase_id = [proc.purchase_line_id.order_id for proc in self.browse(cr, uid, proc_ids) if proc.purchase_line_id] - assert purchase_id, 'No Purchase Quotation is created' \ No newline at end of file + assert purchase_id, 'No Purchase Quotation is created'