[MERGE] forward port of branch saas-3 up to 2c1bcfb
This commit is contained in:
commit
ed925892b9
|
@ -1527,7 +1527,7 @@ class calendar_event(osv.Model):
|
||||||
new_id = False
|
new_id = False
|
||||||
|
|
||||||
# Special write of complex IDS
|
# Special write of complex IDS
|
||||||
for event_id in ids:
|
for event_id in list(ids):
|
||||||
if len(str(event_id).split('-')) == 1:
|
if len(str(event_id).split('-')) == 1:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
@ -1545,7 +1545,7 @@ class calendar_event(osv.Model):
|
||||||
if data.get('rrule'):
|
if data.get('rrule'):
|
||||||
new_id = self._detach_one_event(cr, uid, event_id, values, context=None)
|
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
|
# set end_date for calendar searching
|
||||||
if values.get('recurrency', True) and values.get('end_type', 'count') in ('count', unicode('count')) and \
|
if values.get('recurrency', True) and values.get('end_type', 'count') in ('count', unicode('count')) and \
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
<field name="model">crm.lead</field>
|
<field name="model">crm.lead</field>
|
||||||
<field name="priority" eval="32"/>
|
<field name="priority" eval="32"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<tree string="Leads" colors="red:stage_id[1]=='Disinterested';black:stage_id[1]=='Interested'">
|
<tree string="Leads" colors="red:stage_id and stage_id[1]=='Disinterested';black:stage_id and stage_id[1]=='Interested'">
|
||||||
<field name="date_deadline" invisible="1"/>
|
<field name="date_deadline" invisible="1"/>
|
||||||
<field name="create_date"/>
|
<field name="create_date"/>
|
||||||
<field name="name" string="Subject"/>
|
<field name="name" string="Subject"/>
|
||||||
|
|
Loading…
Reference in New Issue