From ab73a093833386a9f2f09fb0a7d9c77c3946511b Mon Sep 17 00:00:00 2001 From: "Randhir Mayatra (OpenERP)" Date: Thu, 22 Aug 2013 18:37:55 +0530 Subject: [PATCH 1/3] [IMP] chnage the fifo_return_yml bzr revid: rma@tinyerp.com-20130822130755-9kezd43bj39ninxj --- addons/purchase/test/fifo_returns.yml | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/addons/purchase/test/fifo_returns.yml b/addons/purchase/test/fifo_returns.yml index 19fa9a6df38..8d32b6e89c7 100644 --- a/addons/purchase/test/fifo_returns.yml +++ b/addons/purchase/test/fifo_returns.yml @@ -46,10 +46,9 @@ - Process the reception of purchase order 1 - - !python {model: stock.partial.picking}: | - pick_ids = self.pool.get('purchase.order').browse(cr, uid, ref("purchase_order_fiforet1")).picking_ids - partial_id = self.create(cr, uid, {}, context={'active_model': 'stock.picking','active_ids': [pick_ids[0].id]}) - self.do_partial(cr, uid, [partial_id]) + !python {model: stock.picking}: | + order = self.pool.get('purchase.order').browse(cr, uid, ref("purchase_order_fiforet1")).picking_ids[0] + order.do_partial(context=context) - Check the standard price of the product (fifo icecream) - @@ -62,10 +61,9 @@ - Process the reception of purchase order 2 - - !python {model: stock.partial.picking}: | - pick_ids = self.pool.get('purchase.order').browse(cr, uid, ref("purchase_order_fiforet2")).picking_ids - partial_id = self.create(cr, uid, {}, context={'active_model': 'stock.picking','active_ids': [pick_ids[0].id]}) - self.do_partial(cr, uid, [partial_id]) + !python {model: stock.picking}: | + order = self.pool.get('purchase.order').browse(cr, uid, ref("purchase_order_fiforet2")).picking_ids[0] + order.do_partial(context=context) - Return the goods of purchase order 2 - @@ -73,10 +71,6 @@ pick_ids = self.pool.get('purchase.order').browse(cr, uid, ref("purchase_order_fiforet2")).picking_ids return_id = self.create(cr, uid, {}, context={'active_model':'stock.picking', 'active_id': pick_ids[0].id}) res = self.create_returns(cr, uid, [return_id], context={'active_id': pick_ids[0].id}) - return_move_id = self.pool.get("stock.move").search(cr, uid, [('move_returned_from','=', pick_ids[0].move_lines[0].id)]) - movepick_obj = self.pool.get("stock.partial.move") - movepick_id = movepick_obj.create(cr, uid, {}, context={'active_model': 'stock.move', 'active_ids': return_move_id}) - movepick_obj.do_partial(cr, uid, [movepick_id]) - Check the standard price of the product (fifo return icecream) changed to 70.0 - From c14bdb4f4cab1126df08ee3163d23f3ea6420b15 Mon Sep 17 00:00:00 2001 From: "Randhir Mayatra (OpenERP)" Date: Mon, 26 Aug 2013 17:57:12 +0530 Subject: [PATCH 2/3] [IMP] optimize code bzr revid: rma@tinyerp.com-20130826122712-9sh92a7tytw0h26i --- addons/purchase/test/fifo_returns.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/purchase/test/fifo_returns.yml b/addons/purchase/test/fifo_returns.yml index 8d32b6e89c7..2d7cb61e648 100644 --- a/addons/purchase/test/fifo_returns.yml +++ b/addons/purchase/test/fifo_returns.yml @@ -47,8 +47,8 @@ Process the reception of purchase order 1 - !python {model: stock.picking}: | - order = self.pool.get('purchase.order').browse(cr, uid, ref("purchase_order_fiforet1")).picking_ids[0] - order.do_partial(context=context) + picking_id = self.pool.get('purchase.order').browse(cr, uid, ref("purchase_order_fiforet1")).picking_ids[0] + picking_id.do_partial(context=context) - Check the standard price of the product (fifo icecream) - @@ -62,8 +62,8 @@ Process the reception of purchase order 2 - !python {model: stock.picking}: | - order = self.pool.get('purchase.order').browse(cr, uid, ref("purchase_order_fiforet2")).picking_ids[0] - order.do_partial(context=context) + picking_id = self.pool.get('purchase.order').browse(cr, uid, ref("purchase_order_fiforet2")).picking_ids[0] + picking_id.do_partial(context=context) - Return the goods of purchase order 2 - From 4e9895ac1bbd4787d2834b4fe770574176a86f49 Mon Sep 17 00:00:00 2001 From: "Randhir Mayatra (OpenERP)" Date: Mon, 2 Sep 2013 17:44:51 +0530 Subject: [PATCH 3/3] [IMP] improve fifo_return_yml bzr revid: rma@tinyerp.com-20130902121451-2dnh6jb3s8pdgmtl --- addons/purchase/test/fifo_returns.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/addons/purchase/test/fifo_returns.yml b/addons/purchase/test/fifo_returns.yml index 2d7cb61e648..64d837b5585 100644 --- a/addons/purchase/test/fifo_returns.yml +++ b/addons/purchase/test/fifo_returns.yml @@ -47,8 +47,8 @@ Process the reception of purchase order 1 - !python {model: stock.picking}: | - picking_id = self.pool.get('purchase.order').browse(cr, uid, ref("purchase_order_fiforet1")).picking_ids[0] - picking_id.do_partial(context=context) + picking_obj = self.pool.get('purchase.order').browse(cr, uid, ref("purchase_order_fiforet1")).picking_ids[0] + self.do_partial(cr,uid,[picking_obj.id], context=context) - Check the standard price of the product (fifo icecream) - @@ -62,8 +62,8 @@ Process the reception of purchase order 2 - !python {model: stock.picking}: | - picking_id = self.pool.get('purchase.order').browse(cr, uid, ref("purchase_order_fiforet2")).picking_ids[0] - picking_id.do_partial(context=context) + picking_obj = self.pool.get('purchase.order').browse(cr, uid, ref("purchase_order_fiforet2")).picking_ids[0] + self.do_partial(cr,uid,[picking_obj.id], context=context) - Return the goods of purchase order 2 - @@ -71,6 +71,7 @@ pick_ids = self.pool.get('purchase.order').browse(cr, uid, ref("purchase_order_fiforet2")).picking_ids return_id = self.create(cr, uid, {}, context={'active_model':'stock.picking', 'active_id': pick_ids[0].id}) res = self.create_returns(cr, uid, [return_id], context={'active_id': pick_ids[0].id}) + self.pool.get('stock.picking').do_partial(cr, uid, [return_id]) - Check the standard price of the product (fifo return icecream) changed to 70.0 -