diff --git a/addons/purchase/test/average_price.yml b/addons/purchase/test/average_price.yml
index 26f6be622c9..43f2eeeffb2 100644
--- a/addons/purchase/test/average_price.yml
+++ b/addons/purchase/test/average_price.yml
@@ -1,5 +1,5 @@
 -
-  Set a product as using average price. TODO: do we need to fill its standard_price?
+  Set a product as using average price. TODO do we need to fill its standard_price?
 -
   !record {model: product.product, id: product_average_icecream}:
     default_code: AVG
@@ -65,7 +65,7 @@
     
     self.do_partial(cr, uid, [partial_id])
 - 
-  Check the standard price of the product (average icecream). TODO: you could check the qty_available with an assert. TODO: the error message if the assert fails is wrong
+  Check the standard price of the product (average icecream). TOD0 you could check the qty_available with an assert. TODO the error message if the assert fails is wrong
 - 
   !python {model: product.product}: |
     print self.browse(cr, uid, ref("product_average_icecream")).qty_available
@@ -78,7 +78,7 @@
     partial_id = self.create(cr, uid, {}, context={'active_model': 'stock.picking','active_ids': [pick_ids[0].id]})
     self.do_partial(cr, uid, [partial_id])
 - 
-  Check the standard price  TODO: the error message if the assert fails is wrong
+  Check the standard price  TODO the error message if the assert fails is wrong
 - 
   !python {model: product.product}: |
     assert self.browse(cr, uid, ref("product_average_icecream")).standard_price == 75.0, 'Standard price should not change while receiving products!'
@@ -113,7 +113,7 @@
     assert self.browse(cr, uid, ref("product_average_icecream")).standard_price == 75.0, 'Standard price as average price of second reception incorrect!'
     assert self.browse(cr, uid, ref("product_average_icecream")).qty_available == 20.0, 'Pieces were not picked correctly'
 - 
-  Make a new purchase order with 500 g Average Ice Cream at a price of 100 TODO: the unit_price is 1 here
+  Make a new purchase order with 500 g Average Ice Cream at a price of 100 TODO the unit_price is 1 here
 - 
   !record {model: purchase.order, id: purchase_order_average3}:
     partner_id: base.res_partner_3
@@ -137,7 +137,7 @@
     partial_id = self.create(cr, uid, {}, context={'active_model': 'stock.picking','active_ids': [pick_ids[0].id]})
     self.do_partial(cr, uid, [partial_id])
 - 
-  Check price is (75.0*20 + 500) / 20.5 = 97.56097561 TODO: assert the qty available, remove print statements, write some more explicit assertion error messages
+  Check price is (75.0*20 + 500) / 20.5 = 97.56097561 TODO assert the qty available, remove print statements, write some more explicit assertion error messages
 - 
   !python {model: product.product}: |
     print self.browse(cr, uid, ref("product_average_icecream")).qty_available
diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml
index 4f8b2b47831..fd595b5225d 100644
--- a/addons/stock/stock_demo.xml
+++ b/addons/stock/stock_demo.xml
@@ -261,6 +261,7 @@
             <field name="location_id" ref="stock.stock_location_locations_partner"/>
             <field name="usage">transit</field>
             <field name="name">Internal Shippings</field>
+            <field name="company_id">False</field>
         </record>
 
         <record id="stock_warehouse_shop0" model="stock.warehouse">