[MERGE] forward port of branch saas-3 up to bf53aed

diff --cc addons/account/account_invoice.py
Simple merge

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

diff --cc addons/auth_oauth/controllers/main.py
index 4fca426,214fdef..e4d3e18
--- 1/addons/auth_oauth/controllers/main.py
--- 2/addons/auth_oauth/controllers/main.py
+++ b/addons/auth_oauth/controllers/main.py
@@@ -67,15 -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'],
-             r=request.httprequest.full_path
+             r=werkzeug.url_quote_plus(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/gamification/models/challenge.py
Simple merge

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

diff --cc addons/hr/hr_view.xml
Simple merge

diff --cc addons/mail/mail_thread.py
index cc74f25,8324b60..c9662f0
--- 1/addons/mail/mail_thread.py
--- 2/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@@ -34,8 -33,8 +34,9 @@@ import pyt
  import socket
  import time
  import xmlrpclib
+ import re
  from email.message import Message
 +from urllib import urlencode
  
  from openerp import tools
  from openerp import SUPERUSER_ID

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

diff --cc addons/web/static/src/css/base.css
index 503d6f8,5f9ecc5..05848a5
--- 1/addons/web/static/src/css/base.css
--- 2/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@@ -3288,6 -3389,12 +3288,9 @@@ body.oe_single_form .oe_single_form_con
  .openerp_ie ul.oe_form_status li.oe_active > .arrow span, .openerp_ie ul.oe_form_status_clickable li.oe_active > .arrow span {
    background-color: #729fcf !important;
  }
 -.openerp_ie .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button {
 -  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#EFEFEF', endColorstr='#D8D8D8');
+ }
+ .openerp_ie .oe_webclient {
+   height: auto !important;
 -}
  
  @media print {
    .openerp {

diff --cc addons/web/static/src/css/base.sass
index 8ebb2d8,e63092f..12d9d83
--- 1/addons/web/static/src/css/base.sass
--- 2/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@@ -2670,6 -2733,11 +2670,8 @@@ body.oe_single_for
              > .arrow span
                  background-color: #729fcf !important
  
 -    // jquery ui for ie
 -    .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button
 -        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#EFEFEF', endColorstr='#D8D8D8')
+     .oe_webclient
+         height: auto !important
  // }}}
  
  // @media print {{{

diff --cc addons/web/static/src/js/search.js
Simple merge

diff --cc addons/web/static/src/js/view_form.js
Simple merge

diff --cc addons/web_calendar/static/src/js/web_calendar.js
Simple merge

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

diff --cc addons/website_sale/controllers/main.py
Simple merge

diff --cc openerp/addons/base/ir/ir_actions.py
Simple merge

diff --cc openerp/addons/base/ir/ir_actions.xml
Simple merge

diff --cc openerp/osv/fields.py
Simple merge

diff --cc openerp/osv/orm.py
Simple merge