diff --git a/addons/mrp_byproduct/mrp_byproduct.py b/addons/mrp_byproduct/mrp_byproduct.py
index 40996771736..84914d9de4b 100644
--- a/addons/mrp_byproduct/mrp_byproduct.py
+++ b/addons/mrp_byproduct/mrp_byproduct.py
@@ -105,7 +105,6 @@ class mrp_production(osv.osv):
                     'product_uom': sub_product.product_uom.id,
                     'location_id': source,
                     'location_dest_id': production.location_dest_id.id,
-                    'move_dest_id': production.move_prod_id.id,
                     'production_id': production.id
                 }
                 move_id = move_obj.create(cr, uid, data, context=context)
diff --git a/addons/stock/wizard/stock_change_product_qty.py b/addons/stock/wizard/stock_change_product_qty.py
index 66fcb987df3..fd3aea0882e 100644
--- a/addons/stock/wizard/stock_change_product_qty.py
+++ b/addons/stock/wizard/stock_change_product_qty.py
@@ -132,7 +132,7 @@ class stock_change_product_qty(osv.osv_memory):
     def onchange_location_id(self, cr, uid, ids, location_id, product_id, context=None):
         if location_id:
             qty_wh = 0.0
-            qty = self.pool.get('product.product')._product_available(cr, uid, [product_id], context=dict(context or {}, location=location_id))
+            qty = self.pool.get('product.product')._product_available(cr, uid, [product_id], context=dict(context or {}, location=location_id, compute_child=False))
             if product_id in qty:
                 qty_wh = qty[product_id]['qty_available']
             return { 'value': { 'new_quantity': qty_wh } }
diff --git a/addons/website_sale/static/src/js/website_sale.js b/addons/website_sale/static/src/js/website_sale.js
index 32e8002a0fc..308b56dbb14 100644
--- a/addons/website_sale/static/src/js/website_sale.js
+++ b/addons/website_sale/static/src/js/website_sale.js
@@ -234,7 +234,7 @@ $('.oe_website_sale').each(function () {
         var product_id = false;
         for (var k in variant_ids) {
             if (_.isEmpty(_.difference(variant_ids[k][1], values))) {
-                openerp.website.ready(function() {
+                openerp.website.ready().then(function() {
                     $price.html(price_to_str(variant_ids[k][2]));
                     $default_price.html(price_to_str(variant_ids[k][3]));
                 });
diff --git a/openerp/tools/config.py b/openerp/tools/config.py
index 129ceb43d25..11f6772cf8f 100644
--- a/openerp/tools/config.py
+++ b/openerp/tools/config.py
@@ -628,9 +628,13 @@ class configmanager(object):
 
     @property
     def addons_data_dir(self):
-        d = os.path.join(self['data_dir'], 'addons', release.series)
+        add_dir = os.path.join(self['data_dir'], 'addons')
+        d = os.path.join(add_dir, release.series)
         if not os.path.exists(d):
             try:
+                # bootstrap parent dir +rwx
+                if not os.path.exists(add_dir):
+                    os.makedirs(add_dir, 0700)
                 # try to make +rx placeholder dir, will need manual +w to activate it
                 os.makedirs(d, 0500)
             except OSError: