[MERGE] Forward-port of latest saas-3 bugfixes, up to rev. df0ae7e4d155a180f5e49e85f1...

diff --cc addons/payment_paypal/models/paypal.py
Simple merge

diff --cc addons/payment_paypal/tests/test_paypal.py
Simple merge

diff --cc addons/website_sale/models/website.py
index 9ad0b63,b471935..418fb3d
--- 1/addons/website_sale/models/website.py
--- 2/addons/website_sale/models/website.py
+++ b/addons/website_sale/models/website.py
@@@ -22,12 -22,12 +22,12 @@@ class Website(orm.Model)
      # ***********************************************************
  
      def ecommerce_get_pricelist_id(self, cr, uid, ids, context=None):
-         if not request.session.get('ecommerce_pricelist'):
 -        if not request.httprequest.session.get('ecommerce_pricelist') or request.httprequest.session.get('ecommerce_pricelist_uid') != uid:
++        if not request.session.get('ecommerce_pricelist') or request.session.get('ecommerce_pricelist_uid') != uid:
              self._ecommerce_change_pricelist(cr, uid, None, context=context)
 -        return request.httprequest.session.get('ecommerce_pricelist')
 +        return request.session.get('ecommerce_pricelist')
  
      def _ecommerce_change_pricelist(self, cr, uid, code=None, context=None):
 -        request.httprequest.session.setdefault('ecommerce_pricelist', False)
 +        request.session.setdefault('ecommerce_pricelist', False)
  
          pricelist_id = False
          if code:
@@@ -40,7 -40,8 +40,8 @@@
              partner_id = self.pool.get('res.users').browse(cr, SUPERUSER_ID, uid, context).partner_id.id
              pricelist_id = self.pool.get('sale.order').onchange_partner_id(cr, SUPERUSER_ID, [], partner_id, context=context)['value']['pricelist_id']
  
 -        request.httprequest.session['ecommerce_pricelist'] = pricelist_id
 -        request.httprequest.session['ecommerce_pricelist_uid'] = uid
 +        request.session['ecommerce_pricelist'] = pricelist_id
++        request.session['ecommerce_pricelist_uid'] = uid
  
          order = self.ecommerce_get_current_order(cr, uid, context=context)
          if order: