[Merge] Merged with main branch.

bzr revid: mdi@tinyerp.com-20140417064501-cf2rp86sukob7v1a

22 files changed, 60 insertions, 54 deletions

diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py
index b4ce20d49e3..4fca426ffc0 100644
--- a/addons/auth_oauth/controllers/main.py
+++ b/addons/auth_oauth/controllers/main.py
@@ -2,6 +2,7 @@ import functools
 import logging
 
 import simplejson
+import urlparse
 import werkzeug.utils
 from werkzeug.exceptions import BadRequest
 
@@ -68,7 +69,8 @@ class OAuthLogin(openerp.addons.web.controllers.main.Home):
     def get_state(self, provider):
         state = dict(
             d=request.session.db,
-            p=provider['id']
+            p=provider['id'],
+            r=request.httprequest.full_path
         )
         token = request.params.get('token')
         if token:
@@ -137,8 +139,12 @@ class OAuthController(http.Controller):
                 cr.commit()
                 action = state.get('a')
                 menu = state.get('m')
+                redirect = state.get('r')
                 url = '/web'
-                if action:
+                if redirect and not redirect.startswith('/auth_oauth/signin') and \
+                (not redirect.startswith('/web/login') or 'redirect' in urlparse.urlsplit(redirect).query):
+                    url = redirect
+                elif action:
                     url = '/web#action=%s' % action
                 elif menu:
                     url = '/web#menu_id=%s' % menu
diff --git a/addons/auth_oauth/i18n/ar.po b/addons/auth_oauth/i18n/ar.po
index bd848dfb982..9458231ffbd 100644
--- a/addons/auth_oauth/i18n/ar.po
+++ b/addons/auth_oauth/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,validation_endpoint:0
diff --git a/addons/auth_oauth/i18n/cs.po b/addons/auth_oauth/i18n/cs.po
index 4d1f04acccc..107671f1321 100644
--- a/addons/auth_oauth/i18n/cs.po
+++ b/addons/auth_oauth/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,validation_endpoint:0
diff --git a/addons/auth_oauth/i18n/de.po b/addons/auth_oauth/i18n/de.po
index a0d2425d6eb..fa5783db343 100644
--- a/addons/auth_oauth/i18n/de.po
+++ b/addons/auth_oauth/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,validation_endpoint:0
diff --git a/addons/auth_oauth/i18n/en_GB.po b/addons/auth_oauth/i18n/en_GB.po
index f95e5f2b3df..6ca8dbdd887 100644
--- a/addons/auth_oauth/i18n/en_GB.po
+++ b/addons/auth_oauth/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,validation_endpoint:0
diff --git a/addons/auth_oauth/i18n/es.po b/addons/auth_oauth/i18n/es.po
index 7c92480116c..5fd8ad57a78 100644
--- a/addons/auth_oauth/i18n/es.po
+++ b/addons/auth_oauth/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,validation_endpoint:0
diff --git a/addons/auth_oauth/i18n/fr.po b/addons/auth_oauth/i18n/fr.po
index 7784c93d01c..38ed5e2cb92 100644
--- a/addons/auth_oauth/i18n/fr.po
+++ b/addons/auth_oauth/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,validation_endpoint:0
diff --git a/addons/auth_oauth/i18n/hr.po b/addons/auth_oauth/i18n/hr.po
index 13a85ff7730..33c27f1ba7f 100644
--- a/addons/auth_oauth/i18n/hr.po
+++ b/addons/auth_oauth/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,validation_endpoint:0
diff --git a/addons/auth_oauth/i18n/hu.po b/addons/auth_oauth/i18n/hu.po
index cd29edded87..137f3a67025 100644
--- a/addons/auth_oauth/i18n/hu.po
+++ b/addons/auth_oauth/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,validation_endpoint:0
diff --git a/addons/auth_oauth/i18n/it.po b/addons/auth_oauth/i18n/it.po
index d5a213ee295..578d51f1d88 100644
--- a/addons/auth_oauth/i18n/it.po
+++ b/addons/auth_oauth/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,validation_endpoint:0
diff --git a/addons/auth_oauth/i18n/mk.po b/addons/auth_oauth/i18n/mk.po
index f459742bfb9..ca6d790a09d 100644
--- a/addons/auth_oauth/i18n/mk.po
+++ b/addons/auth_oauth/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,validation_endpoint:0
diff --git a/addons/auth_oauth/i18n/nb.po b/addons/auth_oauth/i18n/nb.po
index 7e2b5542eeb..6bba796139e 100644
--- a/addons/auth_oauth/i18n/nb.po
+++ b/addons/auth_oauth/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,validation_endpoint:0
diff --git a/addons/auth_oauth/i18n/nl.po b/addons/auth_oauth/i18n/nl.po
index 3e96e0b3dfb..1e6dc271346 100644
--- a/addons/auth_oauth/i18n/nl.po
+++ b/addons/auth_oauth/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,validation_endpoint:0
diff --git a/addons/auth_oauth/i18n/pl.po b/addons/auth_oauth/i18n/pl.po
index 0ce5046af56..70968a025a7 100644
--- a/addons/auth_oauth/i18n/pl.po
+++ b/addons/auth_oauth/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,validation_endpoint:0
diff --git a/addons/auth_oauth/i18n/pt.po b/addons/auth_oauth/i18n/pt.po
index f0af44c0b6f..7d7c7e84e7f 100644
--- a/addons/auth_oauth/i18n/pt.po
+++ b/addons/auth_oauth/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,validation_endpoint:0
diff --git a/addons/auth_oauth/i18n/pt_BR.po b/addons/auth_oauth/i18n/pt_BR.po
index 7ec72edbd82..6a17a9fb3ba 100644
--- a/addons/auth_oauth/i18n/pt_BR.po
+++ b/addons/auth_oauth/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,validation_endpoint:0
diff --git a/addons/auth_oauth/i18n/ro.po b/addons/auth_oauth/i18n/ro.po
index 0048351530e..751dd016a64 100644
--- a/addons/auth_oauth/i18n/ro.po
+++ b/addons/auth_oauth/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,validation_endpoint:0
diff --git a/addons/auth_oauth/i18n/ru.po b/addons/auth_oauth/i18n/ru.po
index 2d4ce7e57af..3d044b44cb6 100644
--- a/addons/auth_oauth/i18n/ru.po
+++ b/addons/auth_oauth/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,validation_endpoint:0
diff --git a/addons/auth_oauth/i18n/sl.po b/addons/auth_oauth/i18n/sl.po
index b1a087ee0eb..c7cad9d2499 100644
--- a/addons/auth_oauth/i18n/sl.po
+++ b/addons/auth_oauth/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,validation_endpoint:0
diff --git a/addons/auth_oauth/i18n/sv.po b/addons/auth_oauth/i18n/sv.po
index 014d29712eb..31938fe7141 100644
--- a/addons/auth_oauth/i18n/sv.po
+++ b/addons/auth_oauth/i18n/sv.po
@@ -14,18 +14,18 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,validation_endpoint:0
 msgid "Validation URL"
-msgstr ""
+msgstr "Gransknings-URL"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,auth_endpoint:0
 msgid "Authentication URL"
-msgstr ""
+msgstr "URL för idkontroll"
 
 #. module: auth_oauth
 #: model:ir.model,name:auth_oauth.model_base_config_settings
@@ -40,7 +40,7 @@ msgstr "Leverantörsnamn"
 #. module: auth_oauth
 #: field:auth.oauth.provider,scope:0
 msgid "Scope"
-msgstr ""
+msgstr "Spelrum"
 
 #. module: auth_oauth
 #: field:res.users,oauth_provider_id:0
@@ -55,7 +55,7 @@ msgstr "CSS-klass"
 #. module: auth_oauth
 #: field:auth.oauth.provider,body:0
 msgid "Body"
-msgstr ""
+msgstr "Brödtext"
 
 #. module: auth_oauth
 #: model:ir.model,name:auth_oauth.model_res_users
@@ -70,7 +70,7 @@ msgstr "okänd"
 #. module: auth_oauth
 #: field:res.users,oauth_access_token:0
 msgid "OAuth Access Token"
-msgstr ""
+msgstr "OAuth åtkomstpollett"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,client_id:0
@@ -102,12 +102,12 @@ msgstr "Tillåt användare att logga in med hjälp av Facebook"
 #. module: auth_oauth
 #: sql_constraint:res.users:0
 msgid "OAuth UID must be unique per provider"
-msgstr ""
+msgstr "OAuth UID måste vara unikt per utgivare"
 
 #. module: auth_oauth
 #: help:res.users,oauth_uid:0
 msgid "Oauth Provider user_id"
-msgstr ""
+msgstr "Oauth utgivare-user_id"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,data_endpoint:0
@@ -117,7 +117,7 @@ msgstr "Data-URL"
 #. module: auth_oauth
 #: view:auth.oauth.provider:0
 msgid "arch"
-msgstr ""
+msgstr "Arkitektur"
 
 #. module: auth_oauth
 #: model:ir.actions.act_window,name:auth_oauth.action_oauth_provider
@@ -127,9 +127,9 @@ msgstr "Leverantörer"
 #. module: auth_oauth
 #: field:base.config.settings,auth_oauth_google_enabled:0
 msgid "Allow users to sign in with Google"
-msgstr ""
+msgstr "Tillåt användare logga in med Google"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,enabled:0
 msgid "Allowed"
-msgstr ""
+msgstr "Tillåten"
diff --git a/addons/auth_oauth/i18n/tr.po b/addons/auth_oauth/i18n/tr.po
index 43d11a4355c..4472686c2a3 100644
--- a/addons/auth_oauth/i18n/tr.po
+++ b/addons/auth_oauth/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,validation_endpoint:0
diff --git a/addons/auth_oauth/i18n/zh_CN.po b/addons/auth_oauth/i18n/zh_CN.po
index 615d126eb68..551f27bf1eb 100644
--- a/addons/auth_oauth/i18n/zh_CN.po
+++ b/addons/auth_oauth/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,validation_endpoint:0