From 8e76938becb614ab8f763281587d47535309fcb0 Mon Sep 17 00:00:00 2001 From: Julien Legros Date: Thu, 23 Oct 2014 13:45:11 +0200 Subject: [PATCH 1/3] [FIX] web: correct display of dropdown arrows in ie11 --- addons/web/static/src/css/base.css | 3 +-- addons/web/static/src/css/base.sass | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index f024e906181..76a07eb3782 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -731,8 +731,7 @@ width: 0; height: 0; display: inline-block; - content: "&darr"; - text-indent: -99999px; + content: ""; vertical-align: top; margin-top: 8px; margin-left: 3px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index bb699e0b374..0520ea8b118 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -623,8 +623,7 @@ $sheet-padding: 16px width: 0 height: 0 display: inline-block - content: "&darr" - text-indent: -99999px + content: "" vertical-align: top margin-top: 8px //margin-left set at 3px to avoid a strange overflow From 076fedb6a784466525496700a5f21c7db73bf389 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Thu, 23 Oct 2014 15:05:55 +0200 Subject: [PATCH 2/3] [FIX] crm_partner_assign: colors only if there is a stage on the lead --- addons/crm_partner_assign/crm_portal_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm_partner_assign/crm_portal_view.xml b/addons/crm_partner_assign/crm_portal_view.xml index 3c0a2b6d140..7a8f31baf79 100644 --- a/addons/crm_partner_assign/crm_portal_view.xml +++ b/addons/crm_partner_assign/crm_portal_view.xml @@ -6,7 +6,7 @@ crm.lead - + From 2c1bcfb2c90c2dbe5273e890bad173e2f345bb1b Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Thu, 23 Oct 2014 16:40:53 +0200 Subject: [PATCH 3/3] [FIX] calendar: avoid to pass ids as string to unlink and write methods opw-616532: if the event is associated somehow to a workflow, an assert is done to check that element of the ids list are (int, long) --- addons/calendar/calendar.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/calendar/calendar.py b/addons/calendar/calendar.py index 6903e698e6a..870b9b7900b 100644 --- a/addons/calendar/calendar.py +++ b/addons/calendar/calendar.py @@ -1465,8 +1465,8 @@ class calendar_event(osv.Model): res = False new_id = False - # Special write of complex IDS - for event_id in ids: + # Special write of complex IDS + for event_id in list(ids): if len(str(event_id).split('-')) == 1: continue @@ -1484,7 +1484,7 @@ class calendar_event(osv.Model): if data.get('rrule'): new_id = self._detach_one_event(cr, uid, event_id, values, context=None) - res = super(calendar_event, self).write(cr, uid, ids, values, context=context) + res = super(calendar_event, self).write(cr, uid, [int(event_id) for event_id in ids], values, context=context) # set end_date for calendar searching if values.get('recurrency', True) and values.get('end_type', 'count') in ('count', unicode('count')) and \ @@ -1613,7 +1613,7 @@ class calendar_event(osv.Model): if self.browse(cr, uid, event_id).recurrent_id: ids_to_exclure.append(event_id) else: - ids_to_unlink.append(event_id) + ids_to_unlink.append(int(event_id)) else: ids_to_exclure.append(event_id)