diff --git a/addons/stock/procurement.py b/addons/stock/procurement.py
index 389061ea7ab..09a76607c58 100644
--- a/addons/stock/procurement.py
+++ b/addons/stock/procurement.py
@@ -132,7 +132,7 @@ class procurement_order(osv.osv):
             company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id
             move_obj = self.pool.get('stock.move')
             #Search all confirmed stock_moves and try to assign them
-            confirmed_ids = move_obj.search(cr, uid, [('state', '=', 'confirmed'), ('company_id','=', company.id)], context=context)
+            confirmed_ids = move_obj.search(cr, uid, [('state', 'in', ['confirmed', 'waiting']), ('company_id','=', company.id)], context=context) #Type  = stockable product?
             move_obj.action_assign(cr, uid, confirmed_ids, context=context)
         finally:
             if use_new_cursor:
diff --git a/addons/stock_account/__openerp__.py b/addons/stock_account/__openerp__.py
index a925aa2cc26..c6cfd7c48ee 100644
--- a/addons/stock_account/__openerp__.py
+++ b/addons/stock_account/__openerp__.py
@@ -80,6 +80,7 @@ Dashboard / Reports for Warehouse Management will include:
 #        'report/report_stock_view.xml',
 #        'board_warehouse_view.xml',
 #        'res_config_view.xml',
+        'valuationandcostmethod.yml',
     ],
     'test': [
 #        'test/inventory.yml',
diff --git a/addons/stock_account/valuationandcostmethod.yml b/addons/stock_account/valuationandcostmethod.yml
new file mode 100644
index 00000000000..dcc5f934495
--- /dev/null
+++ b/addons/stock_account/valuationandcostmethod.yml
@@ -0,0 +1,6 @@
+- 
+  Write on all products valuation and cost method (temporary patch for default value problems for properties in demo data)
+- 
+  !python {model: product.product}: |
+    prod_ids = self.search(cr, uid, [])
+    self.write(cr, uid, prod_ids, {'cost_method':'real', 'valuation':'manual_periodic'})