From e178275b98899078fe95e462ef1b6e5a51c106ac Mon Sep 17 00:00:00 2001 From: "pso (OpenERP)" Date: Fri, 3 Aug 2012 17:23:23 +0530 Subject: [PATCH 01/15] [IMP] account: Removed Or and Skip from configuration view bzr revid: pso@tinyerp.com-20120803115323-uq78whuliv3ivgvp --- addons/account/account_installer.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml index 8e2526c3f97..9f0b69e1f6b 100644 --- a/addons/account/account_installer.xml +++ b/addons/account/account_installer.xml @@ -9,9 +9,9 @@
Accounting Application Configuration
- + From e9eb895c6a76be5e590777e691815c36e5521774 Mon Sep 17 00:00:00 2001 From: "Saurang Suthar(OpenERP)" <> Date: Fri, 3 Aug 2012 17:53:54 +0530 Subject: [PATCH 02/15] [IMP] stock: Added default vals of location and hidden by location group bzr revid: pso@tinyerp.com-20120803122354-3y3ge823cgo9edlk --- addons/stock/stock.py | 20 ++++++++++++++++++++ addons/stock/stock_view.xml | 14 +++++++------- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 9752f0c78f4..39de341bfe7 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -2801,6 +2801,14 @@ class stock_inventory_line(osv.osv): 'state': fields.related('inventory_id','state',type='char',string='Status',readonly=True), } + def _default_stock_location(self, cr, uid, context=None): + stock_location = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock') + return stock_location.id + + _defaults = { + 'location_id': _default_stock_location + } + def on_change_product_id(self, cr, uid, ids, location_id, product, uom=False, to_date=False): """ Changes UoM and name if product_id changes. @param location_id: Location id @@ -2832,8 +2840,20 @@ class stock_warehouse(osv.osv): 'lot_stock_id': fields.many2one('stock.location', 'Location Stock', required=True, domain=[('usage','=','internal')]), 'lot_output_id': fields.many2one('stock.location', 'Location Output', required=True, domain=[('usage','<>','view')]), } + + def _default_lot_input_stock_id(self, cr, uid, context=None): + lot_input_stock = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock') + return lot_input_stock.id + + def _default_lot_output_id(self, cr, uid, context=None): + lot_output = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_output') + return lot_output.id + _defaults = { 'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.inventory', context=c), + 'lot_input_id': _default_lot_input_stock_id, + 'lot_stock_id': _default_lot_input_stock_id, + 'lot_output_id': _default_lot_output_id, } stock_warehouse() diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 3c08c1eaff0..c0cfec7f881 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -626,9 +626,9 @@

- - - + + + @@ -645,9 +645,9 @@ - - - + + + @@ -734,7 +734,7 @@ - + From a34333914930ee26dd8b77a4cac9b7603dc6e7f2 Mon Sep 17 00:00:00 2001 From: "Pinakin Nayi(OpenERP)" <> Date: Mon, 6 Aug 2012 11:06:15 +0530 Subject: [PATCH 03/15] [IMP] project: Improved task view bzr revid: pso@tinyerp.com-20120806053615-0nv0ent4qr8wdakw --- addons/project/project_view.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index ae86f9712a3..d7354f77618 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -415,7 +415,7 @@ - + @@ -538,15 +538,15 @@
- - + + - 7 - 7 + 7 + 7
- + N From d6f1cdbe5c433b7660ffe6706bd9504d1743e5cc Mon Sep 17 00:00:00 2001 From: "Bharat Devnani (Open ERP)" <> Date: Mon, 6 Aug 2012 11:22:13 +0530 Subject: [PATCH 04/15] [IMP] crm: Added default true in schedule call object bzr revid: pso@tinyerp.com-20120806055213-s2aa2mvntbzdazc8 --- addons/crm/crm_phonecall.py | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py index e73089bfff8..b3043ce09b8 100644 --- a/addons/crm/crm_phonecall.py +++ b/addons/crm/crm_phonecall.py @@ -81,6 +81,7 @@ class crm_phonecall(base_state, osv.osv): 'priority': crm.AVAILABLE_PRIORITIES[2][0], 'state': _get_default_state, 'user_id': lambda self,cr,uid,ctx: uid, + 'active': 1 } def create(self, cr, uid, vals, context=None): From b8e21e9799715636db325a3b7a11cc3147641897 Mon Sep 17 00:00:00 2001 From: "Saurang Suthar (OpenERP)" <> Date: Mon, 6 Aug 2012 12:01:02 +0530 Subject: [PATCH 05/15] [IMP] base_calendar: Improved meeting view bzr revid: pso@tinyerp.com-20120806063102-vt359ei5ez33djmc --- addons/base_calendar/crm_meeting.py | 2 +- addons/base_calendar/crm_meeting_view.xml | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py index 239ab8d0f28..cb96ff2a4d0 100644 --- a/addons/base_calendar/crm_meeting.py +++ b/addons/base_calendar/crm_meeting.py @@ -63,7 +63,7 @@ class crm_meeting(base_state, osv.Model): 'event_id', 'attendee_id', 'Attendees', states={'done': [('readonly', True)]}), } _defaults = { - 'state': 'draft', + 'state': 'open', } # ---------------------------------------- diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml index d3371ad602a..a70bca5ec09 100644 --- a/addons/base_calendar/crm_meeting_view.xml +++ b/addons/base_calendar/crm_meeting_view.xml @@ -72,15 +72,7 @@
-
From 4c2a3f49698f74804fc240bd13956d49a4831a0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Mon, 6 Aug 2012 12:24:31 +0200 Subject: [PATCH 06/15] [FIX] purchase_requisition: fixed mail.message inheritance, where behavior specific to this module was executed for every composed message. bzr revid: tde@openerp.com-20120806102431-2vw87hw656kss0q0 --- .../purchase_requisition.py | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py index 1b0c36b114b..85ce92ad7ac 100644 --- a/addons/purchase_requisition/purchase_requisition.py +++ b/addons/purchase_requisition/purchase_requisition.py @@ -201,17 +201,18 @@ class mail_message(osv.osv): email_bcc=None, reply_to=False, attachments=None, message_id=False, references=False, res_id=False, subtype='plain', headers=None, mail_server_id=False, auto_delete=False, context=None): - purchase_order_obj = self.pool.get('purchase.order') - requisition_id = purchase_order_obj.browse(cr, uid, res_id, context=context).requisition_id.id result = super(mail_message, self).schedule_with_attach(cr, uid, email_from, email_to, subject, body, model=model, email_cc=email_cc, - email_bcc=email_bcc, reply_to=reply_to, attachments=attachments, message_id=message_id, references=references, - res_id=res_id, subtype='plain', headers=headers, mail_server_id=mail_server_id, auto_delete=auto_delete, - context=context) - if requisition_id: - result = self.schedule_with_attach(cr, uid, email_from, email_to, subject, body, 'purchase.requisition', email_cc=email_cc, - email_bcc=email_bcc, reply_to=reply_to, attachments=attachments, message_id=message_id, references=references, - res_id=requisition_id, subtype='plain', headers=headers, mail_server_id=mail_server_id, auto_delete=auto_delete, - context=context) + email_bcc=email_bcc, reply_to=reply_to, attachments=attachments, message_id=message_id, references=references, + res_id=res_id, subtype='plain', headers=headers, mail_server_id=mail_server_id, auto_delete=auto_delete, + context=context) + # check model is purchase.order + if model and model == 'purchase.order' and res_id: + requisition_id = self.pool.get('purchase.order').browse(cr, uid, res_id, context=context).requisition_id + if requisition_id: + result = self.schedule_with_attach(cr, uid, email_from, email_to, subject, body, 'purchase.requisition', email_cc=email_cc, + email_bcc=email_bcc, reply_to=reply_to, attachments=attachments, message_id=message_id, references=references, + res_id=requisition_id.id, subtype='plain', headers=headers, mail_server_id=mail_server_id, auto_delete=auto_delete, + context=context) return result class purchase_requisition_line(osv.osv): From 67a9ddd3f8b2624443b6691c4d54288331d9985c Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Mon, 6 Aug 2012 12:45:14 +0200 Subject: [PATCH 07/15] [REM] fields float integer useless warning, required can be used to color the field in blue on form view bzr revid: al@openerp.com-20120806104514-3cx1dm2bewhmlvbo --- openerp/osv/fields.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py index fb13707d13d..4ff23956050 100644 --- a/openerp/osv/fields.py +++ b/openerp/osv/fields.py @@ -171,11 +171,6 @@ class integer(_column): def __init__(self, string='unknown', required=False, **args): super(integer, self).__init__(string=string, required=required, **args) - if required: - _logger.debug( - "required=True is deprecated: making an integer field" - " `required` has no effect, as NULL values are " - "automatically turned into 0.") class reference(_column): _type = 'reference' @@ -246,11 +241,6 @@ class float(_column): self.digits = digits # synopsis: digits_compute(cr) -> (precision, scale) self.digits_compute = digits_compute - if required: - _logger.debug( - "required=True is deprecated: making a float field" - " `required` has no effect, as NULL values are " - "automatically turned into 0.0.") def digits_change(self, cr): if self.digits_compute: From b0d95be9685fe774c06602dea87f3929e937d73f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Mon, 6 Aug 2012 12:51:38 +0200 Subject: [PATCH 08/15] [FIX] subtype -> content_subtype. bzr revid: tde@openerp.com-20120806105138-ipcsz8yscof5eg0f --- addons/purchase_requisition/purchase_requisition.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py index 85ce92ad7ac..8ba12657405 100644 --- a/addons/purchase_requisition/purchase_requisition.py +++ b/addons/purchase_requisition/purchase_requisition.py @@ -199,19 +199,19 @@ class mail_message(osv.osv): def schedule_with_attach(self, cr, uid, email_from, email_to, subject, body, model=False, email_cc=None, email_bcc=None, reply_to=False, attachments=None, message_id=False, references=False, - res_id=False, subtype='plain', headers=None, mail_server_id=False, auto_delete=False, + res_id=False, content_subtype='plain', headers=None, mail_server_id=False, auto_delete=False, context=None): result = super(mail_message, self).schedule_with_attach(cr, uid, email_from, email_to, subject, body, model=model, email_cc=email_cc, email_bcc=email_bcc, reply_to=reply_to, attachments=attachments, message_id=message_id, references=references, - res_id=res_id, subtype='plain', headers=headers, mail_server_id=mail_server_id, auto_delete=auto_delete, + res_id=res_id, content_subtype=content_subtype, headers=headers, mail_server_id=mail_server_id, auto_delete=auto_delete, context=context) # check model is purchase.order if model and model == 'purchase.order' and res_id: requisition_id = self.pool.get('purchase.order').browse(cr, uid, res_id, context=context).requisition_id if requisition_id: - result = self.schedule_with_attach(cr, uid, email_from, email_to, subject, body, 'purchase.requisition', email_cc=email_cc, + result = self.schedule_with_attach(cr, uid, email_from, email_to, subject, body, model='purchase.requisition', email_cc=email_cc, email_bcc=email_bcc, reply_to=reply_to, attachments=attachments, message_id=message_id, references=references, - res_id=requisition_id.id, subtype='plain', headers=headers, mail_server_id=mail_server_id, auto_delete=auto_delete, + res_id=requisition_id.id, content_subtype=content_subtype, headers=headers, mail_server_id=mail_server_id, auto_delete=auto_delete, context=context) return result From 3aab9f4f56e1b152f2e4be221b5feee976e6af39 Mon Sep 17 00:00:00 2001 From: "Pinakin Nayi (OpenERP)" Date: Mon, 6 Aug 2012 17:47:22 +0530 Subject: [PATCH 09/15] [IMP]accounting-option-wizard bzr revid: pna@tinyerp.com-20120806121722-w2r8givb32dl0mn3 --- addons/account/installer.py | 9 +++++++++ addons/project/project_view.xml | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/addons/account/installer.py b/addons/account/installer.py index 5a2b0b346c4..4fc4754ea3f 100644 --- a/addons/account/installer.py +++ b/addons/account/installer.py @@ -119,6 +119,15 @@ class account_installer(osv.osv_memory): self.execute_simple(cr, uid, ids, context) super(account_installer, self).execute(cr, uid, ids, context=context) + def action_next(self, cr, uid, ids, context=None): + next = self.execute(cr, uid, ids, context=context) + for installer in self.browse(cr, uid, ids, context=context): + if installer.charts == 'l10n_be': + return {'type': 'ir.actions.act_window_close'} + else : + if next : return next + return self.next(cr, uid, ids, context=context) + def execute_simple(self, cr, uid, ids, context=None): if context is None: context = {} diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index ae86f9712a3..79593109593 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -546,7 +546,7 @@
- + N From 6b8c1d2828d7309b83b3b6f623df4dc6ba726930 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 6 Aug 2012 15:53:12 +0200 Subject: [PATCH 10/15] [FIX] Fixed openerp classname in jQuery Tipsy The classname should be present before tipsy computes it's width/height ! bzr revid: fme@openerp.com-20120806135312-b3xlvbba0m0rzr1a --- addons/web/static/lib/jquery.tipsy/jquery.tipsy.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/web/static/lib/jquery.tipsy/jquery.tipsy.js b/addons/web/static/lib/jquery.tipsy/jquery.tipsy.js index f36c9bdb43a..5929d591261 100644 --- a/addons/web/static/lib/jquery.tipsy/jquery.tipsy.js +++ b/addons/web/static/lib/jquery.tipsy/jquery.tipsy.js @@ -27,7 +27,7 @@ var $tip = this.tip(); $tip.find('.tipsy-inner')[this.options.html ? 'html' : 'text'](title); - $tip[0].className = 'tipsy'; // reset classname in case of dynamic gravity + $tip[0].className = 'tipsy openerp oe_tooltip '; // reset classname in case of dynamic gravity $tip.remove().css({top: 0, left: 0, visibility: 'hidden', display: 'block'}).prependTo(document.body); var pos = $.extend({}, this.$element.offset(), { @@ -63,7 +63,7 @@ } } - $tip.css(tp).addClass('openerp oe_tooltip tipsy-' + gravity); + $tip.css(tp).addClass('tipsy-' + gravity); $tip.find('.tipsy-arrow')[0].className = 'tipsy-arrow tipsy-arrow-' + gravity.charAt(0); if (this.options.className) { $tip.addClass(maybeCall(this.options.className, this.$element[0])); From 0cecacd43e14c920da4c4d961c87223ab8330b96 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 6 Aug 2012 16:00:44 +0200 Subject: [PATCH 11/15] [IMP] Improved m2o tooltip bzr revid: fme@openerp.com-20120806140044-mgo3git8zi9xrqbh --- addons/web/static/src/css/base.css | 13 +++++++++++++ addons/web/static/src/css/base.sass | 10 ++++++++++ addons/web/static/src/js/chrome.js | 1 + addons/web/static/src/js/view_form.js | 14 ++++++++++++-- addons/web/static/src/xml/base.xml | 7 +++++++ 5 files changed, 43 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 8f35c81de2d..029b3ef4f10 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -602,6 +602,19 @@ .openerp.oe_tooltip .oe_tooltip_technical_title { font-weight: bold; } +.openerp.oe_tooltip .oe_tooltip_close { + margin: -5px 0 0 2px; + cursor: default; + float: right; + color: white; +} +.openerp.oe_tooltip .oe_tooltip_close:hover { + color: #999999; + cursor: pointer; +} +.openerp.oe_tooltip .oe_tooltip_message { + max-width: 310px; +} .openerp .oe_notebook { margin: 8px 0; padding: 0 16px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 688c306169b..449d76b882b 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -469,6 +469,16 @@ $sheet-max-width: 860px list-style: circle .oe_tooltip_technical_title font-weight: bold + .oe_tooltip_close + margin: -5px 0 0 2px + cursor: default + float: right + color: white + &:hover + color: #999 + cursor: pointer + .oe_tooltip_message + max-width: 310px // }}} // Notebook {{{ .oe_notebook diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 694ffc3b722..503cb337103 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -979,6 +979,7 @@ instance.web.Client = instance.web.Widget.extend({ }, 0); }); instance.web.bus.on('click', this, function(ev) { + $.fn.tipsy.clear(); if (!$(ev.target).is('input[type=file]')) { self.$element.find('.oe_dropdown_menu.oe_opened').removeClass('oe_opened'); } diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index c4e13dabae2..f69bf39f824 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2711,10 +2711,20 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc self.$input.tipsy({ title: function() { - return "No element was selected, you should create or select one from the dropdown list."; + return QWeb.render('Tipsy.alert', { + message: "No element was selected, you should create or select one from the dropdown list." + }); }, trigger:'manual', fade: true, + gravity: 's', + html: true, + opacity: 1, + offset: 4, + }); + + self.$input.on('focus', function() { + self.$input.tipsy("hide"); }); this.$drop_down = this.$element.find(".oe_m2o_drop_down_button"); @@ -2768,7 +2778,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc var tip_def = $.Deferred(); var untip_def = $.Deferred(); var tip_delay = 200; - var tip_duration = 3000; + var tip_duration = 15000; var anyoneLoosesFocus = function() { var used = false; if (self.floating) { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index c45b2d7f226..601fe165f81 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -25,6 +25,13 @@
+ + [ + +
+ +
+ From c7f04c43c7c29bf226c13287d09c9b24a78dd7a2 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 6 Aug 2012 17:02:48 +0200 Subject: [PATCH 12/15] [FIX] Stuck in login when creating a new database bzr revid: fme@openerp.com-20120806150248-am7gql5pr1bfyunl --- addons/web/static/src/js/chrome.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 503cb337103..45cbaf46bfb 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -400,6 +400,9 @@ instance.web.DatabaseManager = instance.web.Widget.extend({ 'db': form_obj['db_name'], 'login': 'admin', 'password': form_obj['create_admin_pwd'], + 'login_successful': function() { + instance.webclient.show_application(); + }, }, }; self.do_action(client_action); From c10136071d47e4e12d622f16279fb0db0202453d Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 6 Aug 2012 17:32:08 +0200 Subject: [PATCH 13/15] [REV] Reverted Revision: 2636 revid:nicolas.vanhoren@openerp.com-20120627153131-uxp6d2l4ri8xjoz5 bzr revid: fme@openerp.com-20120806153208-fbet6xbs365ir6lm --- addons/web_kanban/static/src/js/kanban.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index a17f77be1e8..29c26bbca29 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -320,7 +320,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ }, open_record: function(id, editable) { if (this.dataset.select_id(id)) { - this.do_switch_view('form', null); + this.do_switch_view('form', null, { editable: editable }); } else { this.do_warn("Kanban: could not find id#" + id); } From 20ae82a823e6f4cc8ed39d556b57c1071ae787f0 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 6 Aug 2012 17:54:05 +0200 Subject: [PATCH 14/15] [REV] Revert Revision: 2677 revid:fp@tinyerp.com-20120705123259-okklz6m7nfziqaqf bzr revid: fme@openerp.com-20120806155405-vw1qgz5btqd6hzvp --- addons/web_kanban/static/src/js/kanban.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 29c26bbca29..4477b4dc01f 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -256,7 +256,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ scroll: false }); } else { - this.$element.find('.oe_kanban_draghandle').removeClass('oe_kanban_draghandle').removeClass('oe_kanban_card'); + this.$element.find('.oe_kanban_draghandle').removeClass('oe_kanban_draghandle'); } }, on_record_moved : function(record, old_group, old_index, new_group, new_index) { @@ -606,7 +606,7 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({ // If no draghandle is found, make the whole card as draghandle if (!this.$element.find('.oe_kanban_draghandle').length) { - this.$element.children(':first').addClass('oe_kanban_draghandle').addClass('oe_kanban_card'); + this.$element.children(':first').addClass('oe_kanban_draghandle'); } this.$element.find('.oe_kanban_action').click(function() { From 4e641e9f2c0b5dba1ba8bc937d54c7108c1241ab Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 6 Aug 2012 18:09:22 +0200 Subject: [PATCH 15/15] [IMP] Don't display the many2one icon if it's value is empty. bzr revid: fme@openerp.com-20120806160922-d4b59jzsu2nx2yl7 --- addons/web/static/src/js/view_form.js | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index f69bf39f824..56d8e3379e4 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2698,6 +2698,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc this.on("change:value", this, function() { this.floating = false; this.render_value(); + this.$('.oe_m2o_cm_button').css({'visibility': this.is_false() ? 'hidden' : 'visible'}); }); }, initialize_content: function() {