[MERGE] Forward-port 8.0 up to rev. 67a63e2

addons/stock/stock.py

@@ -3680,7 +3680,7 @@ def _handle_renaming(self, cr, uid, warehouse, name, code, context=None):
             for pull in route.pull_ids:
                 pull_obj.write(cr, uid, pull.id, {'name': pull.name.replace(warehouse.name, name, 1)}, context=context)
             for push in route.push_ids:
-                push_obj.write(cr, uid, push.id, {'name': pull.name.replace(warehouse.name, name, 1)}, context=context)
+                push_obj.write(cr, uid, push.id, {'name': push.name.replace(warehouse.name, name, 1)}, context=context)
         #change the mto procurement rule name
         if warehouse.mto_pull_id.id:
             pull_obj.write(cr, uid, warehouse.mto_pull_id.id, {'name': warehouse.mto_pull_id.name.replace(warehouse.name, name, 1)}, context=context)

addons/website_sale/controllers/main.py

@@ -993,5 +993,5 @@ def get_unit_price(self, product_ids, add_qty, use_order_pricelist=False, **kw):
             pricelist_id = request.session.get('sale_order_code_pricelist_id') or partner.property_product_pricelist.id
         else:
             pricelist_id = partner.property_product_pricelist.id
-        prices = pool['product.pricelist'].price_rule_get_multi(cr, uid, [], [(product, add_qty, partner) for product in products], context=context)
+        prices = pool['product.pricelist'].price_rule_get_multi(cr, uid, [pricelist_id], [(product, add_qty, partner) for product in products], context=context)
         return {product_id: prices[product_id][pricelist_id][0] for product_id in product_ids}

openerp/tools/misc.py

@@ -1170,11 +1170,15 @@ def html_escape(text):
 
 class Pickle(object):
     @classmethod
-    def load(cls, stream):
+    def load(cls, stream, errors=False):
         unpickler = cPickle.Unpickler(stream)
         # pickle builtins: str/unicode, int/long, float, bool, tuple, list, dict, None
         unpickler.find_global = None
-        return unpickler.load()
+        try:
+            return unpickler.load()
+        except Exception:
+            _logger.warning('Failed unpickling data, returning default: %r', errors, exc_info=True)
+            return errors
 
     @classmethod
     def loads(cls, text):