From 313c4ef511115dd598a23a3698dc8ad25fe21126 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Mon, 17 Sep 2012 14:30:54 +0200 Subject: [PATCH 01/14] [IMP] note: search, css bzr revid: chm@openerp.com-20120917123054-futj80nzfo725kiv --- addons/note/note.py | 17 ++++++++++++----- addons/note/note_demo.xml | 9 --------- addons/note/note_view.xml | 17 +++++++++-------- addons/note/security/ir.rule.xml | 9 +++++++++ 4 files changed, 30 insertions(+), 22 deletions(-) diff --git a/addons/note/note.py b/addons/note/note.py index 429c16eed6d..33d138de641 100644 --- a/addons/note/note.py +++ b/addons/note/note.py @@ -22,6 +22,7 @@ from openerp.osv import osv, fields from tools.translate import _ import re +from openerp.tools.misc import html2plaintext class note_stage(osv.osv): """ Category of Note """ @@ -60,6 +61,10 @@ class note_note(osv.osv): rec_id = self.create(cr, uid, {'memo': name}, context=context) return self.name_get(cr, uid, [rec_id], context)[0] + def _from_xml(self, mappings): + return chr(int( mappings.group(1) )) + + #read the first line (convert hml into text) def _get_note_first_line(self, cr, uid, ids, name="", args={}, context=None): res = {} @@ -67,13 +72,14 @@ class note_note(osv.osv): text_note = (note.memo or '').strip().split('\n')[0] text_note = re.sub(r'(\S?)(|<[/]?p>|<[/]?div>|)[\s\S]*',r'\1',text_note) text_note = re.sub(r'<[^>]+>','',text_note) + text_note = html2plaintext(text_note) res[note.id] = text_note return res #unactivate a sticky note and record the date def onclick_note_is_done(self, cr, uid, ids, context=None): - self.write(cr, uid, ids, { 'active' : False, 'date_done' : fields.date.today() }) + self.write(cr, uid, ids, { 'open' : False, 'date_done' : fields.date.today() }) self.message_post(cr, uid, ids[0], body='This sticky note is active', subject=False, type='notification', parent_id=False, attachments=None, context=context) @@ -82,7 +88,7 @@ class note_note(osv.osv): #activate a Sticky note def onclick_note_not_done(self, cr, uid, ids, context=None): - self.write(cr, uid, ids, { 'active' : True }) + self.write(cr, uid, ids, { 'open' : True }) self.message_post(cr, uid, ids[0], body='This sticky note is close', subject=False, type='notification', parent_id=False, attachments=None, context=context) @@ -124,7 +130,8 @@ class note_note(osv.osv): _columns = { 'name': fields.function(_get_note_first_line, string='Sticky note Summary', - type='text', store=True), + type='text', + store=True), 'memo': fields.html('Pad Content'), 'sequence': fields.integer('Sequence'), @@ -140,7 +147,7 @@ class note_note(osv.osv): # stage per user 'stage_ids': fields.many2many('note.stage','note_stage_rel','note_id','stage_id','Linked stages users'), - 'active': fields.boolean('Active'), + 'open': fields.boolean('Active'), # when the user unactivate the Sticky note, record de date for un display Sticky note after 1 days 'date_done': fields.date('Date done'), 'color': fields.integer('Color Index'), @@ -151,7 +158,7 @@ class note_note(osv.osv): } _defaults = { - 'active' : 1, + 'open' : 1, 'stage_id' : _get_default_stage_id, 'memo': " " } diff --git a/addons/note/note_demo.xml b/addons/note/note_demo.xml index 88b21effb7e..8b76887e577 100644 --- a/addons/note/note_demo.xml +++ b/addons/note/note_demo.xml @@ -115,14 +115,5 @@ 7 - -
* Open ERP: a modern approach to integrated business management -
* Open ERP for Retail and Industrial Management - ]]> - - - - diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml index 232b96f643a..5617fae4376 100644 --- a/addons/note/note_view.xml +++ b/addons/note/note_view.xml @@ -51,7 +51,7 @@ - + @@ -65,8 +65,8 @@
- W - è + W + è @@ -80,7 +80,7 @@
-
+
@@ -107,7 +107,7 @@ - + @@ -143,8 +143,9 @@ - - + + + @@ -188,7 +189,7 @@ form kanban,tree,form - {'search_default_active_true':True} + {'search_default_open_true':True} diff --git a/addons/note/security/ir.rule.xml b/addons/note/security/ir.rule.xml index 82994b960c2..5f4882c3048 100644 --- a/addons/note/security/ir.rule.xml +++ b/addons/note/security/ir.rule.xml @@ -1,12 +1,21 @@ + Only followers can access a sticky notes ['|',('message_follower_ids','=',False),('message_follower_ids','=',user.partner_id.id)] + + + Each user have his stage name + + ['|',('user_id','=',False),('user_id','=',user.id)] + + + From 61ebb4042b5d7d0e98a1ac6be8cc63f917fd84de Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Tue, 18 Sep 2012 17:11:08 +0200 Subject: [PATCH 02/14] [IMP] kanban: many2many_tags => bzr revid: chm@openerp.com-20120918151108-8fpv61vmlmbjkws7 --- addons/base_calendar/base_calendar_view.xml | 2 +- addons/base_setup/res_partner_view.xml | 2 +- addons/note/note_view.xml | 13 +++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml index 89066ce74bb..0ea2be4f37f 100644 --- a/addons/base_calendar/base_calendar_view.xml +++ b/addons/base_calendar/base_calendar_view.xml @@ -418,7 +418,7 @@ ir.actions.act_window calendar.event form - tree,form,calendar + calendar,tree,form diff --git a/addons/base_setup/res_partner_view.xml b/addons/base_setup/res_partner_view.xml index 5e54c0b8629..ad520799c1f 100644 --- a/addons/base_setup/res_partner_view.xml +++ b/addons/base_setup/res_partner_view.xml @@ -13,10 +13,10 @@ + - diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml index 5617fae4376..e7636aa4b85 100644 --- a/addons/note/note_view.xml +++ b/addons/note/note_view.xml @@ -2,8 +2,6 @@ - - note.stage.form @@ -39,8 +37,6 @@ [('user_id','=',uid)] - - note.note.kanban @@ -85,7 +81,8 @@
-
+ +
@@ -192,7 +189,11 @@ {'search_default_open_true':True} - + + + + + \ No newline at end of file From 8cb1f558a0f7d0c5eb43b75f153e2b374351999d Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Tue, 18 Sep 2012 17:15:01 +0200 Subject: [PATCH 03/14] [IMP] kanban: many2many_tags => other views bzr revid: chm@openerp.com-20120918151501-4kkf7ve1m7wvj3le --- addons/base_setup/res_partner_view.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/addons/base_setup/res_partner_view.xml b/addons/base_setup/res_partner_view.xml index ad520799c1f..57e8d70531d 100644 --- a/addons/base_setup/res_partner_view.xml +++ b/addons/base_setup/res_partner_view.xml @@ -10,9 +10,6 @@ - - - From 3fd98b0f80f4bfe20fbced3f4990f79065b06b1e Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Tue, 18 Sep 2012 17:30:35 +0200 Subject: [PATCH 04/14] [IMP]kanban : div widget many2many_tags => field bzr revid: chm@openerp.com-20120918153035-xutvjflw057s8t18 --- addons/web_kanban/static/src/js/kanban.js | 40 +++++++++++++++-------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index fe15b22feee..6d68e62899a 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -71,6 +71,9 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ this.fields_keys = _.keys(this.fields_view.fields); this.add_qweb_template(); this.has_been_loaded.resolve(); + + this._super.apply(this, arguments); + return $.when(); }, _is_quick_create_enabled: function() { @@ -85,6 +88,9 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ return false; return this._super(action); }, + /* add_qweb_template + * select the nodes into the xml and send to extract_aggregates the nodes with TagName="field" + */ add_qweb_template: function() { for (var i=0, ii=this.fields_view.arch.children.length; i < ii; i++) { var child = this.fields_view.arch.children[i]; @@ -97,6 +103,9 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ } } }, + /* extract_aggregates + * extract the agggregates from the nodes (TagName="field") + */ extract_aggregates: function(node) { for (var j = 0, jj = this.group_operators.length; j < jj; j++) { if (node.attrs[this.group_operators[j]]) { @@ -121,9 +130,15 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ } switch (node.tag) { case 'field': - node.tag = QWeb.prefix; - node.attrs[QWeb.prefix + '-esc'] = 'record.' + node.attrs['name'] + '.value'; - this.extract_aggregates(node); + if(this.fields_view.fields[ node.attrs['name'] ].type == 'many2many'){ + node.tag = 'div'; + node.attrs['class'] = 'oe_kanban_many2many_tags'; + node.attrs['model'] = this.fields_view.fields[node.attrs['name']].relation; + node.attrs['t-att-data'] = 'record.' + node.attrs['name'] + '.raw_value'; + }else { + node.tag = QWeb.prefix; + node.attrs[QWeb.prefix + '-esc'] = 'record.' + node.attrs['name'] + '.value'; + } break; case 'button': case 'a': @@ -163,17 +178,16 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ } } }, - /* widget for list of tags/categories... - * make :
+ /* widget for list of tags/categories... */ transform_widget_many2many: function(){ var self=this, arg={}; // select all widget - self.$el.find("[widget='many2many_tags']").each(function(){ - var model = $(this).attr("model"), - data = $(this).attr("data"), - list = data.split(","); + self.$el.find(".oe_kanban_many2many_tags").each(function(){ + var model = $(this).attr("model"); + var data = $(this).attr("data"); + var list = data.split(","); //select all id (per model) if(!arg[model]) arg[model]=[]; for(var t=0;t'+result[t][1]+''); } - }, - function(r){ - console.log('Error',r); } ); } @@ -717,6 +728,9 @@ instance.web_kanban.KanbanRecord = instance.web.Widget.extend({ transform_record: function(record) { var self = this, new_record = {}; + + console.log(this, record); + _.each(record, function(value, name) { var r = _.clone(self.view.fields_view.fields[name] || {}); if ((r.type === 'date' || r.type === 'datetime') && value) { From 24ed9b15630e0c772cbcfab98fe456f6f82d024f Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Tue, 18 Sep 2012 18:59:02 +0200 Subject: [PATCH 05/14] [IMP]kanban: css bzr revid: chm@openerp.com-20120918165902-c5nh169w4c1ur14v --- addons/web_kanban/static/src/css/kanban.css | 4 ++++ addons/web_kanban/static/src/css/kanban.sass | 3 +++ 2 files changed, 7 insertions(+) diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index 48cf725ead3..fec1bc508ec 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -143,6 +143,10 @@ position: relative; top: -8px; } +.openerp .oe_kanban_view .oe_kanban_add, .openerp .oe_kanban_view .oe_kanban_card .oe_dropdown_toggle { + cursor: pointer; + display:inline-block; +} .openerp .oe_kanban_view .oe_kanban_add { float: right; } diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index 95a63dbd1a2..5ae4c9c4f10 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -154,6 +154,9 @@ cursor: pointer position: relative top: -8px + .oe_kanban_card, .oe_dropdown_toggle + cursor: pointer + display:inline-block .oe_kanban_add float: right From f4f7cfcb0c81a43d45eb30719ebc3ad8d120237d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Tue, 18 Sep 2012 19:01:53 +0200 Subject: [PATCH 06/14] [FIX] fixed taxes tags css bzr revid: fva@openerp.com-20120918170153-uojxm4qqwq3qfzff --- addons/web/static/src/css/base.css | 5 +++++ addons/web/static/src/css/base.sass | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 10ee9dea2de..a1a6f5a15e7 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -30,6 +30,11 @@ position: relative; } +.text-tag .text-button { + height: auto !important; + min-height: 16px; +} + .openerp { padding: 0; margin: 0; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 1aa4726725c..49a60a80e2a 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -145,6 +145,11 @@ $sheet-max-width: 860px height: 100% position: relative +// jQueryUI css bug fixing +.text-tag .text-button + height: auto !important + min-height: 16px + .openerp // Global style {{{ padding: 0 From 3ad1a9614378f606721d1ee904e130fd1fe5dbb8 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Tue, 18 Sep 2012 19:19:47 +0200 Subject: [PATCH 07/14] [IMP]kanban: correctif bzr revid: chm@openerp.com-20120918171947-f2114v0oa0cu8wb7 --- addons/web_kanban/static/src/js/kanban.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index d5389c6fa0b..970a4e81fca 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -396,6 +396,8 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ } else { this.$el.find('.oe_kanban_draghandle').removeClass('oe_kanban_draghandle'); } + + this.transform_widget_many2many(); }, on_record_moved : function(record, old_group, old_index, new_group, new_index) { var self = this; @@ -811,7 +813,7 @@ instance.web_kanban.KanbanRecord = instance.web.Widget.extend({ } }); - if (this.$el.find('.oe_kanban_global_click').length) { + if (this.$el.find('.oe_kanban_global_click,.oe_kanban_global_click_edit').length) { this.$el.on('click', function(ev) { if (!ev.isTrigger && !$(ev.target).data('events')) { var trigger = true; @@ -852,8 +854,15 @@ instance.web_kanban.KanbanRecord = instance.web.Widget.extend({ }); } }, + /* actions when user click on the block with a specific class + * open on normal view : oe_kanban_global_click + * open on form/edit view : oe_kanban_global_click_edit + */ on_card_clicked: function(ev) { - this.view.open_record(this.id); + if(this.$el.find('.oe_kanban_global_click_edit').size()>0) + this.do_action_edit(); + else + this.do_action_open(); }, setup_color_picker: function() { var self = this; From ab8722f1b4d4de2aacc7e42a77ce08cb141ab86e Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Tue, 18 Sep 2012 21:38:56 +0200 Subject: [PATCH 08/14] [IMP] kanban: field many2many_tags bzr revid: chm@openerp.com-20120918193856-2lq5q8lnw3dtpqbe --- addons/base_setup/res_partner_view.xml | 2 +- addons/hr_recruitment/hr_recruitment_view.xml | 4 +--- addons/note/note_view.xml | 2 ++ addons/portal_project_issue/portal_project_issue_view.xml | 1 + addons/project_issue/project_issue_view.xml | 4 +--- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/addons/base_setup/res_partner_view.xml b/addons/base_setup/res_partner_view.xml index 57e8d70531d..15b80151831 100644 --- a/addons/base_setup/res_partner_view.xml +++ b/addons/base_setup/res_partner_view.xml @@ -9,7 +9,7 @@ - + diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index 098a8aec210..08e5f31a2d2 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -314,9 +314,7 @@
- - - +
diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml index ca684b42522..b356efc9549 100644 --- a/addons/note/note_view.xml +++ b/addons/note/note_view.xml @@ -82,7 +82,9 @@
+ +
diff --git a/addons/portal_project_issue/portal_project_issue_view.xml b/addons/portal_project_issue/portal_project_issue_view.xml index 5d0b4ce081e..1030dedbdf8 100644 --- a/addons/portal_project_issue/portal_project_issue_view.xml +++ b/addons/portal_project_issue/portal_project_issue_view.xml @@ -27,6 +27,7 @@ +
Creation: diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index fea22c519a8..be7427fe8f4 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -269,9 +269,7 @@
- - - +
From 090b206dd1c071fd8a723cf0cb4e5cd093592824 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 19 Sep 2012 09:32:40 +0200 Subject: [PATCH 09/14] [IMP] removing partner manager from sale as it will be in home bzr revid: fp@tinyerp.com-20120919073240-vdxrevkxii0zzc4x --- openerp/addons/base/res/res_security.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/openerp/addons/base/res/res_security.xml b/openerp/addons/base/res/res_security.xml index c7d2a77f846..acec903c1a3 100644 --- a/openerp/addons/base/res/res_security.xml +++ b/openerp/addons/base/res/res_security.xml @@ -12,9 +12,6 @@ - - - From f139fc49ab799fdc57fe06611a84cc9aafee6c1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Wed, 19 Sep 2012 11:13:04 +0200 Subject: [PATCH 10/14] [FIX] css bug #1051746 : input field layout problem in firefox and IE bzr revid: fva@openerp.com-20120919091304-k043t7483kfyu6ij --- addons/web/static/src/css/base.css | 1 + addons/web/static/src/css/base.sass | 1 + 2 files changed, 2 insertions(+) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index a1a6f5a15e7..28bcb85dc44 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2489,6 +2489,7 @@ } .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_float input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_view_integer input { text-align: right; + width: 100%; } .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_datetime > span, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_date > span { width: 100%; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 49a60a80e2a..73a7c8d39e8 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1966,6 +1966,7 @@ $sheet-max-width: 860px &.oe_form_field_float,&.oe_form_view_integer input text-align: right + width: 100% &.oe_form_field_datetime,&.oe_form_field_date > span width: 100% From 333316c67cbe5cef124f4b1caf95eaf1f334cda0 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 19 Sep 2012 12:02:25 +0200 Subject: [PATCH 11/14] [IMP] Hide form's pager if only one record bzr revid: fme@openerp.com-20120919100225-3skn6ni8uejn3gme --- addons/web/static/src/js/view_form.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index c188abc853e..26c0937372f 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -270,9 +270,6 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM if (this.$buttons) { this.$buttons.show(); } - if (this.$pager) { - this.$pager.show(); - } this.$el.show().css({ opacity: '0', filter: 'alpha(opacity = 0)' @@ -408,7 +405,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM this.$pager.remove(); if (this.get("actual_mode") === "create") return; - this.$pager = $(QWeb.render("FormView.pager", {'widget':self})); + this.$pager = $(QWeb.render("FormView.pager", {'widget':self})).hide(); if (this.options.$pager) { this.$pager.appendTo(this.options.$pager); } else { @@ -421,8 +418,8 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM this.do_update_pager(); }, do_update_pager: function(hide_index) { - this.$pager.find('button').prop('disabled', this.dataset.ids.length < 2); - if (hide_index || this.dataset.ids.length <= 1) { + this.$pager.toggle(this.dataset.ids.length > 1); + if (hide_index) { $(".oe_form_pager_state", this.$pager).html(""); } else { $(".oe_form_pager_state", this.$pager).html(_.str.sprintf(_t("%d / %d"), this.dataset.index + 1, this.dataset.ids.length)); From d76f02af51c7619047ff3ee230d7db7d17b1189c Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 19 Sep 2012 13:11:51 +0200 Subject: [PATCH 12/14] [FIX] text-ext z-index mess bzr revid: fme@openerp.com-20120919111151-ii1zu7egypmv1nsc --- addons/web/static/src/css/base.css | 8 ++++---- addons/web/static/src/css/base.sass | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 28bcb85dc44..e1b70932905 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -659,7 +659,7 @@ position: absolute; top: 26px; left: 0; - z-index: 1; + z-index: 3; margin: 0; padding: 0; border: 1px solid #afafb6; @@ -1158,7 +1158,7 @@ color: white; padding: 2px 4px; margin: 1px 6px 0 0; - border: 1px solid lightgrey; + border: 1px solid lightGray; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -1183,7 +1183,7 @@ transform: scale(1.1); } .openerp .oe_secondary_submenu .oe_active { - border-top: 1px solid lightgrey; + border-top: 1px solid lightGray; border-bottom: 1px solid #dedede; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2); @@ -2053,7 +2053,7 @@ } .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span { font-size: 80%; - color: darkgreen; + color: darkGreen; vertical-align: top; position: relative; top: -4px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 73a7c8d39e8..930a14d1c8b 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -563,7 +563,7 @@ $sheet-max-width: 860px position: absolute top: 26px left: 0 - z-index: 1 + z-index: 3 margin: 0 padding: 0 border: 1px solid $tag-border From e392d8a56a34cada1abc52563d78d8de9a68172d Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 19 Sep 2012 13:46:29 +0200 Subject: [PATCH 13/14] [FIX] Broken binary fields bzr revid: fme@openerp.com-20120919114629-wed3oo1rcw0bs5tu --- addons/web/static/src/css/base.css | 3 +++ addons/web/static/src/css/base.sass | 3 +++ addons/web/static/src/xml/base.xml | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index e1b70932905..eab6d8f2a01 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2224,6 +2224,9 @@ .openerp .oe_form_editable .oe_form .oe_form_field_datetime { width: 11.5em !important; } +.openerp .oe_hidden_input_file { + position: relative; +} .openerp .oe_hidden_input_file input.oe_form_binary_file { z-index: 0; line-height: 0; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 930a14d1c8b..f0786a35623 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1771,6 +1771,9 @@ $sheet-max-width: 860px * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image */ .oe_hidden_input_file + // Position: relative is used for the hidden input[type=file] + // Do not remove it anymore ! + position: relative input.oe_form_binary_file z-index: 0 line-height: 0 diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 232d4b618d7..fd1d03faf7e 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1120,7 +1120,7 @@ width: 83px; - From f0effde9d59231d2244f0115a02048a62027fa1b Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 19 Sep 2012 13:47:14 +0200 Subject: [PATCH 14/14] [IMP] summary of crm module bzr revid: fp@tinyerp.com-20120919114714-a2fe3l6kalvy6yus --- addons/crm/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py index a196f3d3f5f..135f4237f1c 100644 --- a/addons/crm/__openerp__.py +++ b/addons/crm/__openerp__.py @@ -25,7 +25,7 @@ 'version': '1.0', 'category': 'Customer Relationship Management', 'sequence': 2, - 'summary': 'Leads, Opportunities, Agenda', + 'summary': 'Leads, Opportunities, Phone Calls', 'description': """ The generic OpenERP Customer Relationship Management =====================================================