From 8c23e9f488fa3133c97164fe295ebf3b5204556a Mon Sep 17 00:00:00 2001 From: jir Date: Fri, 23 Mar 2012 16:19:55 +0530 Subject: [PATCH 1/2] [FIX] base_calender : Fixes the infinite created meeting problem lp bug: https://launchpad.net/bugs/961094 fixed bzr revid: jir@jir-desktop-20120323104955-bmnp2j4b9xiuf70w --- addons/base_calendar/base_calendar.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index 1545c6c920c..e475a793610 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -1002,8 +1002,8 @@ class calendar_event(osv.osv): event = datas['id'] if datas.get('interval', 0) < 0: raise osv.except_osv(_('Warning!'), _('Interval cannot be negative')) - if datas.get('count', 0) < 0: - raise osv.except_osv(_('Warning!'), _('Count cannot be negative')) + if datas.get('count', 0) <= 0: + raise osv.except_osv(_('Warning!'), _('Count cannot be negative or 0')) if datas['recurrency']: result[event] = self.compute_rule_string(datas) else: From d3fb28b0ad8a0e9986e54455304f84aec134c17b Mon Sep 17 00:00:00 2001 From: jir Date: Thu, 29 Mar 2012 12:30:42 +0530 Subject: [PATCH 2/2] [FIX] Fixes the infinity when give a blank value in recurrence termination lp bug: https://launchpad.net/bugs/961094 fixed bzr revid: jir@jir-desktop-20120329070042-tm4lvczvq6frc3yq --- addons/crm/crm_meeting_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml index 527f5814be4..3d2538b67ff 100644 --- a/addons/crm/crm_meeting_view.xml +++ b/addons/crm/crm_meeting_view.xml @@ -171,7 +171,7 @@ - +