diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index e1acce198da..3767ed3935f 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -28,5 +28,5 @@
 "access_purchase_order_mrp_worker","purchase.order mrp_worker","purchase.model_purchase_order","mrp.group_mrp_user",1,0,0,0
 "access_purchase_order_line_mrp_worker","purchase.order.line mrp_worker","purchase.model_purchase_order_line","mrp.group_mrp_user",1,0,0,0
 "access_hr_timesheet_group_mrp_worker","hr.timesheet.group mrp_worker","hr.model_hr_timesheet_group","mrp.group_mrp_user",1,0,0,0
-"access_mrp_procurement_stock_worker","mrp.procurement stock_worker","model_mrp_procurement","stock.group_stock_user",1,0,0,0
+"access_mrp_procurement_stock_worker","mrp.procurement stock_worker","model_mrp_procurement","stock.group_stock_user",1,1,1,1
 "access_mrp_production_stock_worker","mrp.production stock_worker","model_mrp_production","stock.group_stock_user",1,0,0,0
diff --git a/addons/product/product.py b/addons/product/product.py
index e3f30a5860a..1cb54c78d6e 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -295,9 +295,7 @@ class product_template(osv.osv):
         return False
 
     _defaults = {
-        'company_id': lambda self, cr, uid, context: \
-                self.pool.get('res.users').browse(cr, uid, uid,
-                    context=context).company_id.id,
+        'company_id': lambda self, cr, uid, context: False, # Visible by all
         'type': lambda *a: 'product',
         'list_price': lambda *a: 1,
         'cost_method': lambda *a: 'standard',
diff --git a/addons/stock/product.py b/addons/stock/product.py
index 47453c69b5c..3fbc0407e89 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -62,8 +62,10 @@ class product_product(osv.osv):
             else:
                 location_ids = context['location']
         else:
-            cr.execute("select lot_stock_id from stock_warehouse")
-            location_ids = [id for (id,) in cr.fetchall()]
+            location_ids = []
+            wids = self.pool.get('stock.warehouse').search(cr, uid, [], context=context)
+            for w in self.pool.get('stock.warehouse').browse(cr, uid, wids, context=context):
+                location_ids.append(w.lot_stock_id.id)
 
         # build the list of ids of children of the location given by id
         if context.get('compute_child',True):
diff --git a/addons/stock/stock_data.xml b/addons/stock/stock_data.xml
index 704782eddd8..7be7e77d720 100644
--- a/addons/stock/stock_data.xml
+++ b/addons/stock/stock_data.xml
@@ -77,6 +77,7 @@
         <record id="stock_location_stock" model="stock.location">
             <field name="name">Stock</field>
             <field name="location_id" ref="stock_location_company"/>
+            <field name="company_id" ref="base.main_company"/>
         </record>
         
         <!--
diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml
index f876815b690..841734a4702 100644
--- a/addons/stock/stock_demo.xml
+++ b/addons/stock/stock_demo.xml
@@ -33,23 +33,28 @@
         <record id="stock_location_13" model="stock.location">
             <field name="name">Stock Level 1</field>
             <field name="location_id" ref="stock_location_stock"/>
+            <field name="company_id" ref="base.main_company"/>
         </record>
         <record id="stock_location_14" model="stock.location">
             <field name="name">Finished products</field>
             <field name="location_id" ref="stock_location_13"/>
             <field model="account.account" name="account_id" search="[('name','=','Merchandise Type B')]"/>
+            <field name="company_id" ref="base.main_company"/>
         </record>
         <record id="stock_location_15" model="stock.location">
             <field name="name">Sub Products</field>
             <field name="location_id" ref="stock_location_13"/>
+            <field name="company_id" ref="base.main_company"/>
         </record>
         <record id="stock_location_workshop" model="stock.location">
             <field name="name">Workshop</field>
             <field name="location_id" ref="stock_location_stock"/>
+            <field name="company_id" ref="base.main_company"/>
         </record>
         <record id="stock_location_components" model="stock.location">
             <field name="name">Components</field>
             <field name="location_id" ref="stock_location_workshop"/>
+            <field name="company_id" ref="base.main_company"/>
         </record>
         
         <!--