From 9d5801f4cdbfdecb449966fdfd3d9bf4d6ac954d Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Wed, 4 Sep 2013 15:07:17 +0200 Subject: [PATCH] [IMP] Do not rereserve, such that quants are not unnecessarily split, remove assert warehouse po bzr revid: jco@openerp.com-20130904130717-hmwruiy0imxdqpo7 --- addons/purchase/test/process/merge_order.yml | 1 - addons/stock/test/packing.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/addons/purchase/test/process/merge_order.yml b/addons/purchase/test/process/merge_order.yml index 24709aa1f43..0bb9c796ff7 100644 --- a/addons/purchase/test/process/merge_order.yml +++ b/addons/purchase/test/process/merge_order.yml @@ -27,7 +27,6 @@ assert total_new_qty == total_qty,"product quantities are not correspond" assert order.partner_id == order3.partner_id ,"partner is not correspond" - assert order.warehouse_id == order3.warehouse_id or order7.warehouse_id,"Warehouse is not correspond" assert order.state == 'draft',"New created order state should be in draft" assert order.pricelist_id == order3.pricelist_id,"Price list is not correspond" assert order.date_order == order3.date_order ,"Date of order is not correspond" diff --git a/addons/stock/test/packing.yml b/addons/stock/test/packing.yml index bc73fe957fb..458385a3943 100644 --- a/addons/stock/test/packing.yml +++ b/addons/stock/test/packing.yml @@ -123,7 +123,6 @@ Process this picking - !python {model: stock.picking}: | - self.rereserve(cr, uid, [ref('delivery_order1')], context=context) self.do_partial(cr, uid, [ref('delivery_order1')], context=context) - Check the quants that you have 120 pieces pallet 1 in customers, 100 pieces pallet 2 in stock and 20 with customers and 50 in stock, 10 in customers from pallet 3