Merge lp:~openerp-dev/openobject-addons/7.0-opw-586451-pna into lp:openobject-addons/7.0

[Pinakin Nayi (OpenERP)]

Hello,

I fixed issue in base_calendar.

To Reproduce :
Login with any user except admin.
Create crm meeting with Privacy = private.
Try to save its generate warning like "Count cannot be negative or 0."

Thanks,
pna

[Naresh(OpenERP) (nch-openerp)]

review: Approve

[Martin Trigaux (OpenERP) (mat-openerp)]

Merged into addons 7.0
revno: 9250 [merge]
revision-id: <email address hidden>
Thanks for the patch

review: Approve

=== 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-02-19 12:58:25 +0000
@@ -1510,7 +1510,7 @@
                     continue
             if r['class']=='private':
                 for f in r.keys():
-                    if f not in ('id','date','date_deadline','duration','user_id','state'):
+                    if f not in ('id','date','date_deadline','duration','user_id','state','interval','count'):
                         if isinstance(r[f], list):
                             r[f] = []
                         else: