odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] forward port of branch saas-3 up to 2c1bcfb

This commit is contained in:
Christophe Simonis 2014-10-23 16:52:37 +02:00
parent 6bd36a8613 2c1bcfb2c9
commit ed925892b9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/calendar/calendar.py
View File

@ -1526,8 +1526,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
@ -1545,7 +1545,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 \

2
addons/crm_partner_assign/crm_portal_view.xml
View File

@ -6,7 +6,7 @@
<field name="model">crm.lead</field>
<field name="priority" eval="32"/>
<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="create_date"/>
<field name="name" string="Subject"/>