From df4a5a580b6ebd2201eb7db22d8d48c4adc41d36 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Mon, 9 Jul 2012 16:17:20 +0530
Subject: [PATCH 1/7] [IMP]If there is not available db, jump direclty in the
 db manager view (creation of a db) instead of staying in the login page.

bzr revid: sgo@tinyerp.com-20120709104720-0oi5975lfropyh4w
---
 addons/web/static/src/js/chrome.js | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index b87ebe56856..ffecd3289db 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -486,7 +486,7 @@ instance.web.Login =  instance.web.Widget.extend({
         var self = this;
 
         self.$element.find("form").submit(self.on_submit);
-
+        
         self.$element.find('.oe_login_manage_db').click(function() {
             self.$element.find('.oe_login_bottom').hide();
             self.$element.find('.oe_login_pane').hide();
@@ -515,12 +515,25 @@ instance.web.Login =  instance.web.Widget.extend({
         return d;
     },
     _db_list_loaded: function () {
+        var self = this;
         var list = this._db_list,
             dbdiv = this.$element.find('div.oe_login_dbpane');
         this.$element.find("[name=db]").replaceWith(instance.web.qweb.render('Login.dblist', { db_list: list, selected_db: this.selected_db}));
         if(list && list.length === 1) {
             dbdiv.hide();
-        } else {
+        }
+        if(list.length === 0){
+            self.$element.find('.oe_login_bottom').hide();
+            self.$element.find('.oe_login_pane').hide();
+            self.databasemanager = new instance.web.DatabaseManager(self);
+            self.databasemanager.appendTo(self.$element);
+            self.databasemanager.do_exit.add_last(function() {
+                self.databasemanager.destroy();
+                self.$element.find('.oe_login_bottom').show();
+                self.$element.find('.oe_login_pane').show();
+                });
+        }
+        else {
             dbdiv.show();
         }
     },

From 09a63068a2e800ff0079446283262f62c17cbcb8 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Tue, 10 Jul 2012 14:52:55 +0530
Subject: [PATCH 2/7] [IMP]minor imp

bzr revid: sgo@tinyerp.com-20120710092255-00eo11hm33ejhmnc
---
 addons/web/static/src/js/chrome.js | 34 +++++++++++++-----------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index ffecd3289db..ff9f2c89a0e 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -482,22 +482,26 @@ instance.web.Login =  instance.web.Widget.extend({
             }
         }
     },
+    open_db_manager: function(){
+        var self = this;
+        self.$element.find('.oe_login_bottom').hide();
+        self.$element.find('.oe_login_pane').hide();
+        self.databasemanager = new instance.web.DatabaseManager(self);
+        self.databasemanager.appendTo(self.$element);
+        self.databasemanager.do_exit.add_last(function() {
+            self.databasemanager.destroy();
+            self.$element.find('.oe_login_bottom').show();
+            self.$element.find('.oe_login_pane').show();
+            self.load_db_list(true).then(self.proxy('_db_list_loaded'));
+        });
+    },
     start: function() {
         var self = this;
 
         self.$element.find("form").submit(self.on_submit);
         
         self.$element.find('.oe_login_manage_db').click(function() {
-            self.$element.find('.oe_login_bottom').hide();
-            self.$element.find('.oe_login_pane').hide();
-            self.databasemanager = new instance.web.DatabaseManager(self);
-            self.databasemanager.appendTo(self.$element);
-            self.databasemanager.do_exit.add_last(function() {
-                self.databasemanager.destroy();
-                self.$element.find('.oe_login_bottom').show();
-                self.$element.find('.oe_login_pane').show();
-                self.load_db_list(true).then(self.proxy('_db_list_loaded'));
-            });
+            self.open_db_manager();
         });
         return self.load_db_list().then(self.proxy('_db_list_loaded'));
     },
@@ -523,15 +527,7 @@ instance.web.Login =  instance.web.Widget.extend({
             dbdiv.hide();
         }
         if(list.length === 0){
-            self.$element.find('.oe_login_bottom').hide();
-            self.$element.find('.oe_login_pane').hide();
-            self.databasemanager = new instance.web.DatabaseManager(self);
-            self.databasemanager.appendTo(self.$element);
-            self.databasemanager.do_exit.add_last(function() {
-                self.databasemanager.destroy();
-                self.$element.find('.oe_login_bottom').show();
-                self.$element.find('.oe_login_pane').show();
-                });
+            self.open_db_manager();
         }
         else {
             dbdiv.show();

From c321c37645d0de22252c7d9eb90bcff143eda159 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 13 Jul 2012 14:28:44 +0200
Subject: [PATCH 3/7] [FIX] stupid type fixed

bzr revid: fp@tinyerp.com-20120713122844-qnvoxlk6cms9b5gm
---
 addons/account_voucher/voucher_payment_receipt_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index b73538cddcc..98693a3f531 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -430,7 +430,7 @@
                         </page>
                     </notebook>
                     </sheet>
-                    <<div class="oe_chatter">
+                    <div class="oe_chatter">
                         <field name="message_ids" widget="mail_thread"/>
                     </div>
                 </form>

From 1176476743be0b76708358b416429006356f1876 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Fri, 13 Jul 2012 14:52:35 +0200
Subject: [PATCH 4/7] [FIX] more fixes for fabien's mess

bzr revid: fva@openerp.com-20120713125235-9m3rdccqoeq0pnw7
---
 addons/account_voucher/voucher_sales_purchase_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 31f91b22ce6..f26dd3ae38d 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -130,13 +130,13 @@
                                     <field name="narration" placeholder="Internal Notes" nolabel="1" />
                                 </group>
                                 <group>
-                                    <group class="oe_subtotal_<div class="oe_chatter">
+                                    <group class="oe_subtotal_footer" string="Total">
                                         <field name="tax_id" 
                                             on_change="onchange_price(line_cr_ids, tax_id, partner_id)"
                                             widget="selection"
                                             domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/>
                                         <field name="tax_amount" nolabel="1"/>
-                                        <field name="amount" class="oe_subtotal_div" />
+                                        <field name="amount" class="oe_subtotal_footer_separator" />
                                         <button type="object"
                                             icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax"
                                             attrs="{'invisible': [('state','!=','draft')]}"/>

From 71a5c53072341f784d1eb87e561f59823fbb1651 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Fri, 13 Jul 2012 16:57:40 +0200
Subject: [PATCH 5/7] [IMP] allow xml ids for action_id

bzr revid: al@openerp.com-20120713145740-xkwp0hxy7kou61f0
---
 addons/web/controllers/main.py     | 15 +++++++++++----
 addons/web/static/src/js/chrome.js |  2 +-
 addons/web/static/src/js/views.js  |  4 ++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 412ea9abda2..c559758d3f2 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1494,10 +1494,6 @@ class Binary(openerpweb.Controller):
 
 class Action(openerpweb.Controller):
     _cp_path = "/web/action"
-    
-    action_mapping = {
-        "ir.actions.act_url": "ir.actions.url",
-    }
 
     # For most actions, the type attribute and the model name are the same, but
     # there are exceptions. This dict is used to remap action type attributes
@@ -1511,6 +1507,17 @@ class Action(openerpweb.Controller):
         Actions = req.session.model('ir.actions.actions')
         value = False
         context = req.session.eval_context(req.context)
+
+        try:
+            action_id = int(action_id)
+        except ValueError:
+            try:
+                module, xmlid = action_id.split('.', 1)
+                model, action_id = req.session.model('ir.model.data').get_object_reference(module, xmlid)
+                assert model.startswith('ir.actions.')
+            except Exception:
+                action_id = 0   # force failed read
+
         base_action = Actions.read([action_id], ['type'], context)
         if base_action:
             ctx = {}
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index e4d543c69ce..67d029953a1 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -667,7 +667,7 @@ instance.web.Menu =  instance.web.Widget.extend({
      * @param {Number} id the action_id to match
      */
     open_action: function (id) {
-        var $menu = this.$element.add(this.$secondary_menus).find('a[data-action-id=' + id + ']');
+        var $menu = this.$element.add(this.$secondary_menus).find('a[data-action-id="' + id + '"]');
         var menu_id = $menu.data('menu');
         if (menu_id) {
             this.open_menu(menu_id);
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 1bfd7d18776..1d212daaa20 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -178,7 +178,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
         });
     },
     do_action: function(action, on_close) {
-        if (_.isNumber(action)) {
+        if (_.isNumber(action) || _.isString(action)) {
             var self = this;
             return self.rpc("/web/action/load", { action_id: action }, function(result) {
                 self.do_action(result.result, on_close);
@@ -1261,7 +1261,7 @@ instance.web.View = instance.web.Widget.extend({
             args.push(context);
             return dataset.call_button(action_data.name, args, handler);
         } else if (action_data.type=="action") {
-            return this.rpc('/web/action/load', { action_id: parseInt(action_data.name, 10), context: context, do_not_eval: true}, handler);
+            return this.rpc('/web/action/load', { action_id: action_data.name, context: context, do_not_eval: true}, handler);
         } else  {
             return dataset.exec_workflow(record_id, action_data.name, handler);
         }

From 51b5b750589f1b1b1e1b1770e22a965512bedd06 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Fri, 13 Jul 2012 17:01:56 +0200
Subject: [PATCH 6/7] [FIX] fp misindentation

bzr revid: al@openerp.com-20120713150156-b07dd3qeff5xi3em
---
 addons/web/static/src/js/chrome.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 67d029953a1..f7b701f3b9d 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -86,7 +86,7 @@ instance.web.Dialog = instance.web.Widget.extend({
         if (this.dialog_options.autoOpen) {
             this.open();
         } else {
-            test = instance.web.dialog(this.$element, this.get_options());
+            instance.web.dialog(this.$element, this.get_options());
         }
     },
     get_options: function(options) {
@@ -145,9 +145,9 @@ instance.web.Dialog = instance.web.Widget.extend({
         _.each(this.getChildren(), function(el) {
             el.destroy();
         });
-    if (! this.isDestroyed()) {
-        this.$element.dialog('destroy');
-    }
+        if (! this.isDestroyed()) {
+            this.$element.dialog('destroy');
+        }
         this._super();
     }
 });
@@ -212,11 +212,11 @@ instance.web.CrashManager = instance.web.CallbackEnabled.extend({
         dialog.$element.html(QWeb.render('CrashManager.error', {session: instance.connection, error: error}));
     },
     on_javascript_exception: function(exception) {
-    this.on_traceback({
-        type: _t("Client Error"),
-        message: exception,
-        data: {debug: ""}
-    });
+        this.on_traceback({
+            type: _t("Client Error"),
+            message: exception,
+            data: {debug: ""}
+        });
     },
 });
 

From ccde4ad6af8f63c329a6800cbd615da94e983340 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Fri, 13 Jul 2012 18:36:21 +0200
Subject: [PATCH 7/7] [FIX] declare bus class

bzr revid: al@openerp.com-20120713163621-1a4mj8e01970ks44
---
 addons/web/static/src/js/coresetup.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index a00ca4002e5..a5a62b9bcc1 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -404,10 +404,11 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
     }
 });
 
+
 /**
  * Event Bus used to bind events scoped in the current instance
  */
-instance.web.bus = new (instance.web.Class.extend(instance.web.EventDispatcherMixin, {
+instance.web.Bus = instance.web.Class.extend(instance.web.EventDispatcherMixin, {
     init: function() {
         instance.web.EventDispatcherMixin.init.call(this, parent);
         var self = this;
@@ -425,7 +426,8 @@ instance.web.bus = new (instance.web.Class.extend(instance.web.EventDispatcherMi
             });
         });
     }
-}))();
+})
+instance.web.bus = new instance.web.Bus();
 
 /** OpenERP Translations */
 instance.web.TranslationDataBase = instance.web.Class.extend(/** @lends instance.web.TranslationDataBase# */{