From f725d5e6794432307d92d36f69a0f58b33035e97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 7 Aug 2012 18:09:24 +0200 Subject: [PATCH 1/9] [FIX] email_template: fixed an issue where no destination partner could be found. bzr revid: tde@openerp.com-20120807160924-hdnqudnwowkbmsem --- addons/email_template/email_template.py | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py index bf57342f14f..b43b7d19b85 100644 --- a/addons/email_template/email_template.py +++ b/addons/email_template/email_template.py @@ -317,6 +317,7 @@ class email_template(osv.osv): 'message_id': False, 'state': 'outgoing', 'content_subtype': 'plain', + 'partner_ids': [], } if not template_id: return values From 2dfc350825d45ad3007ff3882a664e82897cbc8c Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 8 Aug 2012 08:41:22 +0200 Subject: [PATCH 2/9] [IMP] small improvement in opportunity view bzr revid: fp@tinyerp.com-20120808064122-wjz6ua224nb9mkoi --- addons/crm/crm_lead_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index d2c37c5cea7..db44606b47b 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -467,7 +467,7 @@

at - %% success rate + %% success rate

From b9467c69b4bd09cde67344b9e4a9ecee3bcce275 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 8 Aug 2012 08:51:18 +0200 Subject: [PATCH 3/9] [IMP] small CSS improvements bzr revid: fp@tinyerp.com-20120808065118-8sw6l6gmak1e48ld --- addons/web/static/src/css/base.css | 8 ++++---- addons/web/static/src/css/base.sass | 6 +++--- addons/web/static/src/xml/base.xml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 09081426fca..434ee9377ab 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -78,7 +78,7 @@ background: white; /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ + */ */ } .openerp :-moz-placeholder { color: #afafb6 !important; @@ -2150,7 +2150,7 @@ width: 100%; display: inline-block; padding: 2px 2px 2px 0px; - line-height: 18px; + line-height: 1em; } .openerp .oe_form .oe_form_field input { margin: 0px; @@ -2239,10 +2239,10 @@ overflow: hidden; } .openerp .oe_form_editable .oe_form .oe_form_field_integer { - width: 7em !important; + width: 6em !important; } .openerp .oe_form_editable .oe_form .oe_form_field_float { - width: 8em !important; + width: 7em !important; } .openerp .oe_form_editable .oe_form .oe_form_field_date { width: 7.5em !important; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 0ef8f83f330..fd0f4e6b4aa 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1661,7 +1661,7 @@ $sheet-max-width: 860px width: 100% display: inline-block padding: 2px 2px 2px 0px - line-height: 18px + line-height: 1em input margin: 0px input[type="text"], input[type="password"], input[type="file"], select @@ -1728,9 +1728,9 @@ $sheet-max-width: 860px .oe_form_editable .oe_form .oe_form_field_integer - width: 7em !important + width: 6em !important .oe_form_field_float - width: 8em !important + width: 7em !important .oe_form_field_date width: 7.5em !important .oe_form_field_datetime diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 601fe165f81..e82659aaa87 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -338,7 +338,7 @@
- Activate the developer mode + Activate the developer mode

Version

From 3fdd2881b9f64fe7c197129294b013e962a28cb1 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 8 Aug 2012 09:24:53 +0200 Subject: [PATCH 4/9] [IMP] clean address format on leads bzr revid: fp@tinyerp.com-20120808072453-tnm2rkvn7djksxtm --- addons/crm/crm_lead_view.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index db44606b47b..2b9834ffe38 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -162,12 +162,12 @@
-
- - +
+ + +
- - +
@@ -524,7 +524,7 @@
- +
From 175c167471962d0c8acb7b509ac00aacd9a69fc8 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 8 Aug 2012 09:38:21 +0200 Subject: [PATCH 5/9] [FIX] fixing bugs in bounce effects + cleaner effect bzr revid: fp@tinyerp.com-20120808073821-gxp4r9u12160lshy --- addons/web/static/src/css/base.sass | 3 --- addons/web/static/src/js/view_form.js | 7 ++++--- addons/web/static/src/xml/base.xml | 4 +++- addons/web_kanban/static/src/js/kanban.js | 14 +++++++------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index fd0f4e6b4aa..949befdef77 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -435,9 +435,6 @@ $sheet-max-width: 860px text-decoration: none .oe_star_on color: gold - .oe_bounce - -moz-animation: bounce .40s linear - -webkit-animation: bounce .40s linear // }}} // Tags (for many2many tags, among others) {{{ .oe_tag diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index c2dac62366b..c3f941305d5 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -155,15 +155,16 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM ]); } + this.has_been_loaded.resolve(); + // Add bounce effect on button 'Edit' when click on readonly page view. - this.$element.find(".oe_form_field, .oe_form_group_cell").on('click', function (e) { + this.$element.find(".oe_form_field,label").on('click', function (e) { if(self.get("actual_mode") == "view") { var $button = self.options.$buttons.find(".oe_form_button_edit"); - $button.wrap('
').css('margin-right','4px').addClass('oe_left oe_bounce'); + $button.effect('bounce', {distance: 18, times: 7}, 200) } }); - this.has_been_loaded.resolve(); return $.when(); }, extract_qweb_template: function(fvg) { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index e82659aaa87..4e3ffa0acb4 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -708,7 +708,9 @@
- +
+ +
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 4477b4dc01f..4856c5d174a 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -421,13 +421,6 @@ instance.web_kanban.KanbanGroup = instance.web.OldWidget.extend({ }); // Add bounce effect on image '+' of kanban header when click on empty space of kanban grouped column. var add_btn = this.$element.find('.oe_kanban_add'); - this.$records.click(function (ev) { - if (ev.target == ev.currentTarget) { - if (!self.state.folded) { - add_btn.wrap('
').addClass('oe_bounce'); - } - } - }); this.$records.find('.oe_kanban_show_more').click(this.do_show_more); if (this.state.folded) { this.do_toggle_fold(); @@ -436,6 +429,13 @@ instance.web_kanban.KanbanGroup = instance.web.OldWidget.extend({ this.$records.data('widget', this); this.$has_been_started.resolve(); this.compute_cards_auto_height(); + this.$records.click(function (ev) { + if (ev.target == ev.currentTarget) { + if (!self.state.folded) { + add_btn.effect('bounce', {distance: 18, times: 7}, 200) + } + } + }); return def; }, compute_cards_auto_height: function() { From a2eea7db8549310371982fbf514f5f691df387de Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 8 Aug 2012 09:44:36 +0200 Subject: [PATCH 6/9] [IMP] layout form view wizard CoA bzr revid: fp@tinyerp.com-20120808074436-yg5t0ctdgiwn5ccz --- addons/account/account_installer.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml index b720ea16922..d2661674bae 100644 --- a/addons/account/account_installer.xml +++ b/addons/account/account_installer.xml @@ -10,7 +10,9 @@ Accounting Application Configuration
-
From a129758a6db9702827e911e2bef7f7e06746ebe4 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 8 Aug 2012 09:54:09 +0200 Subject: [PATCH 7/9] [IMP] layout form SO bzr revid: fp@tinyerp.com-20120808075409-wrz9vv4zfir89gff --- addons/sale/sale_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index adbe29753b5..2db531d34dd 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -304,7 +304,7 @@