[MERGE] MErged from main branch

[odoo/odoo.git] / addons / mrp / test / mrp_phantom_bom.yml

diff --git a/addons/mrp/test/mrp_phantom_bom.yml b/addons/mrp/test/mrp_phantom_bom.yml
index df4ade1..5475d54 100644 (file)
--- a/addons/mrp/test/mrp_phantom_bom.yml
+++ b/addons/mrp/test/mrp_phantom_bom.yml
@@ -2,7 +2,7 @@
   In order to test the mrp phantom bom type in OpenERP, I will create products 
   and then I will create Phantom bom structure for those products.
 -
-  I create the products required to produce some orange juices: Oranges, Sugar and Water.
+  I create the products required to produce some orange juices with Oranges, Sugar and Water.
 -
   !record {model: product.uom, id: product_uom_litre0}:
     category_id: product.product_uom_categ_kgm
@@ -129,7 +129,6 @@
     date_planned: '2010-04-16 15:53:36'
     location_dest_id: stock.stock_location_output
     location_src_id: stock.stock_location_stock
-    name: MO/00002
     product_id: product_product_orangejuice0
     product_qty: 100.0
     product_uom: product_uom_litre0
@@ -171,7 +170,7 @@
 -
   !python {model: mrp.procurement}: |
     from tools.translate import _
-    proc_ids = self.search(cr, uid, [('origin','=',':MO/00002')])
+    proc_ids = self.search(cr, uid, [('state','!=','cofirmed')])
     assert proc_ids, _('No Procurements!')
 -
   The scheduler runs.
@@ -196,7 +195,7 @@
   !python {model: purchase.order}: |
     from tools.translate import _
     import netsvc
-    purch_ids = self.search(cr, uid, [('origin','in',['SCHEDULER','OP/00002','OP/00003'])])
+    purch_ids = self.search(cr, uid, [('state','=','draft')])
     assert purch_ids, _('No Purchase Orders were made!')
     wf_service = netsvc.LocalService("workflow")
     for p_id in purch_ids:
@@ -207,7 +206,7 @@
   !python {model: purchase.order}: |
     from tools.translate import _
     import netsvc
-    purch_ids = self.search(cr, uid, [('origin','in',['SCHEDULER','OP/00002','OP/00003']),('state','=','confirmed')])
+    purch_ids = self.search(cr, uid, [('state','=','confirmed')])
     assert purch_ids, _('No Confirmed Purchase Orders found!')
     wf_service = netsvc.LocalService("workflow")
     for p_id in purch_ids:
@@ -217,7 +216,7 @@
 -
   !python {model: stock.picking}: |
     from tools.translate import _
-    pick_ids = self.search(cr, uid, [('origin','in',['PO00001:SCHEDULER','PO00002:SCHEDULER','PO00003:OP/00002','PO00004:OP/00003']),('type','=','in')])
+    pick_ids = self.search(cr, uid, [('type','=','in')])
     assert pick_ids, _('No Incoming Shipments found!')
 -
   I receive both the products. My incoming pickings are done.
@@ -229,6 +228,7 @@
 -
   !python {model: stock.partial.picking}: |
      pick_obj = self.pool.get('stock.picking')
-     picking_ids = pick_obj.search(cr, uid, [('origin','in',['PO00001:SCHEDULER','PO00002:SCHEDULER','PO00003:OP/00002','PO00004:OP/00003']),('type','=','in')])
-     self.do_partial(cr, uid, [1],context={'active_ids': picking_ids})
+     picking_ids = pick_obj.search(cr, uid, [('type','=','in')])
+     self.view_init(cr, uid, ['date','partner_id','address_id'],context={'active_ids': picking_ids})
+     self.do_partial(cr, uid, [1], context={'active_ids': picking_ids})
      
\ No newline at end of file