Merge lp:~openerp-dev/openobject-addons/trunk-calendar_recurrent_meetings-jap into lp:openobject-addons

[Jagdish Panchal (Open ERP)]

Hello,

I have improve code for Recurrent meetings as per specification.

Thanks
JAP

[qdp (OpenERP) (qdp)]

1) the domain is really weird, i guess that, by luck, there are always another argument following that is making a 'OR' with our clause, while the previous is combined with an 'AND'... And what we want is the contrary, isn't it?

so it should be
new_args = ['|','|', ('recurrency','=',1),('recurrent_id_date', arg[1], arg[2])] + original_arg

2) i don't get the reason of changing & to |... can you explain?

review: Needs Information

[lp:~openerp-dev/openobject-addons/trunk-calendar_recurrent_meetings-jap]

8661. By Jagdish Panchal (Open ERP) on 2013-04-24

[IMP] Imporve code for recurrent meeting

8662. By Jagdish Panchal (Open ERP) on 2013-04-25

[MERGE] Merge with main branch

8663. By Jagdish Panchal (Open ERP) on 2013-04-25

[IMP] Improve code

8664. By Jagdish Panchal (Open ERP) on 2013-04-25

[MERGE] Merge with main branch

[Jagdish Panchal (Open ERP) (jap-openerp)]

Hello,

Improve code as per suggetion.

Thanks
JAP

review: Needs Resubmitting

[lp:~openerp-dev/openobject-addons/trunk-calendar_recurrent_meetings-jap]

8665. By Jignesh Rathod(OpenERP) on 2013-05-27

[MERGE] merge wuth latest trunk

8666. By Nimesh Contractor(Open ERP) on 2013-06-06

[MERGE] with trunk.

Unmerged revisions

8666. By Nimesh Contractor(Open ERP) on 2013-06-06

[MERGE] with trunk.

8665. By Jignesh Rathod(OpenERP) on 2013-05-27

[MERGE] merge wuth latest trunk

8664. By Jagdish Panchal (Open ERP) on 2013-04-25

[MERGE] Merge with main branch

8663. By Jagdish Panchal (Open ERP) on 2013-04-25

[IMP] Improve code

8662. By Jagdish Panchal (Open ERP) on 2013-04-25

[MERGE] Merge with main branch

8661. By Jagdish Panchal (Open ERP) on 2013-04-24

[IMP] Imporve code for recurrent meeting

8660. By Jagdish Panchal (Open ERP) on 2013-04-17

[MERGE] Merge with main addons branch

8659. By Jagdish Panchal (Open ERP) on 2013-04-02

[IMP] base_calendar: improve code for recurrent meeting display in next month

=== modified file 'base_calendar/base_calendar.py'
--- base_calendar/base_calendar.py	2013-04-15 10:23:49 +0000
+++ base_calendar/base_calendar.py	2013-06-06 13:03:29 +0000
@@ -1001,7 +1001,6 @@
         @param context: A standard dictionary for contextual values
         @return: dictionary of rrule value.
         """
-
         result = {}
         if not isinstance(ids, list):
             ids = [ids]
@@ -1277,7 +1276,6 @@
         if freq:
             interval_srting = data.get('interval') and (';INTERVAL=' + str(data.get('interval'))) or ''
             res = 'FREQ=' + freq.upper() + get_week_string(freq, data) + interval_srting + get_end_date(data) + get_month_string(freq, data)
-
         return res
 
     def _get_empty_rrule_data(self):
@@ -1350,21 +1348,20 @@
         if context is None:
             context = {}
         new_args = []
-
         for arg in args:
             new_arg = arg
             if arg[0] in ('date', unicode('date'), 'date_deadline', unicode('date_deadline')):
                 if context.get('virtual_id', True):
-                    new_args += ['|','&',('recurrency','=',1),('recurrent_id_date', arg[1], arg[2])]
+                    new_args += ['|','|','&',('recurrency','=',1),('recurrent_id_date', arg[1], arg[2])]
+                    new_args += ['&',('recurrency','=',1),('end_date','>=',arg[2])]
             elif arg[0] == "id":
                 new_id = get_real_ids(arg[2])
                 new_arg = (arg[0], arg[1], new_id)
             new_args.append(new_arg)
-
         #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, res, args, limit, context=context)
         if count:
             return len(res)
         elif limit: