Arnaud Pineux (OpenERP) has proposed merging 
lp:~openerp-dev/openobject-addons/7.0-bug-1093779-api into 
lp:openobject-addons/7.0.

Requested reviews:
  qdp (OpenERP) (qdp)
Related bugs:
  Bug #1093779 in OpenERP Addons: "[7.0] base_calendar recurrent meetings "
  https://bugs.launchpad.net/openobject-addons/+bug/1093779

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/7.0-bug-1093779-api/+merge/141727

This fix resolve the following problem:
- When there is a recurrent meeting, if the first date is not inside the 
calendar view dates, its recurrent meetings will not be displayed.

-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/7.0-bug-1093779-api/+merge/141727
Your team OpenERP R&D Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/7.0-bug-1093779-api.
=== modified file 'base_calendar/base_calendar.py'
--- base_calendar/base_calendar.py	2012-12-28 11:18:53 +0000
+++ base_calendar/base_calendar.py	2013-01-03 10:12:55 +0000
@@ -1364,7 +1364,7 @@
         #offset, limit and count must be treated separately as we may need to deal with virtual ids
         res = super(calendar_event, self).search(cr, uid, new_args, offset=0, limit=0, order=order, context=context, count=False)
         if context.get('virtual_id', True):
-            res = self.get_recurrent_ids(cr, uid, res, new_args, limit, context=context)
+            res += self.get_recurrent_ids(cr, uid, super(calendar_event, self).search(cr, uid, [('recurrency','=',1)], offset=0, limit=0, order=order, context=context, count=False), new_args, limit, context=context)
         if count:
             return len(res)
         elif limit:

_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to     : openerp-dev-gtk@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help   : https://help.launchpad.net/ListHelp

Reply via email to