[REF] base_calendar
bzr revid: qdp-launchpad@openerp.com-20121210142630-7x0nvai3txoe3ba6
This commit is contained in:
parent
e957a933cb
commit
c6475a4cf6
|
@ -1034,7 +1034,7 @@ rule or repeating pattern of time to exclude from the recurring rule."),
|
|||
help="Set an alarm at this time, before the event occurs" ),
|
||||
'base_calendar_alarm_id': fields.many2one('calendar.alarm', 'Alarm'),
|
||||
'recurrent_uid': fields.integer('Recurrent ID'),
|
||||
'recurrent_id': fields.datetime('Recurrent ID date'),
|
||||
'recurrent_id_date': fields.datetime('Recurrent ID date'),
|
||||
'vtimezone': fields.selection(_tz_get, size=64, string='Timezone'),
|
||||
'user_id': fields.many2one('res.users', 'Responsible', states={'done': [('readonly', True)]}),
|
||||
'organizer': fields.char("Organizer", size=256, states={'done': [('readonly', True)]}), # Map with organizer attribute of VEvent.
|
||||
|
@ -1392,7 +1392,7 @@ rule or repeating pattern of time to exclude from the recurring rule."),
|
|||
data.update(
|
||||
vals,
|
||||
recurrent_uid=real_event_id,
|
||||
recurrent_id=data.get('date'),
|
||||
recurrent_id_date=data.get('date'),
|
||||
rrule_type=False,
|
||||
rrule='',
|
||||
recurrency=False,
|
||||
|
|
|
@ -100,7 +100,7 @@
|
|||
<field name="user_id" string="Responsible User"/>
|
||||
<field name="show_as" string="Show Time as"/>
|
||||
<field name="class" string="Privacy"/>
|
||||
<field name="recurrent_id" invisible="1"/>
|
||||
<field name="recurrent_id_date" invisible="1"/>
|
||||
<field name="recurrent_uid" invisible="1"/>
|
||||
</group>
|
||||
<separator string="Description"/>
|
||||
|
|
|
@ -67,14 +67,9 @@ class crm_meeting(base_state, osv.Model):
|
|||
}
|
||||
|
||||
def message_get_subscription_data(self, cr, uid, ids, context=None):
|
||||
res = {}
|
||||
for virtual_id in ids:
|
||||
real_id = base_calendar.base_calendar_id2real_id(virtual_id)
|
||||
result = super(crm_meeting, self).message_get_subscription_data(cr, uid, [real_id], context=context)
|
||||
res[virtual_id] = result[real_id]
|
||||
return res
|
||||
real_ids = [base_calendar.base_calendar_id2real_id(virtual_id) for virtual_id in ids]
|
||||
return super(crm_meeting, self).message_get_subscription_data(cr, uid, real_ids, context=context)
|
||||
|
||||
|
||||
def copy(self, cr, uid, id, default=None, context=None):
|
||||
default = default or {}
|
||||
default['attendee_ids'] = False
|
||||
|
@ -161,4 +156,4 @@ class ir_attachment(osv.osv):
|
|||
else:
|
||||
return res
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -166,7 +166,7 @@
|
|||
<field name="class"/>
|
||||
<field name="show_as"/>
|
||||
<field name="rrule" invisible="1" readonly="1"/>
|
||||
<field name="recurrent_id" invisible="1"/>
|
||||
<field name="recurrent_id_date" invisible="1"/>
|
||||
<field name="recurrent_uid" invisible="1"/>
|
||||
</group>
|
||||
</group>
|
||||
|
|
|
@ -92,6 +92,6 @@
|
|||
I check whether the record is edited perfectly or not.
|
||||
-
|
||||
!python {model: crm.meeting}: |
|
||||
meeting_ids = self.search(cr, uid, [('recurrent_uid', '=', ref('crm_meeting_reviewcodewithprogrammer0')), ('recurrent_id','=','2011-04-25 12:47:00')], context)
|
||||
meeting_ids = self.search(cr, uid, [('recurrent_uid', '=', ref('crm_meeting_reviewcodewithprogrammer0')), ('recurrent_id_date','=','2011-04-25 12:47:00')], context)
|
||||
assert meeting_ids, 'Meeting is not edited !'
|
||||
|
||||
|
|
Loading…
Reference in New Issue