From bbfae00dde9f5a953d5e84e6169d8eca7e1e1f50 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 13 Jan 2014 16:24:10 +0100
Subject: [PATCH 01/20] [FIX] remove Login usage from edi module

bzr revid: fme@openerp.com-20140113152410-p32djnzq80xgh0o7
---
 addons/edi/static/src/js/edi.js | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/addons/edi/static/src/js/edi.js b/addons/edi/static/src/js/edi.js
index 80002bd8743..91d2b842f8a 100644
--- a/addons/edi/static/src/js/edi.js
+++ b/addons/edi/static/src/js/edi.js
@@ -1,6 +1,7 @@
 openerp.edi = function(instance) {
 var _t = instance.web._t;
-instance.edi = {}
+instance.edi = {};
+
 
 instance.edi.EdiImport = instance.web.Widget.extend({
 
@@ -10,11 +11,7 @@ instance.edi.EdiImport = instance.web.Widget.extend({
     },
     start: function() {
         if (!this.session.session_is_valid()) {
-            this.show_login();
-            this.session.on_session_valid.add({
-                callback: this.proxy('show_import'),
-                unique: true,
-            });
+            instance.redirect('/web/login?redir=' + encodeURIComponent(window.location));
         } else {
             this.show_import();
         }
@@ -25,12 +22,6 @@ instance.edi.EdiImport = instance.web.Widget.extend({
         this.do_import();
     },
 
-    show_login: function() {
-        this.destroy_content();
-        this.login = new instance.web.Login(this);
-        this.login.appendTo(this.$el);
-    },
-
     destroy_content: function() {
         _.each(_.clone(this.getChildren()), function(el) {
             el.destroy();

From 2c02157b7bf57bc4b01369323ff1630705781062 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 14 Jan 2014 10:08:19 +0100
Subject: [PATCH 02/20] [ADD] Comment some Login addons javascript until they
 are remade server side

bzr revid: fme@openerp.com-20140114090819-vfswqeuqg2bg3ybu
---
 addons/auth_oauth/static/src/js/auth_oauth.js               | 3 ++-
 addons/auth_oauth_signup/static/src/js/auth_oauth_signup.js | 2 ++
 addons/auth_openid/static/src/js/auth_openid.js             | 2 ++
 addons/auth_signup/static/src/js/auth_signup.js             | 2 ++
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/addons/auth_oauth/static/src/js/auth_oauth.js b/addons/auth_oauth/static/src/js/auth_oauth.js
index 5046469a5dc..a4295877e76 100644
--- a/addons/auth_oauth/static/src/js/auth_oauth.js
+++ b/addons/auth_oauth/static/src/js/auth_oauth.js
@@ -3,6 +3,7 @@ openerp.auth_oauth = function(instance) {
         _lt = instance.web._lt;
     var QWeb = instance.web.qweb;
 
+    /* TODO: make this a server side controller
     instance.web.Login.include({
         start: function(parent, params) {
             var self = this;
@@ -76,5 +77,5 @@ openerp.auth_oauth = function(instance) {
             };
         },
     });
-
+    */
 };
diff --git a/addons/auth_oauth_signup/static/src/js/auth_oauth_signup.js b/addons/auth_oauth_signup/static/src/js/auth_oauth_signup.js
index 6715943af9b..926fb607358 100644
--- a/addons/auth_oauth_signup/static/src/js/auth_oauth_signup.js
+++ b/addons/auth_oauth_signup/static/src/js/auth_oauth_signup.js
@@ -1,5 +1,6 @@
 openerp.auth_oauth_signup = function(instance) {
 
+    /* TODO: make this a server side controller
     // override Login._oauth_state to add the signup token in the state
     instance.web.Login.include({
         _oauth_state: function(provider) {
@@ -10,5 +11,6 @@ openerp.auth_oauth_signup = function(instance) {
             return state;
         },
     });
+    */
 
 };
diff --git a/addons/auth_openid/static/src/js/auth_openid.js b/addons/auth_openid/static/src/js/auth_openid.js
index ac2804cb130..a96346f4699 100644
--- a/addons/auth_openid/static/src/js/auth_openid.js
+++ b/addons/auth_openid/static/src/js/auth_openid.js
@@ -3,6 +3,7 @@ openerp.auth_openid = function(instance) {
 
 var QWeb = instance.web.qweb;
 
+/* TODO: make this a server side controller
 instance.web.Login = instance.web.Login.extend({
     start: function() {
         var self = this;
@@ -149,6 +150,7 @@ instance.web.Login = instance.web.Login.extend({
     }
 
 });
+*/
 
 
 };
diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js
index d9edb44d65f..d10f96316e2 100644
--- a/addons/auth_signup/static/src/js/auth_signup.js
+++ b/addons/auth_signup/static/src/js/auth_signup.js
@@ -2,6 +2,7 @@ openerp.auth_signup = function(instance) {
     instance.auth_signup = instance.auth_signup || {};
     var _t = instance.web._t;
 
+    /* TODO: make this a server side controller
     instance.web.Login.include({
         start: function() {
             var self = this;
@@ -183,4 +184,5 @@ openerp.auth_signup = function(instance) {
             });
         },
     });
+    */
 };

From 1f916750eb79799d12c8a3d39dda502a0c6ae8f2 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 15 Jan 2014 15:09:58 +0100
Subject: [PATCH 03/20] [FIX] test_request: process cookies on redirections

bzr revid: fme@openerp.com-20140115140958-9hm8thtlcnyflazz
---
 addons/website/tests/test_requests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/tests/test_requests.py b/addons/website/tests/test_requests.py
index fc56a93158c..e78c59a69cf 100644
--- a/addons/website/tests/test_requests.py
+++ b/addons/website/tests/test_requests.py
@@ -48,8 +48,8 @@ class CrawlSuite(unittest2.TestSuite):
         self.opener.add_handler(urllib2.UnknownHandler())
         self.opener.add_handler(urllib2.HTTPHandler())
         self.opener.add_handler(urllib2.HTTPSHandler())
-        self.opener.add_handler(RedirectHandler())
         self.opener.add_handler(urllib2.HTTPCookieProcessor())
+        self.opener.add_handler(RedirectHandler())
 
         self._authenticate(user, password)
         self.user = user

From 96c79572f8ead79b5d8a762da6c6c17e5a78d8e8 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 15 Jan 2014 17:13:18 +0100
Subject: [PATCH 04/20] [FIX] test ui should use /login route for auto login

bzr revid: fme@openerp.com-20140115161318-v8ksw0u0u1mpgn0x
---
 addons/website/tests/test_ui.py                 | 4 ++--
 addons/website/tests/ui_suite/ui_test_runner.js | 7 ++++---
 addons/website_blog/tests/test_ui.py            | 4 ++--
 addons/website_event/tests/test_ui.py           | 4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/addons/website/tests/test_ui.py b/addons/website/tests/test_ui.py
index 75a98869646..ffd5e738691 100644
--- a/addons/website/tests/test_ui.py
+++ b/addons/website/tests/test_ui.py
@@ -146,6 +146,6 @@ def full_path(filename):
 
 def load_tests(loader, base, _):
     base.addTest(WebsiteUiSuite(full_path('dummy_test.js'), {}, 5.0))
-    base.addTest(WebsiteUiSuite(full_path('simple_dom_test.js'), { 'action': 'website.action_website_homepage' }, 60.0))
-    base.addTest(WebsiteUiSuite(full_path('homepage_test.js'),   { 'action': 'website.action_website_homepage' }, 60.0))
+    base.addTest(WebsiteUiSuite(full_path('simple_dom_test.js'), {'redirect': '/page/website.homepage'}, 60.0))
+    base.addTest(WebsiteUiSuite(full_path('homepage_test.js'), {'redirect': '/page/website.homepage'}, 60.0))
     return base
diff --git a/addons/website/tests/ui_suite/ui_test_runner.js b/addons/website/tests/ui_suite/ui_test_runner.js
index ea8e03b36d3..acb67d387ad 100644
--- a/addons/website/tests/ui_suite/ui_test_runner.js
+++ b/addons/website/tests/ui_suite/ui_test_runner.js
@@ -27,15 +27,16 @@ function run (test) {
     var scheme = options.scheme ? options.scheme+'://' : 'http://';
     var host = options.host ? options.host : 'localhost';
     var port = options.port ? ':'+options.port : '';
-    var path = options.path ? options.path : '/web';
+    var path = options.path ? options.path : '/login';
 
     var queryParams = [];
     if (options.db) queryParams.push('db='+options.db);
+    if (options.user) queryParams.push('login='+options.user);
+    if (options.password) queryParams.push('key='+options.password);
+    if (options.redirect) queryParams.push('redirect='+options.redirect);
     var query = queryParams.length > 0 ? '?'+queryParams.join('&') : '';
 
     var hashParams = [];
-    if (options.user) hashParams.push('login='+options.user);
-    if (options.password) hashParams.push('password='+options.password);
     if (options.action) hashParams.push('action='+options.action);
     var hash = hashParams.length > 0 ? '#'+hashParams.join('&') : '';
 
diff --git a/addons/website_blog/tests/test_ui.py b/addons/website_blog/tests/test_ui.py
index 0e57f94d931..f31b4378568 100644
--- a/addons/website_blog/tests/test_ui.py
+++ b/addons/website_blog/tests/test_ui.py
@@ -6,5 +6,5 @@ def full_path(filename):
     return os.path.join(os.path.join(os.path.dirname(__file__), 'ui_suite'), filename)
 
 def load_tests(loader, base, _):
-    base.addTest(test_ui.WebsiteUiSuite(full_path('post_test.js'),   { 'action': 'website.action_website_homepage' }, 60.0))
-    return base
\ No newline at end of file
+    base.addTest(test_ui.WebsiteUiSuite(full_path('post_test.js'), {'redirect': '/page/website.homepage'}, 60.0))
+    return base
diff --git a/addons/website_event/tests/test_ui.py b/addons/website_event/tests/test_ui.py
index 8c4bdb2a07c..eaf16ccc573 100644
--- a/addons/website_event/tests/test_ui.py
+++ b/addons/website_event/tests/test_ui.py
@@ -6,5 +6,5 @@ def full_path(filename):
     return os.path.join(os.path.join(os.path.dirname(__file__), 'ui_suite'), filename)
 
 def load_tests(loader, base, _):
-    base.addTest(test_ui.WebsiteUiSuite(full_path('event_test.js'),   { 'action': 'website.action_website_homepage' }, 60.0))
-    return base
\ No newline at end of file
+    base.addTest(test_ui.WebsiteUiSuite(full_path('event_test.js'), {'redirect': '/page/website.homepage'}, 60.0))
+    return base

From 735c2b501b6c78ab6458e747a4bb436e74375989 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 16 Jan 2014 19:17:46 +0100
Subject: [PATCH 05/20] [IMP] integrate login into the website.layout

bzr revid: fme@openerp.com-20140116181746-e2z9m4gym5kcdgmr
---
 addons/website/controllers/main.py         | 10 +++++++++-
 addons/website/static/src/css/website.css  |  6 +++++-
 addons/website/static/src/css/website.sass |  3 +++
 addons/website/static/src/js/website.js    |  2 +-
 addons/website/views/website_templates.xml |  8 +++++++-
 5 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index 2ebdc2ba163..69b59acbfb3 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -20,7 +20,7 @@ import openerp
 from openerp.osv import fields
 from openerp.addons.website.models import website
 from openerp.addons.web import http
-from openerp.addons.web.http import request
+from openerp.addons.web.http import request, LazyResponse
 
 from ..utils import slugify
 
@@ -41,6 +41,14 @@ class Website(openerp.addons.web.controllers.main.Home):
             pass
         return self.page("website.homepage")
 
+    @website.route('/web/login', type='http', auth="public", multilang=True)
+    def web_login(self, *args, **kw):
+        response = super(Website, self).web_login(*args, **kw)
+        if isinstance(response, LazyResponse):
+            values = dict(response.params['values'], disable_footer=True, redirect="/")
+            response = request.website.render(response.params['template'], values)
+        return response
+
     @website.route('/pagenew/<path:path>', type='http', auth="user")
     def pagenew(self, path, noredirect=NOPE):
         web = request.registry['website']
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 095f9bec8bb..ae4e57ad942 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -1,4 +1,3 @@
-@charset "utf-8";
 /*       THIS CSS FILE IS FOR WEBSITE THEMING CUSTOMIZATION ONLY
  *
  * css for editor buttons, openerp widget included in the website and other
@@ -479,3 +478,8 @@ span[data-oe-type="monetary"] {
   -o-column-count: 3;
   column-count: 3;
 }
+
+.oe_website_login_container {
+  width: 400px;
+  margin: 40px auto;
+}
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 56257628a22..f801ad5456b 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -378,3 +378,6 @@ span[data-oe-type="monetary"]
 .oe_template_fallback
     @include column-count(3)
 
+.oe_website_login_container
+    width: 400px
+    margin: 40px auto
diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index 64767d95171..7c153ada1a3 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -262,7 +262,7 @@
     dom_ready.then(function () {
 
         /* ----- BOOTSTRAP  STUFF ---- */
-        $('.js_tooltip').bstooltip();
+        // $('.js_tooltip').bstooltip();
 
         /* ----- PUBLISHING STUFF ---- */
         $(document).on('click', '.js_publish_management .js_publish_btn', function () {
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 9682d2f17e2..b1abb0922af 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -230,7 +230,13 @@
     </xpath>
 </template>
 
-
+<template id="login_layout" inherit_id="web.login_layout" name="Website Login Layout">
+    <xpath expr="t" position="replace">
+        <t t-call="website.layout">
+            <div class="oe_website_login_container" t-raw="0"/>
+        </t>
+    </xpath>
+</template>
 
 <template id="show_sign_in" inherit_option_id="website.layout" inherit_id="website.layout" name="Show Sign In">
     <xpath expr="//ul[@id='top_menu']" position="inside">

From f41243acd3d81fd1ea5edf1fcbbe5b12484de3fc Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 16 Jan 2014 19:27:59 +0100
Subject: [PATCH 06/20] [FIX] Login link from website

bzr revid: fme@openerp.com-20140116182759-sq1aohhrufu1zh6f
---
 addons/website/controllers/main.py         | 2 +-
 addons/website/views/website_templates.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index 69b59acbfb3..f56ae330ac6 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -45,7 +45,7 @@ class Website(openerp.addons.web.controllers.main.Home):
     def web_login(self, *args, **kw):
         response = super(Website, self).web_login(*args, **kw)
         if isinstance(response, LazyResponse):
-            values = dict(response.params['values'], disable_footer=True, redirect="/")
+            values = dict(response.params['values'], disable_footer=True)
             response = request.website.render(response.params['template'], values)
         return response
 
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index b1abb0922af..a0efbdb6e33 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -241,7 +241,7 @@
 <template id="show_sign_in" inherit_option_id="website.layout" inherit_id="website.layout" name="Show Sign In">
     <xpath expr="//ul[@id='top_menu']" position="inside">
         <li t-if="user_id.id == website.public_user.id">
-            <a t-attf-href="/web#redirect=#{ quote_plus(url_for('', keep_query='*')) }">
+            <a t-attf-href="/web/login?redirect=#{ quote_plus(url_for('', keep_query='*')) }">
                 <b>Sign in</b>
             </a>
         </li>

From c3f7ab7dddf00d681d6fe4723e9209c4ef713324 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Fri, 17 Jan 2014 15:18:06 +0100
Subject: [PATCH 07/20] [WIP] auth_signup

bzr revid: fme@openerp.com-20140117141806-r6f1dejdcg7ii1e0
---
 addons/auth_signup/__openerp__.py             |  2 +
 addons/auth_signup/controllers/main.py        | 21 ++++--
 addons/auth_signup/res_users.py               | 14 ++--
 .../auth_signup/static/src/js/auth_signup.js  |  4 +-
 .../auth_signup/views/auth_signup_login.xml   | 72 +++++++++++++++++++
 5 files changed, 100 insertions(+), 13 deletions(-)
 create mode 100644 addons/auth_signup/views/auth_signup_login.xml

diff --git a/addons/auth_signup/__openerp__.py b/addons/auth_signup/__openerp__.py
index 08740962c59..7318ecfd8ef 100644
--- a/addons/auth_signup/__openerp__.py
+++ b/addons/auth_signup/__openerp__.py
@@ -34,11 +34,13 @@ Allow users to sign up and reset their password
     'depends': [
         'base_setup',
         'email_template',
+        'web',
     ],
     'data': [
         'auth_signup_data.xml',
         'res_config.xml',
         'res_users_view.xml',
+        'views/auth_signup_login.xml',
     ],
     'js': ['static/src/js/auth_signup.js'],
     'qweb': ['static/src/xml/auth_signup.xml'],
diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py
index a778cbcf061..7948e737327 100644
--- a/addons/auth_signup/controllers/main.py
+++ b/addons/auth_signup/controllers/main.py
@@ -22,16 +22,27 @@ import logging
 
 import openerp
 from openerp import http
-from openerp.http import request
+from openerp.http import request, LazyResponse
 from openerp.modules.registry import RegistryManager
 from ..res_users import SignupError
 
 _logger = logging.getLogger(__name__)
 
-class Controller(http.Controller):
+class Home(openerp.addons.web.controllers.main.Home):
 
-    @http.route('/auth_signup/get_config', type='json', auth="none")
-    def get_config(self, dbname):
+    @http.route('/web/login', type='http', auth="none")
+    def web_login(self, *args, **kw):
+        response = super(Home, self).web_login(*args, **kw)
+        if isinstance(response, LazyResponse):
+            config = self.get_auth_signup_config(request.session.db)
+            response.params['values'].update(config)
+            if request.params.get('signup', None) and config['signup']:
+                response.params['template'] = 'auth_signup.signup'
+            if request.params.get('reset', None) and config['signup']:
+                response.params['template'] = 'auth_signup.reset'
+        return response
+
+    def get_auth_signup_config(self, dbname):
         """ retrieve the module config (which features are enabled) for the login page """
         registry = RegistryManager.get(dbname)
         with registry.cursor() as cr:
@@ -42,6 +53,8 @@ class Controller(http.Controller):
             }
         return config
 
+class Controller(http.Controller):
+
     @http.route('/auth_signup/retrieve', type='json', auth="none")
     def retrieve(self, dbname, token):
         """ retrieve the user info (name, login or email) corresponding to a signup token """
diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py
index 669ea3a56a1..0379cd2c0c1 100644
--- a/addons/auth_signup/res_users.py
+++ b/addons/auth_signup/res_users.py
@@ -66,19 +66,19 @@ class res_partner(osv.Model):
                 self.signup_prepare(cr, uid, [partner.id], context=context)
                 partner.refresh()
 
-            # the parameters to encode for the query and fragment part of url
-            query = {'db': cr.dbname}
+            # the parameters to encode for the query
+            query = dict(db=cr.dbname)
             signup_type = context.get('signup_force_type_in_url', partner.signup_type or '')
-            fragment = {'action': action, 'type': signup_type}
+            query[signup_type] = 1
 
             if partner.signup_token and signup_type:
-                fragment['token'] = partner.signup_token
+                query['token'] = partner.signup_token
             elif partner.user_ids:
-                fragment['db'] = cr.dbname
-                fragment['login'] = partner.user_ids[0].login
+                query['login'] = partner.user_ids[0].login
             else:
                 continue        # no signup token, no user, thus no signup url!
 
+            fragment = dict()
             if view_type:
                 fragment['view_type'] = view_type
             if menu_id:
@@ -88,7 +88,7 @@ class res_partner(osv.Model):
             if res_id:
                 fragment['id'] = res_id
 
-            res[partner.id] = urljoin(base_url, "?%s#%s" % (urlencode(query), urlencode(fragment)))
+            res[partner.id] = urljoin(base_url, "/web/login?%s#%s" % (urlencode(query), urlencode(fragment)))
 
         return res
 
diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js
index d10f96316e2..b5e6f91b139 100644
--- a/addons/auth_signup/static/src/js/auth_signup.js
+++ b/addons/auth_signup/static/src/js/auth_signup.js
@@ -2,7 +2,8 @@ openerp.auth_signup = function(instance) {
     instance.auth_signup = instance.auth_signup || {};
     var _t = instance.web._t;
 
-    /* TODO: make this a server side controller
+    return;
+
     instance.web.Login.include({
         start: function() {
             var self = this;
@@ -184,5 +185,4 @@ openerp.auth_signup = function(instance) {
             });
         },
     });
-    */
 };
diff --git a/addons/auth_signup/views/auth_signup_login.xml b/addons/auth_signup/views/auth_signup_login.xml
new file mode 100644
index 00000000000..38aef1e2099
--- /dev/null
+++ b/addons/auth_signup/views/auth_signup_login.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="auth_signup.login" inherit_id="web.login" name="Login (overloaded by auth_signup)">
+            <xpath expr="//button[@type='submit']" position="before">
+                <a t-if="signup" href="/web/login?signup=1" class="btn btn-default pull-left">Sign up</a>
+                <a t-if="reset_password" href="/web/login?reset=1" class="btn btn-default pull-left">Reset Password</a>
+            </xpath>
+        </template>
+
+        <template id="auth_signup.signup" name="Sinup">
+            <t t-call="web.login_layout">
+                <t t-set="head">
+                    <t t-foreach="css" t-as="css_file">
+                        <link rel="stylesheet" t-att-href="css_file"/>
+                    </t>
+                    <t t-foreach="js" t-as="js_file">
+                        <script type="text/javascript" t-att-src="js_file"></script>
+                    </t>
+                </t>
+
+                <form class="oe_signup_form" role="form" t-attf-action="/web/login{{ '?debug' if debug else '' }}" method="post">
+                    <div class="form-group field-name">
+                        <label for="name" class="control-label">Name</label>
+                        <input type="text" name="name" t-att-value="name" id="name" class="form-control" placeholder="Enter your name" required="required" autofocus="autofocus"/>
+                    </div>
+
+                    <div class="form-group field-login">
+                        <label for="login" class="control-label">Username (email)</label>
+                        <input type="text" name="login" t-att-value="login" id="login" class="form-control" placeholder="Enter login" required="required"/>
+                    </div>
+
+                    <div class="form-group field-password">
+                        <label for="password" class="control-label">Password</label>
+                        <input type="password" name="password" id="password" class="form-control" placeholder="Password" required="required"/>
+                    </div>
+
+                    <div class="form-group field-confirm_password">
+                        <label for="confirm_password" class="control-label">Confirm Password</label>
+                        <input type="password" name="confirm_password" id="confirm_password" class="form-control" placeholder="Confirm your password" required="required"/>
+                    </div>
+
+                    <div class="oe_login_messages">
+                        <p class="alert alert-danger" t-if="authentication_failed">
+                            Wrong login/password
+                        </p>
+                    </div>
+
+                    <hr/>
+                    <input type="hidden" name="redirect" t-att-value="redirect"/>
+                    <input type="hidden" name="signup" value="1"/>
+                    <div class="clearfix oe_login_buttons">
+                        <a href="/web/login" class="btn btn-default pull-left">Back to Login</a>
+                        <button type="submit" class="btn btn-primary pull-right">Signup</button>
+                    </div>
+
+                </form>
+                <div class="oe_single_form_footer" t-if="not disable_footer">
+                    <t t-if="not disable_database_manager">
+                        <a class="oe_login_manage_db" t-attf-href="/web/database/manager{{ '?debug' if debug else '' }}">Manage Databases</a>
+                        <span class="oe_footer_seperator"> | </span>
+                    </t>
+                    <a href="http://www.openerp.com" target="_blank">Powered by <span>OpenERP</span></a>
+                </div>
+
+            </t>
+        </template>
+
+    </data>
+</openerp>

From fff55213b59d4a3ea260b5975ab2b67506e9480b Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 21 Jan 2014 16:20:27 +0100
Subject: [PATCH 08/20] [IMP] auth_signup converted to server side module

bzr revid: fme@openerp.com-20140121152027-7wch4r7dt2ew0did
---
 addons/auth_signup/__openerp__.py             |   1 -
 addons/auth_signup/controllers/main.py        | 120 ++++++-----
 addons/auth_signup/res_users.py               |   3 +-
 .../auth_signup/static/src/js/auth_signup.js  | 189 +-----------------
 .../static/src/xml/auth_signup.xml            |  39 ----
 .../auth_signup/views/auth_signup_login.xml   |  48 +++--
 6 files changed, 102 insertions(+), 298 deletions(-)
 delete mode 100644 addons/auth_signup/static/src/xml/auth_signup.xml

diff --git a/addons/auth_signup/__openerp__.py b/addons/auth_signup/__openerp__.py
index 7318ecfd8ef..50402207018 100644
--- a/addons/auth_signup/__openerp__.py
+++ b/addons/auth_signup/__openerp__.py
@@ -43,6 +43,5 @@ Allow users to sign up and reset their password
         'views/auth_signup_login.xml',
     ],
     'js': ['static/src/js/auth_signup.js'],
-    'qweb': ['static/src/xml/auth_signup.xml'],
     'bootstrap': True,
 }
diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py
index 7948e737327..4cb8e5b75f0 100644
--- a/addons/auth_signup/controllers/main.py
+++ b/addons/auth_signup/controllers/main.py
@@ -21,77 +21,71 @@
 import logging
 
 import openerp
+import openerp.addons.web.controllers.main as webmain
 from openerp import http
 from openerp.http import request, LazyResponse
-from openerp.modules.registry import RegistryManager
-from ..res_users import SignupError
+from openerp.tools.translate import _
 
 _logger = logging.getLogger(__name__)
 
 class Home(openerp.addons.web.controllers.main.Home):
 
-    @http.route('/web/login', type='http', auth="none")
+    @http.route()
     def web_login(self, *args, **kw):
-        response = super(Home, self).web_login(*args, **kw)
-        if isinstance(response, LazyResponse):
-            config = self.get_auth_signup_config(request.session.db)
-            response.params['values'].update(config)
-            if request.params.get('signup', None) and config['signup']:
-                response.params['template'] = 'auth_signup.signup'
-            if request.params.get('reset', None) and config['signup']:
-                response.params['template'] = 'auth_signup.reset'
+        # TODO: ensure_db()
+        request.disable_db = False
+
+        mode = request.params.get('mode')
+        qcontext = request.params.copy()
+        response = webmain.render_bootstrap_template(request.session.db, 'auth_signup.signup', qcontext, lazy=True)
+        token = qcontext.get('token', None)
+        token_infos = None
+        if token:
+            try:
+                # retrieve the user info (name, login or email) corresponding to a signup token
+                res_partner = request.registry.get('res.partner')
+                token_infos = res_partner.signup_retrieve_info(request.cr, openerp.SUPERUSER_ID, token)
+                for k, v in token_infos.items():
+                    qcontext.setdefault(k, v)
+            except:
+                qcontext['error'] = _("Invalid signup token")
+                response.params['template'] = 'web.login'
+                return response
+
+        # retrieve the module config (which features are enabled) for the login page
+        icp = request.registry.get('ir.config_parameter')
+        config = {
+            'signup': icp.get_param(request.cr, openerp.SUPERUSER_ID, 'auth_signup.allow_uninvited') == 'True',
+            'reset': icp.get_param(request.cr, openerp.SUPERUSER_ID, 'auth_signup.reset_password') == 'True',
+        }
+        qcontext.update(config)
+
+        if 'error' in qcontext or mode not in ('reset', 'signup') or (not token and not config[mode]):
+            response = super(Home, self).web_login(*args, **kw)
+            if isinstance(response, LazyResponse):
+                response.params['values'].update(config)
+            return response
+
+        if request.httprequest.method == 'GET':
+            if token_infos:
+                qcontext.update(token_infos)
+        else:
+            res_users = request.registry.get('res.users')
+            login = request.params.get('login')
+            if mode == 'reset' and not token:
+                try:
+                    res_users.reset_password(request.cr, openerp.SUPERUSER_ID, login)
+                    qcontext['message'] = _("An email has been sent with credentials to reset your password")
+                    response.params['template'] = 'web.login'
+                except:
+                    qcontext['error'] = _("Could not reset your password")
+                    _logger.exception('error when resetting password')
+            else:
+                values = {key: qcontext.get(key) for key in ('login', 'name', 'password')}
+                res_users.signup(request.cr, openerp.SUPERUSER_ID, values, token)
+                request.cr.commit()
+                return super(Home, self).web_login(*args, **kw)
+
         return response
 
-    def get_auth_signup_config(self, dbname):
-        """ retrieve the module config (which features are enabled) for the login page """
-        registry = RegistryManager.get(dbname)
-        with registry.cursor() as cr:
-            icp = registry.get('ir.config_parameter')
-            config = {
-                'signup': icp.get_param(cr, openerp.SUPERUSER_ID, 'auth_signup.allow_uninvited') == 'True',
-                'reset_password': icp.get_param(cr, openerp.SUPERUSER_ID, 'auth_signup.reset_password') == 'True',
-            }
-        return config
-
-class Controller(http.Controller):
-
-    @http.route('/auth_signup/retrieve', type='json', auth="none")
-    def retrieve(self, dbname, token):
-        """ retrieve the user info (name, login or email) corresponding to a signup token """
-        registry = RegistryManager.get(dbname)
-        with registry.cursor() as cr:
-            res_partner = registry.get('res.partner')
-            user_info = res_partner.signup_retrieve_info(cr, openerp.SUPERUSER_ID, token)
-        return user_info
-
-    @http.route('/auth_signup/signup', type='json', auth="none")
-    def signup(self, dbname, token, **values):
-        """ sign up a user (new or existing)"""
-        try:
-            self._signup_with_values(dbname, token, values)
-        except SignupError, e:
-            return {'error': openerp.tools.exception_to_unicode(e)}
-        return {}
-
-    def _signup_with_values(self, dbname, token, values):
-        registry = RegistryManager.get(dbname)
-        with registry.cursor() as cr:
-            res_users = registry.get('res.users')
-            res_users.signup(cr, openerp.SUPERUSER_ID, values, token)
-
-    @http.route('/auth_signup/reset_password', type='json', auth="none")
-    def reset_password(self, dbname, login):
-        """ retrieve user, and perform reset password """
-        registry = RegistryManager.get(dbname)
-        with registry.cursor() as cr:
-            try:
-                res_users = registry.get('res.users')
-                res_users.reset_password(cr, openerp.SUPERUSER_ID, login)
-                cr.commit()
-            except Exception as e:
-                # signup error
-                _logger.exception('error when resetting password')
-                raise(e)
-        return True
-
 # vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py
index 0379cd2c0c1..37ad9f68fe4 100644
--- a/addons/auth_signup/res_users.py
+++ b/addons/auth_signup/res_users.py
@@ -69,7 +69,8 @@ class res_partner(osv.Model):
             # the parameters to encode for the query
             query = dict(db=cr.dbname)
             signup_type = context.get('signup_force_type_in_url', partner.signup_type or '')
-            query[signup_type] = 1
+            if signup_type:
+                query['mode'] = signup_type
 
             if partner.signup_token and signup_type:
                 query['token'] = partner.signup_token
diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js
index b5e6f91b139..a317440fd6b 100644
--- a/addons/auth_signup/static/src/js/auth_signup.js
+++ b/addons/auth_signup/static/src/js/auth_signup.js
@@ -1,188 +1,19 @@
 openerp.auth_signup = function(instance) {
-    instance.auth_signup = instance.auth_signup || {};
-    var _t = instance.web._t;
-
-    return;
-
-    instance.web.Login.include({
-        start: function() {
+    openerp.web.LoginForm.include({
+        start: function () {
             var self = this;
-            this.signup_enabled = false;
-            this.reset_password_enabled = false;
-            return this._super().always(function() {
-
-                // Switches the login box to the select mode whith mode == [default|signup|reset]
-                self.on('change:login_mode', self, function() {
-                    var mode = self.get('login_mode') || 'default';
-                    self.$('*[data-modes]').each(function() {
-                        var modes = $(this).data('modes').split(/\s+/);
-                        $(this).toggle(modes.indexOf(mode) > -1);
-                    });
-                    self.$('a.oe_signup_signup:visible').toggle(self.signup_enabled);
-                    self.$('a.oe_signup_reset_password:visible').toggle(self.reset_password_enabled);
-                });
-
-                // to switch between the signup and regular login form
-                self.$('a.oe_signup_signup').click(function(ev) {
-                    self.set('login_mode', 'signup');
+            this.$el.on('submit', function () {
+                var password = self.get_password_field('password');
+                var confirm_password = self.get_password_field('confirm_password');
+                if (password && confirm_password && (password.value != confirm_password.value)) {
+                    alert("Passwords do not match; please retype them.");
                     return false;
-                });
-                self.$('a.oe_signup_back').click(function(ev) {
-                    self.set('login_mode', 'default');
-                    delete self.params.token;
-                    return false;
-                });
-
-                var dbname = self.selected_db;
-
-                // if there is an error message in params, show it then forget it
-                if (self.params.error_message) {
-                    self.show_error(self.params.error_message);
-                    delete self.params.error_message;
-                }
-
-                if (dbname && self.params.login) {
-                    self.$("form input[name=login]").val(self.params.login);
-                }
-
-                // bind reset password link
-                self.$('a.oe_signup_reset_password').click(self.do_reset_password);
-
-                if (dbname) {
-                    self.rpc("/auth_signup/get_config", {dbname: dbname}).then(function(result) {
-                        self.signup_enabled = result.signup;
-                        self.reset_password_enabled = result.reset_password;
-                        if (!self.signup_enabled || self.$("form input[name=login]").val()){
-                            self.set('login_mode', self.params.type || 'default');
-                        } else {
-                            self.set('login_mode', 'signup');
-                        }
-
-                        // in case of a signup, retrieve the user information from the token
-                        if (self.params.token) {
-                            self.rpc("/auth_signup/retrieve", {dbname: dbname, token: self.params.token})
-                                .then(self.on_token_loaded, self.on_token_failed);
-                        }
-
-                    });
-                } else {
-                    // TODO: support multiple database mode
-                    self.set('login_mode', self.params.type || 'default');
                 }
             });
         },
-
-        on_token_loaded: function(result) {
-            // select the right the database
-            this.selected_db = result.db;
-            this.on_db_loaded([result.db]);
-            if (result.token) {
-                // switch to signup mode, set user name and login
-                this.set('login_mode', (this.params.type === 'reset' ? 'reset' : 'signup'));
-                this.$("form input[name=name]").val(result.name).attr("readonly", "readonly");
-                if (result.login) {
-                    this.$("form input[name=login]").val(result.login).attr("readonly", "readonly");
-                } else {
-                    this.$("form input[name=login]").val(result.email);
-                }
-            } else {
-                // remain in login mode, set login if present
-                delete this.params.token;
-                this.set('login_mode', 'default');
-                this.$("form input[name=login]").val(result.login || "");
-            }
-        },
-
-        on_token_failed: function(result, ev) {
-            if (ev) {
-                ev.preventDefault();
-            }
-            this.show_error(_t("Invalid signup token"));
-            delete this.params.db;
-            delete this.params.token;
-            this.set('login_mode', 'default');
-        },
-
-        get_params: function(){
-            // signup user (or reset password)
-            var db = this.$("form [name=db]").val();
-            var name = this.$("form input[name=name]").val();
-            var login = this.$("form input[name=login]").val();
-            var password = this.$("form input[name=password]").val();
-            var confirm_password = this.$("form input[name=confirm_password]").val();
-            if (!db) {
-                this.do_warn(_t("Login"), _t("No database selected !"));
-                return false;
-            } else if (!name) {
-                this.do_warn(_t("Login"), _t("Please enter a name."));
-                return false;
-            } else if (!login) {
-                this.do_warn(_t("Login"), _t("Please enter a username."));
-                return false;
-            } else if (!password || !confirm_password) {
-                this.do_warn(_t("Login"), _t("Please enter a password and confirm it."));
-                return false;
-            } else if (password !== confirm_password) {
-                this.do_warn(_t("Login"), _t("Passwords do not match; please retype them."));
-                return false;
-            }
-            var params = {
-                dbname : db,
-                token: this.params.token || "",
-                name: name,
-                login: login,
-                password: password,
-            };
-            return params;
-        },
-
-        on_submit: function(ev) {
-            if (ev) {
-                ev.preventDefault();
-            }
-            var login_mode = this.get('login_mode');
-            if (login_mode === 'signup' || login_mode === 'reset') {
-                var params = this.get_params();
-                if (_.isEmpty(params)){
-                    return false;
-                }
-                var self = this,
-                    super_ = this._super;
-                this.rpc('/auth_signup/signup', params)
-                    .done(function(result) {
-                        if (result.error) {
-                            self.show_error(result.error);
-                        } else {
-                            super_.apply(self, [ev]);
-                        }
-                    });
-            } else {
-                // regular login
-                this._super(ev);
-            }
-        },
-
-        do_reset_password: function(ev) {
-            if (ev) {
-                ev.preventDefault();
-            }
-            var self = this;
-            var db = this.$("form [name=db]").val();
-            var login = this.$("form input[name=login]").val();
-            if (!db) {
-                this.do_warn(_t("Login"), _t("No database selected !"));
-                return $.Deferred().reject();
-            } else if (!login) {
-                this.do_warn(_t("Login"), _t("Please enter a username or email address."));
-                return $.Deferred().reject();
-            }
-            return self.rpc("/auth_signup/reset_password", { dbname: db, login: login }).done(function(result) {
-                self.show_error(_t("An email has been sent with credentials to reset your password"));
-                self.set('login_mode', 'default');
-            }).fail(function(result, ev) {
-                ev.preventDefault();
-                self.show_error(result.message);
-            });
+        get_password_field: function (field) {
+            var selector = 'input[name="' + field + '"][type="password"]:visible';
+            return this.$(selector)[0];
         },
     });
 };
diff --git a/addons/auth_signup/static/src/xml/auth_signup.xml b/addons/auth_signup/static/src/xml/auth_signup.xml
deleted file mode 100644
index 1c41dbed181..00000000000
--- a/addons/auth_signup/static/src/xml/auth_signup.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vim:fdl=1:
--->
-<templates id="template" xml:space="preserve">
-
-    <t t-extend="Login">
-        <t t-jquery="form ul:first li:contains('Username')" t-operation="before">
-            <li data-modes="signup reset">Name</li>
-            <li data-modes="signup reset"><input name="name" type="text"/></li>
-        </t>
-        <t t-jquery="form ul:first li:contains('Username')" t-operation="replace">
-            <li data-modes="default">Username</li>
-            <li data-modes="signup reset">Username (Email)</li>
-        </t>
-        <t t-jquery="form ul:first li:has(input[name=login], input[name=password]), form ul:first li:contains('Password')">
-            this.attr('data-modes', 'default signup reset');
-        </t>
-        <t t-jquery="form ul:first li:has(input[name=password])" t-operation="after">
-            <li data-modes="signup reset">Confirm Password</li>
-            <li data-modes="signup reset"><input name="confirm_password" type="password"/></li>
-        </t>
-        <t t-jquery="form ul:first li:has(button[name=submit])" t-operation="replace">
-            <li>
-                <button name="submit">
-                    <span data-modes="default">Log in</span>
-                    <span data-modes="signup">Sign Up</span>
-                    <span data-modes="reset">Reset password</span>
-                </button>
-                <a class="oe_signup_signup" data-modes="default" href="#">Sign Up</a>
-                <a class="oe_signup_back" data-modes="signup reset" href="#">Back to Login</a>
-                <a class="oe_signup_reset_password" data-modes="default" href="#">Reset password</a>
-            </li>
-        </t>
-        <t t-jquery=".oe_login_manage_db">
-            this.attr('data-modes', 'default');
-        </t>
-    </t>
-
-</templates>
diff --git a/addons/auth_signup/views/auth_signup_login.xml b/addons/auth_signup/views/auth_signup_login.xml
index 38aef1e2099..9f5d88eb33a 100644
--- a/addons/auth_signup/views/auth_signup_login.xml
+++ b/addons/auth_signup/views/auth_signup_login.xml
@@ -5,8 +5,8 @@
     <data>
         <template id="auth_signup.login" inherit_id="web.login" name="Login (overloaded by auth_signup)">
             <xpath expr="//button[@type='submit']" position="before">
-                <a t-if="signup" href="/web/login?signup=1" class="btn btn-default pull-left">Sign up</a>
-                <a t-if="reset_password" href="/web/login?reset=1" class="btn btn-default pull-left">Reset Password</a>
+                <a t-if="signup" t-attf-href="?mode=signup{{ '&amp;debug' if debug else '' }}" class="btn btn-default pull-left">Sign up</a>
+                <a t-if="reset" t-attf-href="?mode=reset{{ '&amp;debug' if debug else '' }}" class="btn btn-default pull-left">Reset Password</a>
             </xpath>
         </template>
 
@@ -20,40 +20,58 @@
                         <script type="text/javascript" t-att-src="js_file"></script>
                     </t>
                 </t>
+                <script type="text/javascript">
+                    $(function() {
+                        var s = new openerp.init(<t t-raw="modules"/>);
+                        var login_form = new openerp.web.LoginForm($('.oe_signup_form'));
+                    });
+                </script>
+
+                <t t-set="reset_without_token" t-value="mode == 'reset' and not token"/>
 
                 <form class="oe_signup_form" role="form" t-attf-action="/web/login{{ '?debug' if debug else '' }}" method="post">
-                    <div class="form-group field-name">
+                    <div class="form-group field-name" t-if="not reset_without_token">
                         <label for="name" class="control-label">Name</label>
-                        <input type="text" name="name" t-att-value="name" id="name" class="form-control" placeholder="Enter your name" required="required" autofocus="autofocus"/>
+                        <input type="text" name="name" t-att-value="name" id="name" class="form-control" placeholder="Enter your name"
+                            required="required" autofocus="autofocus" t-att-disabled="'disabled' if mode == 'reset' and token else None"/>
                     </div>
 
                     <div class="form-group field-login">
                         <label for="login" class="control-label">Username (email)</label>
-                        <input type="text" name="login" t-att-value="login" id="login" class="form-control" placeholder="Enter login" required="required"/>
+                        <input type="text" name="login" t-att-value="login" id="login" class="form-control" placeholder="Enter login"
+                            t-att-autofocus="'autofocus' if reset_without_token else None"
+                            required="required" t-att-disabled="'disabled' if mode == 'reset' and token else None"/>
+                        <input type="hidden" name="login" t-att-value="login" t-if="mode == 'reset' and token"/>
                     </div>
 
-                    <div class="form-group field-password">
+                    <div class="form-group field-password" t-if="not reset_without_token">
                         <label for="password" class="control-label">Password</label>
-                        <input type="password" name="password" id="password" class="form-control" placeholder="Password" required="required"/>
+                        <input type="password" name="password" id="password" class="form-control" placeholder="Password"
+                            required="required" t-att-autofocus="'autofocus' if mode == 'reset' and token else None"/>
                     </div>
 
-                    <div class="form-group field-confirm_password">
+                    <div class="form-group field-confirm_password" t-if="not reset_without_token">
                         <label for="confirm_password" class="control-label">Confirm Password</label>
                         <input type="password" name="confirm_password" id="confirm_password" class="form-control" placeholder="Confirm your password" required="required"/>
                     </div>
 
-                    <div class="oe_login_messages">
-                        <p class="alert alert-danger" t-if="authentication_failed">
-                            Wrong login/password
-                        </p>
-                    </div>
+                    <p class="alert alert-danger" t-if="error">
+                        <t t-esc="error"/>
+                    </p>
+                    <p class="alert alert-success" t-if="message">
+                        <t t-esc="message"/>
+                    </p>
 
                     <hr/>
                     <input type="hidden" name="redirect" t-att-value="redirect"/>
-                    <input type="hidden" name="signup" value="1"/>
+                    <input type="hidden" name="mode" t-att-value="mode"/>
+                    <input type="hidden" name="token" t-att-value="token"/>
                     <div class="clearfix oe_login_buttons">
                         <a href="/web/login" class="btn btn-default pull-left">Back to Login</a>
-                        <button type="submit" class="btn btn-primary pull-right">Signup</button>
+                        <button type="submit" class="btn btn-primary pull-right">
+                            <t t-if="mode == 'signup'">Signup</t>
+                            <t t-if="mode == 'reset'">Reset password</t>
+                        </button>
                     </div>
 
                 </form>

From 060cbedfb011ea71b5eb82fdc5996b2653a6982c Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 22 Jan 2014 09:59:48 +0100
Subject: [PATCH 09/20] [IMP] Sign in shall not redirect to website

bzr revid: fme@openerp.com-20140122085948-18tzsgz2p7f2zqpl
---
 addons/website/views/website_templates.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 31c0a3ca25f..cb6f590fd4a 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -251,7 +251,7 @@
     <xpath expr="//ul[@id='top_menu']" position="inside">
         <li class="divider" t-if="user_id.id == website.public_user.id"/>
         <li t-if="user_id.id == website.public_user.id">
-            <a t-attf-href="/web/login?redirect=#{ quote_plus(url_for('', keep_query='*')) }">
+            <a t-attf-href="/web/login">
                 <b>Sign in</b>
             </a>
         </li>

From e6c54ca92431fa8d57495d1fc5aec3f630214fdb Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 22 Jan 2014 11:04:03 +0100
Subject: [PATCH 10/20] [REV] website: ui_test_runner log

bzr revid: chm@openerp.com-20140122100403-6w2pek1cbmhhra0j
---
 addons/website/tests/ui_suite/ui_test_runner.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/website/tests/ui_suite/ui_test_runner.js b/addons/website/tests/ui_suite/ui_test_runner.js
index e8f38ebb9d9..3ba8cc3cb43 100644
--- a/addons/website/tests/ui_suite/ui_test_runner.js
+++ b/addons/website/tests/ui_suite/ui_test_runner.js
@@ -9,8 +9,7 @@ function waitFor (ready, callback, timeout, timeoutMessageCallback) {
             if(!condition) {
                 var message = timeoutMessageCallback ? timeoutMessageCallback() : "Timeout after "+timeout+" ms";
                 console.log('{ "event": "error", "message": "'+message+'" }');
-                var json = { "event": "error", "message": "Waiting for...\n"+ready };
-                console.log(JSON.stringify(json));
+                console.log("Waiting for...\n"+ready);
                 phantom.exit(1);
             } else {
                 clearInterval(interval);

From 8256bdfe448b4c55c2c747cae03acf5b19912fdb Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 22 Jan 2014 12:20:41 +0100
Subject: [PATCH 11/20] [IMP] website: add a log report in tour test

bzr revid: chm@openerp.com-20140122112041-id595hkptgzoym6w
---
 addons/website/static/src/js/website.tour.js  | 44 +++++++++++++++----
 .../website/tests/ui_suite/ui_test_runner.js  |  3 ++
 .../static/src/js/website.tour.shop.js        |  3 +-
 .../website_sale-sale_process-test.js         |  2 +-
 4 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js
index 7e8d2aea7a0..02ffecba335 100644
--- a/addons/website/static/src/js/website.tour.js
+++ b/addons/website/static/src/js/website.tour.js
@@ -295,6 +295,7 @@
         },
     });
 
+
     website.EditorBar.include({
         tours: [],
         init: function () {
@@ -340,13 +341,23 @@
                     window.onbeforeunload = function () {
                         clearTimeout(overlapsCrash);
                     };
+                    function throwError (message) {
+                        console.log(JSON.parse(window.localStorage.getItem("test-report")));
+                        test.reset();
+                        throw message;
+                    }
                     function executeStep (step) {
+                        // check if they are a cycle
                         var lastStep = window.localStorage.getItem(testId);
-                        var tryStep = lastStep != step.stepId ? 0 : parseInt(window.localStorage.getItem("last-"+testId) || 0, 10)+1;
-                        window.localStorage.setItem("last-"+testId, tryStep);
+                        var tryStep = lastStep != step.stepId ? 0 : (+(window.localStorage.getItem("test-last-"+testId) || 0) + 1);
+                        window.localStorage.setItem("test-last-"+testId, tryStep);
                         if (tryStep > 2) {
-                            window.localStorage.removeItem(testId);
-                            throw "Test: '" + testId + "' cycling step: '" + step.stepId + "'";
+                            throwError("Test: '" + testId + "' cycling step: '" + step.stepId + "'");
+                        }
+
+                        // set last time for report
+                        if (tryStep == 0 || !window.localStorage.getItem("test-last-time")) {
+                            window.localStorage.setItem("test-last-time", new Date().getTime());
                         }
 
                         var _next = false;
@@ -354,6 +365,12 @@
                         function next () {
                             clearTimeout(overlapsCrash);
                             _next = true;
+
+                            // set report
+                            var report = JSON.parse(window.localStorage.getItem("test-report")) || {};
+                            report[step.stepId] = (new Date().getTime() - window.localStorage.getItem("test-last-time")) + " ms";
+                            window.localStorage.setItem("test-report", JSON.stringify(report));
+
                             var nextStep = actionSteps.shift();
                             if (nextStep) {
                                 setTimeout(function () {
@@ -364,12 +381,17 @@
                             }
                         }
                         overlapsCrash = setTimeout(function () {
-                            window.localStorage.removeItem(testId);
-                            throw "Test: '" + testId + "' can't resolve step: '" + step.stepId + "'";
-                        }, (step.delay || defaultDelay) + 500);
+                            throwError("Test: '" + testId + "' can't resolve step: '" + step.stepId + "'");
+                        }, (step.delay || defaultDelay) + 1000);
 
                         var $element = $(step.element);
-                        if (step.triggers) step.triggers(next);
+                        if (step.triggers) {
+                            try {
+                                step.triggers(next);
+                            } catch (e) {
+                                throwError(e);
+                            }
+                        }
                         if ((step.trigger === 'reload' || (step.trigger && step.trigger.url)) && _next) return;
                         
                         if (step.snippet && step.trigger === 'drag') {
@@ -415,6 +437,12 @@
                 },
                 reset: function () {
                     window.localStorage.removeItem(testId);
+                    window.localStorage.removeItem("test-report");
+                    for (var k in window.localStorage) {
+                        if (window.localStorage[k].indexOf("test-last")) {
+                            window.localStorage.removeItem(k);
+                        }
+                    }
                 },
             };
             website.TestConsole.tests.push(test);
diff --git a/addons/website/tests/ui_suite/ui_test_runner.js b/addons/website/tests/ui_suite/ui_test_runner.js
index 3ba8cc3cb43..db61dedd6bd 100644
--- a/addons/website/tests/ui_suite/ui_test_runner.js
+++ b/addons/website/tests/ui_suite/ui_test_runner.js
@@ -10,6 +10,9 @@ function waitFor (ready, callback, timeout, timeoutMessageCallback) {
                 var message = timeoutMessageCallback ? timeoutMessageCallback() : "Timeout after "+timeout+" ms";
                 console.log('{ "event": "error", "message": "'+message+'" }');
                 console.log("Waiting for...\n"+ready);
+                if (window.localStorage.getItem("test-report")) {
+                    console.log(JSON.parse(website.localStorage.getItem("test-report")));
+                }
                 phantom.exit(1);
             } else {
                 clearInterval(interval);
diff --git a/addons/website_sale/static/src/js/website.tour.shop.js b/addons/website_sale/static/src/js/website.tour.shop.js
index 78643d1b110..d5d508ebaf9 100644
--- a/addons/website_sale/static/src/js/website.tour.shop.js
+++ b/addons/website_sale/static/src/js/website.tour.shop.js
@@ -292,8 +292,7 @@
                         url:   /shop\/confirmation\//,
                     },
                     afterTrigger: function (tour) {
-                        window.localStorage.setItem("test-success", "{}");
-                        throw "afterTrigger test finish, remove this throw";
+                        window.localStorage.setItem("shoptest-test-success", "true");
                     },
                 }
             ];
diff --git a/addons/website_sale/tests/ui_suite/website_sale-sale_process-test.js b/addons/website_sale/tests/ui_suite/website_sale-sale_process-test.js
index c1027107e44..82bab6158c9 100644
--- a/addons/website_sale/tests/ui_suite/website_sale-sale_process-test.js
+++ b/addons/website_sale/tests/ui_suite/website_sale-sale_process-test.js
@@ -17,7 +17,7 @@ testRunner.run(function websiteSaleTest (page, timeout) {
         waitFor(function testExecuted () {
             return page.evaluate(function () {
                 var res = window.localStorage && window.localStorage.getItem
-                    && window.localStorage.getItem("test-success");
+                    && window.localStorage.getItem("shoptest-test-success");
                 return res;
             });
         }, function finish () {

From d944a652dc73b0c9af4bb0a1672415320aabfef6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 22 Jan 2014 13:00:42 +0100
Subject: [PATCH 12/20] [FIX] product: when computing lst_price, that is the
 public price computed based on the template price + margin and extra, use the
 pricelist currency if a pricelist has been given. This alows for example to
 have 'promo' prices on the ecommerce that are in the same currency.

bzr revid: tde@openerp.com-20140122120042-ovh2mi70q0beeqwq
---
 addons/product/product.py                  | 17 +++++++++++++----
 addons/website_sale/views/website_sale.xml |  2 +-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/addons/product/product.py b/addons/product/product.py
index 163785459b4..50a7192458c 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -554,10 +554,15 @@ class product_product(osv.osv):
     _product_incoming_qty = _get_product_available_func(('confirmed','waiting','assigned'), ('in',))
 
     def _product_lst_price(self, cr, uid, ids, name, arg, context=None):
-        res = {}
+        res = dict.fromkeys(ids, 0.0)
         product_uom_obj = self.pool.get('product.uom')
-        for id in ids:
-            res.setdefault(id, 0.0)
+
+        # retrieve pricelist
+        pricelist = None
+        if context.get('pricelist'):
+            pricelist = self.pool['product.pricelist'].browse(cr, uid, context.get('pricelist'), context=context)
+            base_currency = self.pool['res.users'].browse(cr, uid, uid, context=context).company_id.currency_id
+
         for product in self.browse(cr, uid, ids, context=context):
             if 'uom' in context:
                 uom = product.uos_id or product.uom_id
@@ -565,7 +570,11 @@ class product_product(osv.osv):
                         uom.id, product.list_price, context['uom'])
             else:
                 res[product.id] = product.list_price
-            res[product.id] =  (res[product.id] or 0.0) * (product.price_margin or 1.0) + product.price_extra
+            res[product.id] = (res[product.id] or 0.0) * (product.price_margin or 1.0) + product.price_extra
+            # update the result, according to the eventual pricelist currency
+            if pricelist and pricelist.currency_id:
+                res[product.id] = self.pool['res.currency'].compute(
+                    cr, uid, base_currency.id, pricelist.currency_id.id, res[product.id], round=False, context=context)
         return res
 
     def _save_product_lst_price(self, cr, uid, product_id, field_name, field_value, arg, context=None):
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index 7a2920583b8..2c08a48cc7d 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -62,7 +62,7 @@
       <h5><strong><a t-href="/shop/product/#{ slug(product) }/" t-keep-query="category,search,filters" t-field="product.name"/></strong></h5>
       <div class="product_price" t-if="product.product_variant_ids">
           <b>
-              <t t-if="product.product_variant_ids[0].lst_price != product.product_variant_ids[0].price">
+              <t t-if="abs(product.product_variant_ids[0].lst_price - product.product_variant_ids[0].price) &gt; 0.2">
                 <del class="text-danger"
                   t-field="product.product_variant_ids[0].lst_price" t-field-options='{
                        "widget": "monetary",

From d724f0019891b79584160c66ce19c1a74ac09be8 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 22 Jan 2014 13:48:09 +0100
Subject: [PATCH 13/20] [FIX] website_sale: promo code

bzr revid: chm@openerp.com-20140122124809-9xha1jsnnxaod65z
---
 addons/website_sale/controllers/main.py    |  9 +++----
 addons/website_sale/models/website.py      |  9 +++++--
 addons/website_sale/tests/test_ui.py       |  2 +-
 addons/website_sale/views/website_sale.xml | 28 ++++++++++++++--------
 4 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index caa9aad7846..a54fa2a1a7a 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -191,10 +191,9 @@ class Ecommerce(http.Controller):
         return [r["product_tmpl_id"][0] for r in att]
 
     @http.route(['/shop/pricelist'], type='http', auth="public", website=True, multilang=True)
-    def shop_promo(self, code, **post):
-        assert code, 'No pricelist code provided'
-        request.registry['website']._ecommerce_change_pricelist(request.cr, request.uid, code=code, context=request.context)
-        return request.redirect("/shop")
+    def shop_promo(self, promo=None, **post):
+        request.registry['website']._ecommerce_change_pricelist(request.cr, request.uid, code=promo, context=request.context)
+        return request.redirect("/shop/mycart/")
 
     @http.route([
         '/shop/',
@@ -708,6 +707,8 @@ class Ecommerce(http.Controller):
         order = request.registry['sale.order'].browse(cr, SUPERUSER_ID, sale_order_id, context=context)
         assert order.website_session_id == request.httprequest.session['website_session_id']
 
+        self._ecommerce_change_pricelist(cr, uid, None, context=None)
+
         return request.website.render("website_sale.confirmation", {'order': order})
 
     @http.route(['/shop/change_sequence/'], type='json', auth="public", website=True)
diff --git a/addons/website_sale/models/website.py b/addons/website_sale/models/website.py
index 55ec48a98e4..178cf6c89e2 100644
--- a/addons/website_sale/models/website.py
+++ b/addons/website_sale/models/website.py
@@ -51,7 +51,7 @@ class Website(orm.Model):
             values.update(order.onchange_pricelist_id(pricelist_id, None)['value'])
             order.write(values)
             for line in order.order_line:
-                self.add_product_to_cart(order_line_id=line.id, number=0)
+                self._ecommerce_add_product_to_cart(cr, uid, order_line_id=line.id, number=0)
 
     # ************************************************************
     # Ecommerce quotation management
@@ -65,7 +65,7 @@ class Website(orm.Model):
         order_line_obj = self.pool.get('sale.order.line')
         order_obj = self.pool.get('sale.order')
 
-        context = dict(context, pricelist=self.ecommerce_get_pricelist_id(cr, uid, None, context=context))
+        context = dict(context or {}, pricelist=self.ecommerce_get_pricelist_id(cr, uid, None, context=context))
 
         # set order_line_id and product_id
         if order_line_id:
@@ -122,6 +122,11 @@ class Website(orm.Model):
         else:
             order_line_id = order_line_obj.create(cr, SUPERUSER_ID, values, context=context)
             order_obj.write(cr, SUPERUSER_ID, [order.id], {'order_line': [(4, order_line_id)]}, context=context)
+
+        order = self.ecommerce_get_current_order(cr, uid, context=context)
+        if not order or not order.order_line:
+            self._ecommerce_change_pricelist(cr, uid, None, context=context)
+
         return quantity
 
     def _ecommerce_get_quotation_values(self, cr, uid, context=None):
diff --git a/addons/website_sale/tests/test_ui.py b/addons/website_sale/tests/test_ui.py
index 68ba5dc0a05..bda42eb1bd7 100644
--- a/addons/website_sale/tests/test_ui.py
+++ b/addons/website_sale/tests/test_ui.py
@@ -2,5 +2,5 @@ import openerp.addons.website.tests.test_ui as test_ui
 
 def load_tests(loader, base, _):
     base.addTest(test_ui.WebsiteUiSuite(test_ui.full_path(__file__,'website_sale-sale_process-test.js'),
-        { 'action': 'website.action_website_homepage' }, 60.0))
+        { 'action': 'website.action_website_homepage' }, 120.0))
     return base
\ No newline at end of file
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index 2c08a48cc7d..096d554441b 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -500,13 +500,14 @@
                                   <div class="text-muted" t-field="line.product_id.description_sale"/>
                               </td>
                               <td class="text-center">
-                                 <del class="text-danger" t-if="line.product_id.lst_price &gt; line.price_unit">
-                                     <span t-field="line.product_id.lst_price" t-field-options='{
+                                <t t-if="abs(line.product_id.lst_price - line.price_unit) &gt; 0.2">
+                                  <del class="text-danger"
+                                    t-field="line.product_id.lst_price" t-field-options='{
                                          "widget": "monetary",
                                          "display_currency": "website.pricelist_id.currency_id"
-                                     }'/>
-                                 </del>
-                                 <span t-field="line.price_unit" t-field-options='{
+                                    }'/>&amp;nbsp;
+                                </t>
+                                <span t-field="line.price_unit"  t-field-options='{
                                      "widget": "monetary",
                                      "display_currency": "website.pricelist_id.currency_id"
                                  }'/>
@@ -654,10 +655,17 @@
                       <div class="text-muted" t-field="product.description_sale"/>
                   </td>
                   <td>
-                      <span t-field="product.lst_price" t-field-options='{
-                          "widget": "monetary",
-                          "display_currency": "website.pricelist_id.currency_id"
-                      }'/>
+                      <t t-if="abs(product.lst_price - product.price) &gt; 0.2">
+                        <del class="text-danger"
+                          t-field="product.lst_price" t-field-options='{
+                               "widget": "monetary",
+                               "display_currency": "website.pricelist_id.currency_id"
+                          }'/>&amp;nbsp;
+                      </t>
+                      <span t-field="product.price"  t-field-options='{
+                           "widget": "monetary",
+                           "display_currency": "website.pricelist_id.currency_id"
+                       }'/>
                   </td>
                   <td class="text-center">
                       <form action="/shop/add_cart/" method="post">
@@ -677,7 +685,7 @@
       <p>
           Have a coupon code? Fill in this field and apply.
       </p>
-      <form t-if="website_sale_order and website_sale_order.website_order_line" action="/shop/mycart/" method="post" class="mb32">
+      <form t-if="website_sale_order and website_sale_order.website_order_line" action="/shop/pricelist/" method="post" class="mb32">
           <div class="input-group">
               <input name="promo" class='form-control' type="text" placeholder="code..." t-att-value="website_sale_order.pricelist_id.code or ''"/>
               <div class="input-group-btn">

From 6979de83cb807b153a264872ee3c641641393626 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 22 Jan 2014 14:21:59 +0100
Subject: [PATCH 14/20] [FIX] website snippet vs widget on drop

bzr revid: chm@openerp.com-20140122132159-efse87uk30t0tehv
---
 addons/website/static/src/js/website.editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index f5a1c845f28..7cd3a4be67b 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -836,7 +836,7 @@
                     .on('snippet-dropped', function (e, el) {
                         // CKEDITOR data processor extended by widgets plugin
                         // to add wrappers around upcasting elements
-                        el.outerHTML = editor.dataProcessor.toHtml(el.outerHTML, {
+                        el.innerHTML = editor.dataProcessor.toHtml(el.innerHTML, {
                             fixForBody: false,
                             dontFilter: true,
                         });

From bdc12662647866a2f6e18d72235f7fbd9602f98f Mon Sep 17 00:00:00 2001
From: "ddm@openerp.com" <>
Date: Wed, 22 Jan 2014 14:23:38 +0100
Subject: [PATCH 15/20] [FIX] HTML editor, reopen template

bzr revid: ddm@openerp.com-20140122132338-4mhth5fzy8iijxja
---
 addons/website/static/src/js/website.ace.js | 25 ++++++++++-----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/addons/website/static/src/js/website.ace.js b/addons/website/static/src/js/website.ace.js
index 4ff5aa44146..fba8be0c3f9 100644
--- a/addons/website/static/src/js/website.ace.js
+++ b/addons/website/static/src/js/website.ace.js
@@ -94,11 +94,18 @@
             }).then(function (views) {
                 self.loadViews.call(self, views);
                 self.open.call(self);
-                // cf. fp's direct request
-	            if (views.length >= 2) {
-	            	var mainTemplate = views[1];
-	            	self.$('#ace-view-list').val(mainTemplate.id).trigger('change');
-	            }
+                var curentHash = window.location.hash;
+                var indexOfView = curentHash.indexOf("?view=");
+                if (indexOfView >= 0) {
+                    var viewId = parseInt(curentHash.substring(indexOfView + 6, curentHash.length), 10);
+                    self.$('#ace-view-list').val(viewId).change();
+                } else {
+                    if (views.length >= 2) {
+                        var mainTemplate = views[1];
+                        self.$('#ace-view-list').val(mainTemplate.id).trigger('change');
+                    }
+                    window.location.hash = hash;
+                }
             });
 
             var $editor = self.$('.ace_editor');
@@ -282,14 +289,6 @@
         },
         open: function () {
             this.$el.removeClass('oe_ace_closed').addClass('oe_ace_open');
-            var curentHash = window.location.hash;
-            var indexOfView = curentHash.indexOf("?view=");
-            if (indexOfView >= 0) {
-                var viewId = parseInt(curentHash.substring(indexOfView + 6, curentHash.length), 10);
-                this.$('#ace-view-list').val(viewId).change();
-            } else {
-                window.location.hash = hash;
-            }
         },
         close: function () {
             window.location.hash = "";

From 3ddf62ac83f80c439f087ab6859fd1ed2a8f80e5 Mon Sep 17 00:00:00 2001
From: "ddm@openerp.com" <>
Date: Wed, 22 Jan 2014 15:25:37 +0100
Subject: [PATCH 16/20] [FIX] HTML editor error reporting

bzr revid: ddm@openerp.com-20140122142537-as7tyryit0ft0p35
---
 addons/website/static/src/js/website.ace.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/website/static/src/js/website.ace.js b/addons/website/static/src/js/website.ace.js
index fba8be0c3f9..6433330e50e 100644
--- a/addons/website/static/src/js/website.ace.js
+++ b/addons/website/static/src/js/website.ace.js
@@ -260,7 +260,9 @@
             $.when.apply($, requests).then(function () {
                 self.reloadPage.call(self);
             }).fail(function (source, error) {
-                var message = (error.data.arguments[0] === "Access Denied") ? "Access denied: please sign in" : error.message;
+                var message = _.isString(error) ? error
+                    : (error.data.arguments[0] === "Access Denied") ? "Access denied: please sign in"
+                    : error.message;
                 self.displayError.call(self, message);
             });
         },
@@ -273,7 +275,7 @@
                     args: [[session.id], { 'arch':  xml.xml }, website.get_context()],
                 });
             } else {
-                return $.Deferred().fail("Malformed XML document");
+                return $.Deferred().reject(null, "Malformed XML document");
             }
         },
         updateHash: function () {

From 0c5b6caa10611fbb6958e60b19853686bfdc185e Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 22 Jan 2014 15:53:28 +0100
Subject: [PATCH 17/20] [FIX] website: payment get pricelist

bzr revid: chm@openerp.com-20140122145328-5xjhu5uublljqdkx
---
 addons/website/static/src/js/website.tour.js | 57 ++++++++++----------
 addons/website_sale/controllers/main.py      |  2 +-
 2 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js
index 02ffecba335..f58bd048e80 100644
--- a/addons/website/static/src/js/website.tour.js
+++ b/addons/website/static/src/js/website.tour.js
@@ -380,39 +380,42 @@
                                 window.localStorage.removeItem(testId);
                             }
                         }
+
                         overlapsCrash = setTimeout(function () {
                             throwError("Test: '" + testId + "' can't resolve step: '" + step.stepId + "'");
                         }, (step.delay || defaultDelay) + 1000);
 
-                        var $element = $(step.element);
-                        if (step.triggers) {
-                            try {
-                                step.triggers(next);
-                            } catch (e) {
-                                throwError(e);
+                        setTimeout(function () {
+                            var $element = $(step.element);
+                            if (step.triggers) {
+                                try {
+                                    step.triggers(next);
+                                } catch (e) {
+                                    throwError(e);
+                                }
                             }
-                        }
-                        if ((step.trigger === 'reload' || (step.trigger && step.trigger.url)) && _next) return;
-                        
-                        if (step.snippet && step.trigger === 'drag') {
-                            website.TestConsole.dragAndDropSnippet(step.snippet);
-                        } else if (step.trigger && step.trigger.id === 'change') {
-                            $element.trigger($.Event("change", { srcElement: $element }));
-                        } else if (step.sampleText) {
-                            $element.val(step.sampleText);
-                            $element.trigger($.Event("change", { srcElement: $element }));
-                        } else if ($element.is(":visible")) { // Click by default
-                            if (step.trigger.id === 'mousedown') {
-                                $element.trigger($.Event("mousedown", { srcElement: $element }));
+                            if ((step.trigger === 'reload' || (step.trigger && step.trigger.url)) && _next) return;
+                            
+                            if (step.snippet && step.trigger === 'drag') {
+                                website.TestConsole.dragAndDropSnippet(step.snippet);
+                            } else if (step.trigger && step.trigger.id === 'change') {
+                                $element.trigger($.Event("change", { srcElement: $element }));
+                            } else if (step.sampleText) {
+                                $element.val(step.sampleText);
+                                $element.trigger($.Event("change", { srcElement: $element }));
+                            } else if ($element.is(":visible")) { // Click by default
+                                if (step.trigger.id === 'mousedown') {
+                                    $element.trigger($.Event("mousedown", { srcElement: $element }));
+                                }
+                                var evt = document.createEvent("MouseEvents");
+                                evt.initMouseEvent("click", true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
+                                $element[0].dispatchEvent(evt);
+                                if (step.trigger.id === 'mouseup') {
+                                    $element.trigger($.Event("mouseup", { srcElement: $element }));
+                                }
                             }
-                            var evt = document.createEvent("MouseEvents");
-                            evt.initMouseEvent("click", true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
-                            $element[0].dispatchEvent(evt);
-                            if (step.trigger.id === 'mouseup') {
-                                $element.trigger($.Event("mouseup", { srcElement: $element }));
-                            }
-                        }
-                        if (!step.triggers) next();
+                            if (!step.triggers) next();
+                        },0);
                     }
                     var url = new website.UrlParser(window.location.href);
                     if (tour.path && url.pathname !== tour.path && !window.localStorage.getItem(testId)) {
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index a54fa2a1a7a..7b9d8f5eaa7 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -707,7 +707,7 @@ class Ecommerce(http.Controller):
         order = request.registry['sale.order'].browse(cr, SUPERUSER_ID, sale_order_id, context=context)
         assert order.website_session_id == request.httprequest.session['website_session_id']
 
-        self._ecommerce_change_pricelist(cr, uid, None, context=None)
+        request.registry['website']._ecommerce_change_pricelist(cr, uid, None, context=None)
 
         return request.website.render("website_sale.confirmation", {'order': order})
 

From 0fe979572b5a98e1c4d92c9c5e7bba01eb766e72 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 22 Jan 2014 15:58:21 +0100
Subject: [PATCH 18/20] [FIX] website_sale: test tour

bzr revid: chm@openerp.com-20140122145821-da1l5l5bji39j5mv
---
 addons/website_sale/static/src/js/website.tour.shop.js |  2 +-
 .../tests/ui_suite/website_sale-sale_process-test.js   | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/addons/website_sale/static/src/js/website.tour.shop.js b/addons/website_sale/static/src/js/website.tour.shop.js
index d5d508ebaf9..f6b64342c58 100644
--- a/addons/website_sale/static/src/js/website.tour.shop.js
+++ b/addons/website_sale/static/src/js/website.tour.shop.js
@@ -292,7 +292,7 @@
                         url:   /shop\/confirmation\//,
                     },
                     afterTrigger: function (tour) {
-                        window.localStorage.setItem("shoptest-test-success", "true");
+                        console.log('{ "event": "success" }');
                     },
                 }
             ];
diff --git a/addons/website_sale/tests/ui_suite/website_sale-sale_process-test.js b/addons/website_sale/tests/ui_suite/website_sale-sale_process-test.js
index 82bab6158c9..5554ea75271 100644
--- a/addons/website_sale/tests/ui_suite/website_sale-sale_process-test.js
+++ b/addons/website_sale/tests/ui_suite/website_sale-sale_process-test.js
@@ -14,15 +14,5 @@ testRunner.run(function websiteSaleTest (page, timeout) {
         page.evaluate(function () {
             window.openerp.website.TestConsole.test('shoptest').run(true);
         });
-        waitFor(function testExecuted () {
-            return page.evaluate(function () {
-                var res = window.localStorage && window.localStorage.getItem
-                    && window.localStorage.getItem("shoptest-test-success");
-                return res;
-            });
-        }, function finish () {
-            console.log('{ "event": "success" }');
-            phantom.exit();
-        }, 4*timeout/5);
     }, timeout/5);
 });
\ No newline at end of file

From 91f44259b6567e8db7addf8ef6e2937aa77c0a85 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 22 Jan 2014 16:18:52 +0100
Subject: [PATCH 19/20] [FIX] website_sale: ecommerce_change_pricelist context

bzr revid: chm@openerp.com-20140122151852-ia7x4sd5l2h7oskx
---
 addons/website_sale/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 7b9d8f5eaa7..b2a4d1eb57e 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -707,7 +707,7 @@ class Ecommerce(http.Controller):
         order = request.registry['sale.order'].browse(cr, SUPERUSER_ID, sale_order_id, context=context)
         assert order.website_session_id == request.httprequest.session['website_session_id']
 
-        request.registry['website']._ecommerce_change_pricelist(cr, uid, None, context=None)
+        request.registry['website']._ecommerce_change_pricelist(cr, uid, None, context=context or {})
 
         return request.website.render("website_sale.confirmation", {'order': order})
 

From f70e54255641f4d3d61777501b20b0f8c7a1fb77 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 22 Jan 2014 17:17:27 +0100
Subject: [PATCH 20/20] [CHG] python 2.6 compat'

bzr revid: xmo@openerp.com-20140122161727-0inchgb570e1r7pi
---
 addons/auth_signup/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py
index 4cb8e5b75f0..650268755e5 100644
--- a/addons/auth_signup/controllers/main.py
+++ b/addons/auth_signup/controllers/main.py
@@ -81,7 +81,7 @@ class Home(openerp.addons.web.controllers.main.Home):
                     qcontext['error'] = _("Could not reset your password")
                     _logger.exception('error when resetting password')
             else:
-                values = {key: qcontext.get(key) for key in ('login', 'name', 'password')}
+                values = dict((key, qcontext.get(key)) for key in ('login', 'name', 'password'))
                 res_users.signup(request.cr, openerp.SUPERUSER_ID, values, token)
                 request.cr.commit()
                 return super(Home, self).web_login(*args, **kw)