[MERGE] forward port of branch saas-3 up to revid 9394 chs@openerp.com-20140410103638...

bzr revid: chs@openerp.com-20140410110424-enhdg6pufhii56ni

diff --cc addons/account_asset/account_asset.py
Simple merge

diff --cc addons/auth_oauth/controllers/main.py
index b4ce20d,08319b9..4fca426
--- 1/addons/auth_oauth/controllers/main.py
--- 2/addons/auth_oauth/controllers/main.py
+++ b/addons/auth_oauth/controllers/main.py
@@@ -66,14 -67,11 +67,15 @@@ class OAuthLogin(openerp.addons.web.con
          return providers
  
      def get_state(self, provider):
 -        return dict(
 +        state = dict(
              d=request.session.db,
-             p=provider['id']
+             p=provider['id'],
+             r=request.httprequest.full_path
          )
 +        token = request.params.get('token')
 +        if token:
 +            state['t'] = token
 +        return state
  
      @http.route()
      def web_login(self, *args, **kw):

diff --cc addons/website/static/src/js/website.snippets.editor.js
Simple merge

diff --cc addons/website_sale/controllers/main.py
index bdf1ca7,75dce8e..374f17d
--- 1/addons/website_sale/controllers/main.py
--- 2/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@@ -383,10 -383,12 +383,12 @@@ class Ecommerce(http.Controller)
      def add_cart(self, product_id, remove=None, **kw):
          request.registry['website']._ecommerce_add_product_to_cart(request.cr, request.uid,
              product_id=int(product_id),
+             number=float(kw.get('number',1)),
+             set_number=float(kw.get('set_number',-1)),
              context=request.context)
 -        return request.redirect("/shop/mycart/")
 +        return request.redirect("/shop/mycart")
  
 -    @http.route(['/shop/change_cart/<int:order_line_id>/'], type='http', auth="public", website=True, multilang=True)
 +    @http.route(['/shop/change_cart/<int:order_line_id>'], type='http', auth="public", website=True, multilang=True)
      def add_cart_order_line(self, order_line_id=None, remove=None, **kw):
          request.registry['website']._ecommerce_add_product_to_cart(request.cr, request.uid,
              order_line_id=order_line_id, number=(remove and -1 or 1),