From 81f4edc981253d8ff5f2ac76cc8f7e4685f995e2 Mon Sep 17 00:00:00 2001
From: "Sbh (OpenERP)" <sbh@tinyerp.com>
Date: Wed, 15 Dec 2010 13:01:36 +0530
Subject: [PATCH] base_calandar,crm: Merge the freq option with rule

bzr revid: sbh@tinyerp.com-20101215073136-qhlcf7mqv3n7u38x
---
 addons/base_calendar/base_calendar.py |  9 ++++-----
 addons/crm/crm_meeting_view.xml       | 10 +++++-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 3aecebb2307..7fa8677867a 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1026,7 +1026,6 @@ class calendar_event(osv.osv):
 
         qry = "UPDATE \"%s\" set rrule_type=%%s " % self._table
         qry_args = [ rrule_type, ]
-
         if rrule_type == 'custom':
             new_val = val.copy()
             for k, v in val.items():
@@ -1087,11 +1086,11 @@ class calendar_event(osv.osv):
                 if datas.get('rrule_type') == 'none':
                     result[event] = False
                     cr.execute("UPDATE %s set exrule=Null where id=%%s" % self._table,( event,))
-                elif datas.get('rrule_type') == 'custom':
+                if datas.get('rrule_type') :
                     if datas.get('interval', 0) < 0:
                         raise osv.except_osv(_('Warning!'), _('Interval can not be Negative'))
-                    if datas.get('count', 0) < 0:
-                        raise osv.except_osv(_('Warning!'), _('Count can not be Negative'))
+#                    if datas.get('count', 0) < 0:
+#                        raise osv.except_osv(_('Warning!'), _('Count can not be Negative'))
                     rrule_custom = self.compute_rule_string(cr, uid, datas, \
                                                          context=context)
                     result[event] = rrule_custom
@@ -1368,7 +1367,7 @@ true, it will allow you to hide the event alarm information without removing it.
         monthstring = ''
         yearstring = ''
 
-        freq = datas.get('freq')
+        freq = datas.get('rrule_type')
         if freq == 'None':
             return ''
 
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 65a33e4835d..525806eaea0 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -174,12 +174,12 @@
 	                        </group>
 		                    <separator string="Recurrency Rule" colspan="8"/>
 		                    <group col="6" colspan="4">
-		                        <field name="freq" />
+		                        <!--<field name="freq" />-->
 		                        <field name="interval" string="Repeat Times" attrs="{'invisible': [('end_date','!=',False)]}"/>
 		                        <field name="end_date" attrs="{'invisible': [('interval','!=',False)]}"/>
 		                    </group>
 		                    <group col="14" colspan="4" name="Select weekdays"
-		                        attrs="{'invisible' : [('freq','!=','weekly')]}">
+		                        attrs="{'invisible' : [('rrule_type','!=','weekly')]}">
 		                        <field name="mo" colspan="1" />
 		                        <field name="tu" colspan="1" />
 		                        <field name="we" colspan="1" />
@@ -191,7 +191,7 @@
 		                        <newline />
 		                    </group>
 		                    <group col="10" colspan="4"
-		                        attrs="{'invisible' : [('freq','!=','monthly'), ('freq','!=','yearly')]}">
+		                        attrs="{'invisible' : [('rrule_type','!=','monthly'), ('rrule_type','!=','yearly')]}">
 		                        <group col="2" colspan="1">
 		                            <field name="select1" />
 		                        </group>
@@ -208,10 +208,10 @@
 		                                attrs="{'required' : [('select1','=','day')]}" />
 		                        </group>
 		                        <group col="1" colspan="1"
-		                            attrs="{'invisible' : [('freq','!=','yearly')]}">
+		                            attrs="{'invisible' : [('rrule_type','!=','yearly')]}">
 		                            <field name="month_list" string="of"
 		                                colspan="1"
-		                                attrs="{'required' : [('freq','=','yearly')]}" />
+		                                attrs="{'required' : [('rrule_type','=','yearly')]}" />
 		                        </group>
 		                    </group>
 		                </group>