From bb9c83714ad9b194eca10901a0c3c5d4c2559c82 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 18 Nov 2013 11:21:12 +0100 Subject: [PATCH 1/5] [FIX] Avoid rpc errors on actions.act.url@target='self' bzr revid: fme@openerp.com-20131118102112-znm2mza36md6896n --- addons/web/static/src/js/views.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index ecdbaf8b465..2d05b5b41dc 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -510,7 +510,11 @@ instance.web.ActionManager = instance.web.Widget.extend({ }); }, ir_actions_act_url: function (action) { - window.open(action.url, action.target === 'self' ? '_self' : '_blank'); + if (action.target === 'self') { + instance.web.redirect(action.url); + } else { + window.open(action.url, '_blank'); + } return $.when(); }, }); From 9ded116baf006f9eb7a6674bf298ad9f185de6c5 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 18 Nov 2013 12:22:11 +0100 Subject: [PATCH 2/5] [ADD] return_label & return_url in action_manager#load_state for breadcrumb bzr revid: fme@openerp.com-20131118112211-q15p0d7cc8wpku5n --- addons/web/static/src/js/views.js | 35 +++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 2d05b5b41dc..5e9cfa07399 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -147,6 +147,19 @@ instance.web.ActionManager = instance.web.Widget.extend({ this.inner_action = last_widget.action; } }, + add_breadcrumb_url: function (url, label) { + // Add a pseudo breadcrumb that will redirect to an url + this.push_breadcrumb({ + show: function(index) { + instance.web.redirect(url); + }, + hide: function() {}, + destroy: function() {}, + get_title: function() { + return label; + } + }); + }, get_title: function() { var titles = []; for (var i = 0; i < this.breadcrumbs.length; i += 1) { @@ -217,6 +230,12 @@ instance.web.ActionManager = instance.web.Widget.extend({ do_load_state: function(state, warm) { var self = this, action_loaded; + if (!warm && 'return_label' in state) { + var return_url = state.return_url || document.referrer; + if (return_url) { + this.add_breadcrumb_url(return_url, state.return_label); + } + } if (state.action) { if (_.isString(state.action) && instance.web.client_actions.contains(state.action)) { var action_client = { @@ -225,7 +244,9 @@ instance.web.ActionManager = instance.web.Widget.extend({ params: state, _push_me: state._push_me, }; - this.null_action(); + if (warm) { + this.null_action(); + } action_loaded = this.do_action(action_client); } else { var run_action = (!this.inner_widget || !this.inner_widget.action) || this.inner_widget.action.id !== state.action; @@ -245,7 +266,9 @@ instance.web.ActionManager = instance.web.Widget.extend({ add_context.active_ids = [state.active_id]; } add_context.params = state; - this.null_action(); + if (warm) { + this.null_action(); + } action_loaded = this.do_action(state.action, { additional_context: add_context }); $.when(action_loaded || null).done(function() { instance.webclient.menu.has_been_loaded.done(function() { @@ -258,7 +281,9 @@ instance.web.ActionManager = instance.web.Widget.extend({ } } else if (state.model && state.id) { // TODO handle context & domain ? - this.null_action(); + if (warm) { + this.null_action(); + } var action = { res_model: state.model, res_id: state.id, @@ -268,7 +293,9 @@ instance.web.ActionManager = instance.web.Widget.extend({ action_loaded = this.do_action(action); } else if (state.sa) { // load session action - this.null_action(); + if (warm) { + this.null_action(); + } action_loaded = this.rpc('/web/session/get_session_action', {key: state.sa}).then(function(action) { if (action) { return self.do_action(action); From 1fba5804fc40a9d86eae7c9f8bbaa9ff3b965f0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Mon, 18 Nov 2013 18:23:01 +0100 Subject: [PATCH 3/5] [IMP] point_of_sale: allow up to 8 simultaneous payment methods to be displayed at once bzr revid: fva@openerp.com-20131118172301-c71ic2xazlkjhr4d --- addons/point_of_sale/static/src/css/pos.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css index 89ab429c4f4..738d3fd9f4f 100644 --- a/addons/point_of_sale/static/src/css/pos.css +++ b/addons/point_of_sale/static/src/css/pos.css @@ -306,12 +306,12 @@ text-align: center; vertical-align: top; width: 205px; - max-height: 232px; + max-height: 350px; overflow-y: auto; overflow-x: hidden; } .point-of-sale #paypad button { - height: 50px; + height: 39px; display: block; width: 100%; margin: 0px -6px 4px -2px; From 89850477a2dd41886ddc6515928c0f6c78f3e681 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 19 Nov 2013 09:53:43 +0100 Subject: [PATCH 4/5] [FIX] fonts: add missing onchange on company form bzr revid: mat@openerp.com-20131119085343-930hs460m5uzz5xj --- openerp/addons/base/res/res_company_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml index d0f35223bba..3fccba944f9 100644 --- a/openerp/addons/base/res/res_company_view.xml +++ b/openerp/addons/base/res/res_company_view.xml @@ -85,7 +85,7 @@