From f50f0bd0897a569b5e9990b6bc0928b6d4ea59b5 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 22 Nov 2012 15:29:30 +0100 Subject: [PATCH 01/10] [IMP] auth_signup: do not shadow the `deferred` returned by Login.start._super() bzr revid: odo@openerp.com-20121122142930-bq263k9p01l99sa2 --- addons/auth_signup/static/src/js/auth_signup.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js index 3025069dece..9642a15f5c9 100644 --- a/addons/auth_signup/static/src/js/auth_signup.js +++ b/addons/auth_signup/static/src/js/auth_signup.js @@ -32,9 +32,11 @@ openerp.auth_signup = function(instance) { // in case of a signup, retrieve the user information from the token if (self.params.db && self.params.token) { - d = self.rpc("/auth_signup/retrieve", {dbname: self.params.db, token: self.params.token}) + d.done(function() { + self.rpc("/auth_signup/retrieve", {dbname: self.params.db, token: self.params.token}) .done(self.on_token_loaded) - .fail(self.on_token_failed); + .fail(self.on_token_failed) + }); } return d; }, From f3955000e7ba714cf1ca5d94b37227234bf9fedb Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 22 Nov 2012 15:29:42 +0100 Subject: [PATCH 02/10] [FIX] auth_openid: properly inherit Login.start and return a `deferred` bzr revid: odo@openerp.com-20121122142942-jz8chz5xtf2lj7t4 --- .../auth_openid/static/src/js/auth_openid.js | 66 ++++++++++--------- 1 file changed, 34 insertions(+), 32 deletions(-) diff --git a/addons/auth_openid/static/src/js/auth_openid.js b/addons/auth_openid/static/src/js/auth_openid.js index a8901ee80f1..f8615481a40 100644 --- a/addons/auth_openid/static/src/js/auth_openid.js +++ b/addons/auth_openid/static/src/js/auth_openid.js @@ -5,42 +5,44 @@ var QWeb = instance.web.qweb; instance.web.Login = instance.web.Login.extend({ start: function() { - this._super.apply(this, arguments); var self = this; - - this._default_error_message = this.$el.find('.oe_login_error_message').text(); - - this.$openid_selected_button = $(); - this.$openid_selected_input = $(); - this.$openid_selected_provider = null; - - - var openIdProvider = null; - if (this.has_local_storage && this.remember_credentials) { - openIdProvider = localStorage.getItem('openid-provider'); - } - - if (openIdProvider) { - $openid_selected_provider = openIdProvider; - this.do_openid_select('a[href="#' + openIdProvider + '"]', openIdProvider, true); - - if (this.has_local_storage && this.remember_credentials) { - this.$openid_selected_input.find('input').val(localStorage.getItem('openid-login')); + var d = self._super.apply(this, arguments).done(function() { + + self._default_error_message = self.$el.find('.oe_login_error_message').text(); + + self.$openid_selected_button = $(); + self.$openid_selected_input = $(); + self.$openid_selected_provider = null; + + + var openIdProvider = null; + if (self.has_local_storage && self.remember_credentials) { + openIdProvider = localStorage.getItem('openid-provider'); } - } - else { - this.do_openid_select('a[data-url=""]', 'login,password', true); - } - - this.$el.find('a[data-url]').click(function (event) { - event.preventDefault(); - var selected_oidh = $(this).attr('href').substr(1); - if (selected_oidh != self.$openid_selected_provider) { - self.do_openid_select(this, selected_oidh); + + if (openIdProvider) { + $openid_selected_provider = openIdProvider; + self.do_openid_select('a[href="#' + openIdProvider + '"]', openIdProvider, true); + + if (self.has_local_storage && self.remember_credentials) { + self.$openid_selected_input.find('input').val(localStorage.getItem('openid-login')); + } } + else { + self.do_openid_select('a[data-url=""]', 'login,password', true); + } + + self.$el.find('a[data-url]').click(function (event) { + event.preventDefault(); + var selected_oidh = $(this).attr('href').substr(1); + if (selected_oidh != self.$openid_selected_provider) { + self.do_openid_select(this, selected_oidh); + } + }); + + self._check_error(); }); - - this._check_error(); + return d; }, From 13bef50e386857fd0f911f22a0ee9332863bc176 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Thu, 22 Nov 2012 23:01:56 +0100 Subject: [PATCH 03/10] [IMP] project demo data bzr revid: al@openerp.com-20121122220156-tny8try141h7160x --- addons/project/project_data.xml | 16 +++++----------- addons/project/project_demo.xml | 4 ++-- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml index 08981bd126a..7e4e8e85077 100644 --- a/addons/project/project_data.xml +++ b/addons/project/project_data.xml @@ -44,37 +44,31 @@ open - - 3 - Negotiation - pending - - - - 4 + 3 Development open - 5 + 4 Testing open - 6 + 5 Merge open - 7 + 6 Done done + 7 diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml index 698a1a99627..ee887c2728c 100644 --- a/addons/project/project_demo.xml +++ b/addons/project/project_demo.xml @@ -36,7 +36,7 @@ Implement new website for Sale and Warehouse Management for a customer. project.task - + @@ -114,7 +114,7 @@ Budget Planning - + 4 From f5254e03ff4e628322805dea41109020718e7448 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Thu, 22 Nov 2012 23:12:00 +0100 Subject: [PATCH 04/10] [FIX] res.users last_login typodowan bzr revid: al@openerp.com-20121122221200-2ut9pdc3z40b26r1 --- openerp/addons/base/res/res_users.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py index 5d376ccf07f..4565f861b40 100644 --- a/openerp/addons/base/res/res_users.py +++ b/openerp/addons/base/res/res_users.py @@ -398,7 +398,7 @@ class res_users(osv.osv): # prevent/delay login in that case. It will also have been logged # as a SQL error, if anyone cares. try: - cr.execute("SELECT id FROM res_users WHERE id=%s FOR UPDATE NOWAIT", (user_id,), log_exception=False) + cr.execute("SELECT id FROM res_users WHERE id=%s FOR UPDATE NOWAIT", (user_id,), log_exceptions=False) cr.execute("UPDATE res_users SET login_date = now() AT TIME ZONE 'UTC' WHERE id=%s", (user_id,)) except Exception: _logger.debug("Failed to update last_login for db:%s login:%s", db, login, exc_info=True) From ba1e6454da71d8be862aadfae06a94ab1f6ba4cb Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Fri, 23 Nov 2012 00:54:55 +0100 Subject: [PATCH 05/10] [FIX] project state pending backward compatibility at least one stage should be linked with state pending to be able to write state bzr revid: al@openerp.com-20121122235455-7g7pp1beoeb6kz8s --- addons/project/project_data.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml index 7e4e8e85077..4d4ead3e90e 100644 --- a/addons/project/project_data.xml +++ b/addons/project/project_data.xml @@ -35,7 +35,7 @@ 2 Specification - draft + pending From c52341ad58baef7e142ff6f29e1ddf314dc7ddfc Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Fri, 23 Nov 2012 05:13:57 +0000 Subject: [PATCH 06/10] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20121123051357-kjm1phcduxoim4gt --- addons/web_graph/i18n/fr.po | 22 +++++++++++----------- addons/web_kanban/i18n/fr.po | 16 ++++++++-------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/addons/web_graph/i18n/fr.po b/addons/web_graph/i18n/fr.po index 6d4cf6f63a1..df062c38bfc 100644 --- a/addons/web_graph/i18n/fr.po +++ b/addons/web_graph/i18n/fr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openerp-web\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-07-02 09:06+0200\n" -"PO-Revision-Date: 2012-02-15 09:18+0000\n" -"Last-Translator: Olivier Dony (OpenERP) \n" +"PO-Revision-Date: 2012-11-22 08:35+0000\n" +"Last-Translator: Quentin THEURET \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n" -"X-Generator: Launchpad (build 16265)\n" +"X-Launchpad-Export-Date: 2012-11-23 05:13+0000\n" +"X-Generator: Launchpad (build 16293)\n" #. openerp-web #: addons/web_graph/static/src/js/graph.js:19 @@ -45,27 +45,27 @@ msgstr "" #. openerp-web #: addons/web_graph/static/src/xml/web_graph.xml:14 msgid "Lines" -msgstr "" +msgstr "Lignes" #. openerp-web #: addons/web_graph/static/src/xml/web_graph.xml:15 msgid "Areas" -msgstr "" +msgstr "Zones" #. openerp-web #: addons/web_graph/static/src/xml/web_graph.xml:18 msgid "Radar" -msgstr "" +msgstr "Radar" #. openerp-web #: addons/web_graph/static/src/xml/web_graph.xml:20 msgid "Legend" -msgstr "" +msgstr "Légende" #. openerp-web #: addons/web_graph/static/src/xml/web_graph.xml:24 msgid "Hidden" -msgstr "" +msgstr "Masqué" #. openerp-web #: addons/web_graph/static/src/xml/web_graph.xml:25 @@ -75,12 +75,12 @@ msgstr "" #. openerp-web #: addons/web_graph/static/src/xml/web_graph.xml:26 msgid "Top" -msgstr "" +msgstr "En haut" #. openerp-web #: addons/web_graph/static/src/xml/web_graph.xml:28 msgid "Actions" -msgstr "" +msgstr "Actions" #. openerp-web #: addons/web_graph/static/src/xml/web_graph.xml:32 diff --git a/addons/web_kanban/i18n/fr.po b/addons/web_kanban/i18n/fr.po index a4e8b026287..0dc7033a64b 100644 --- a/addons/web_kanban/i18n/fr.po +++ b/addons/web_kanban/i18n/fr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openerp-web\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-07-02 09:06+0200\n" -"PO-Revision-Date: 2012-02-15 10:37+0000\n" -"Last-Translator: Olivier Dony (OpenERP) \n" +"PO-Revision-Date: 2012-11-22 08:29+0000\n" +"Last-Translator: Quentin THEURET \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n" -"X-Generator: Launchpad (build 16265)\n" +"X-Launchpad-Export-Date: 2012-11-23 05:13+0000\n" +"X-Generator: Launchpad (build 16293)\n" #. openerp-web #: addons/web_kanban/static/src/js/kanban.js:10 @@ -35,7 +35,7 @@ msgstr "Voulez-vous réellement supprimer cet enregistrement?" #. openerp-web #: addons/web_kanban/static/src/js/kanban.js:839 msgid "Create: " -msgstr "" +msgstr "Créer : " #. openerp-web #: addons/web_kanban/static/src/xml/web_kanban.xml:41 @@ -50,17 +50,17 @@ msgstr "restant)" #. openerp-web #: addons/web_kanban/static/src/xml/web_kanban.xml:71 msgid "Add" -msgstr "" +msgstr "Ajouter" #. openerp-web #: addons/web_kanban/static/src/xml/web_kanban.xml:71 msgid "or" -msgstr "" +msgstr "ou" #. openerp-web #: addons/web_kanban/static/src/xml/web_kanban.xml:72 msgid "Cancel" -msgstr "" +msgstr "Annuler" #~ msgid "Create" #~ msgstr "Créer" From 2c0b28c27a51e7fa5d87b4b2df8730fa60c85fd6 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Fri, 23 Nov 2012 10:53:37 +0100 Subject: [PATCH 07/10] [FIX]traceback when trying to add bank account to a company bzr revid: csn@openerp.com-20121123095337-jqoqzpab4iyreh2s --- addons/account/account_bank.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account/account_bank.py b/addons/account/account_bank.py index 2323f8aaa8a..002e08bb2f3 100644 --- a/addons/account/account_bank.py +++ b/addons/account/account_bank.py @@ -45,12 +45,12 @@ class bank(osv.osv): def _prepare_name_get(self, cr, uid, bank_dicts, context=None): """Add ability to have %(currency_name)s in the format_layout of res.partner.bank.type""" - currency_ids = list(set(data['currency_id'][0] for data in bank_dicts if data['currency_id'])) + currency_ids = list(set(data['currency_id'][0] for data in bank_dicts if 'currency_id' in data)) currencies = self.pool.get('res.currency').browse(cr, uid, currency_ids, context=context) currency_name = dict((currency.id, currency.name) for currency in currencies) for data in bank_dicts: - data['currency_name'] = data['currency_id'] and currency_name[data['currency_id'][0]] or '' + data['currency_name'] = data.get('currency_id') and currency_name[data['currency_id'][0]] or '' return super(bank, self)._prepare_name_get(cr, uid, bank_dicts, context=context) def post_write(self, cr, uid, ids, context=None): From e76f5fca1f4874dc729386ac76d3b350188160ed Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Fri, 23 Nov 2012 11:27:55 +0100 Subject: [PATCH 08/10] [FIX] broke the pager in form views bzr revid: nicolas.vanhoren@openerp.com-20121123102755-ad57atu9zcl010c5 --- addons/web/static/src/css/base.css | 18 ++++---- addons/web/static/src/css/base.sass | 64 ++++++++++++++--------------- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 45cd8ef70aa..a79bd414003 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1438,15 +1438,15 @@ .openerp .oe_list_pager { line-height: 26px; } -.openerp .oe_list_pager .oe_pager_value { +.openerp .oe_pager_value { float: left; margin-right: 8px; } -.openerp .oe_list_pager ul.oe_pager_group { +.openerp ul.oe_pager_group { padding: 0; margin: 0; } -.openerp .oe_list_pager .oe_pager_group { +.openerp .oe_pager_group { float: left; height: 24px; line-height: 24px; @@ -1457,7 +1457,7 @@ -webkit-border-radius: 5px; border-radius: 5px; } -.openerp .oe_list_pager .oe_pager_group li { +.openerp .oe_pager_group li { height: 24px; line-height: 24px; padding: 0; @@ -1466,23 +1466,23 @@ float: left; border-right: 1px solid #ababab; } -.openerp .oe_list_pager .oe_pager_group li:last-child { +.openerp .oe_pager_group li:last-child { border: none; } -.openerp .oe_list_pager .oe_pager_group a { +.openerp .oe_pager_group a { color: #4c4c4c; padding: 0 8px; } -.openerp .oe_list_pager .oe_pager_group a:hover { +.openerp .oe_pager_group a:hover { text-decoration: none; } -.openerp .oe_list_pager .oe_pager_group .active { +.openerp .oe_pager_group .active { background: #999999; -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; } -.openerp .oe_list_pager .oe_pager_group .active a { +.openerp .oe_pager_group .active a { color: white; text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4); } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 442c9d5e026..47adb2a8eca 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1164,41 +1164,41 @@ $sheet-padding: 16px // List pager {{{ .oe_list_pager line-height: 26px - .oe_pager_value - float: left - margin-right: 8px - ul.oe_pager_group - padding: 0 - margin: 0 - .oe_pager_group - float: left + .oe_pager_value + float: left + margin-right: 8px + ul.oe_pager_group + padding: 0 + margin: 0 + .oe_pager_group + float: left + height: 24px + line-height: 24px + display: inline-block + border: 1px solid #ababab + cursor: pointer + @include radius(5px) + li height: 24px line-height: 24px - display: inline-block - border: 1px solid #ababab - cursor: pointer - @include radius(5px) - li - height: 24px - line-height: 24px - padding: 0 - margin: 0 - list-style-type: none - float: left - border-right: 1px solid #ababab - &:last-child - border: none + padding: 0 + margin: 0 + list-style-type: none + float: left + border-right: 1px solid #ababab + &:last-child + border: none + a + color: #4c4c4c + padding: 0 8px + &:hover + text-decoration: none + .active + background: #999 + @include box-shadow(0 1px 4px rgba(0,0,0,0.3) inset) a - color: #4c4c4c - padding: 0 8px - &:hover - text-decoration: none - .active - background: #999 - @include box-shadow(0 1px 4px rgba(0,0,0,0.3) inset) - a - color: #fff - text-shadow: 0 1px 2px rgba(0,0,0,0.4) + color: #fff + text-shadow: 0 1px 2px rgba(0,0,0,0.4) .oe_list_pager.oe_list_pager_single_page .oe_pager_group display: none // }}} From 8ccbcb8171fc14ca5f75c2e0770985a82eed7f46 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Fri, 23 Nov 2012 11:36:57 +0100 Subject: [PATCH 09/10] [FIX]gave an error if data['currency_id'] exists but has value false bzr revid: csn@openerp.com-20121123103657-jgewk23zrz3xo5ty --- addons/account/account_bank.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/account_bank.py b/addons/account/account_bank.py index 002e08bb2f3..c836600d866 100644 --- a/addons/account/account_bank.py +++ b/addons/account/account_bank.py @@ -45,7 +45,7 @@ class bank(osv.osv): def _prepare_name_get(self, cr, uid, bank_dicts, context=None): """Add ability to have %(currency_name)s in the format_layout of res.partner.bank.type""" - currency_ids = list(set(data['currency_id'][0] for data in bank_dicts if 'currency_id' in data)) + currency_ids = list(set(data['currency_id'][0] for data in bank_dicts if data.get('currency_id'))) currencies = self.pool.get('res.currency').browse(cr, uid, currency_ids, context=context) currency_name = dict((currency.id, currency.name) for currency in currencies) From b77d7d20ae569fd17d0a7c79c316f379943d6cb4 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Fri, 23 Nov 2012 12:16:03 +0100 Subject: [PATCH 10/10] [FIX] minor modif of openerp logo bzr revid: nicolas.vanhoren@openerp.com-20121123111603-55zlx8thwcgk8mxn --- addons/web/static/src/js/chrome.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index f355322b489..7829a3e0cc7 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -1094,7 +1094,7 @@ instance.web.WebClient = instance.web.Client.extend({ start: function() { var self = this; return $.when(this._super()).then(function() { - self.$(".oe_logo").attr("href", $.param.fragment("" + window.location, "", 2)); + self.$(".oe_logo").attr("href", $.param.fragment("" + window.location, "", 2).slice(0, -1)); if (jQuery.param !== undefined && jQuery.deparam(jQuery.param.querystring()).kitten !== undefined) { $("body").addClass("kitten-mode-activated"); if ($.blockUI) {