From e86660db885fb585565df9707f89d6d10f6f66f6 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Wed, 10 Feb 2010 10:12:00 +0530
Subject: [PATCH 01/28] [IMP]:Avg for groupby

bzr revid: nch@tinyerp.com-20100210044200-mel3e6eqaqfxyz5q
---
 bin/osv/orm.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 95d0b5685f3..0808357d753 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1834,9 +1834,13 @@ class orm(orm_template):
         fields_pre = [f for f in float_int_fields if
                    f == self.CONCURRENCY_CHECK_FIELD
                 or (f in self._columns and getattr(self._columns[f], '_classic_write'))]
+        avg_fields = context.get('avg',[])
         for f in fields_pre:
             if f not in ['id','sequence']:
-                flist += ',sum('+f+') as '+f
+                if f in avg_fields:
+                    flist += ',avg('+f+') as '+f
+                else:
+                    flist += ',sum('+f+') as '+f
         cr.execute('select min(id) as id,'+flist+' from ' + self._table +qu1+' group by '+ groupby + limit_str + offset_str,qu2)
         alldata = {}
         for r in cr.dictfetchall():

From 50c876dfd860acd02888cb805c78ba9c059c1f69 Mon Sep 17 00:00:00 2001
From: "Rvo (Open ERP)" <rvo@tinyerp.co.in>
Date: Wed, 10 Feb 2010 11:38:42 +0530
Subject: [PATCH 02/28] [IMP]:added dynamically alocation of resources on tasks

bzr revid: rvo@tinyerp.co.in-20100210060842-76k3gygo4oc182x6
---
 addons/project/wizard/compute_tasks_date.py | 250 ++++++++++++--------
 1 file changed, 152 insertions(+), 98 deletions(-)

diff --git a/addons/project/wizard/compute_tasks_date.py b/addons/project/wizard/compute_tasks_date.py
index db3c52ba7f2..a5037997dde 100644
--- a/addons/project/wizard/compute_tasks_date.py
+++ b/addons/project/wizard/compute_tasks_date.py
@@ -24,6 +24,8 @@ import pooler
 from tools.translate import _
 import datetime
 from resource.faces import *
+from new import classobj
+import operator
 
 compute_form = """<?xml version="1.0" ?>
 <form string="Compute Scheduling of Tasks">
@@ -32,7 +34,7 @@ compute_form = """<?xml version="1.0" ?>
 
 success_msg = """<?xml version="1.0" ?>
 <form string="Compute Scheduling of Tasks">
-    <label string="Task Scheduling completed scccessfully."/>
+    <label string="Task Scheduling completed successfully."/>
 </form>"""
 
 compute_fields = {
@@ -40,20 +42,38 @@ compute_fields = {
 
 }
 def timeformat_convert(cr, uid, time_string, context={}):
+#    Function to convert input time string:: 8.5 to output time string 8:30
+
         strg = str(time_string)[-2:]
         last_strg = str(time_string)[0:-2]
         if strg != '.0':
             if '.' not in strg:
                 strg = '.' + strg
                 last_strg = str(time_string)[:-3]
-
             new_strg = round(float(strg) / 0.016666667)
             converted_strg = last_strg + ':' + str(new_strg)[:-2]
         else:
             converted_strg = last_strg + ':00'
-
         return converted_strg
 
+def leaves_resource(cr,uid,id):
+#    To get the leaves for the members working on project
+
+        pool = pooler.get_pool(cr.dbname)
+        resource_leaves_pool = pool.get('resource.calendar.leaves')
+        resource_leave_ids = resource_leaves_pool.search(cr,uid,[('resource_id','=',id)])
+        leaves = []
+        if resource_leave_ids:
+            res_leaves = resource_leaves_pool.read(cr,uid,resource_leave_ids,['date_from','date_to'])
+            for leave in range(len(res_leaves)):
+                    dt_start = datetime.datetime.strptime(res_leaves[leave]['date_from'],'%Y-%m-%d %H:%M:%S')
+                    dt_end = datetime.datetime.strptime(res_leaves[leave]['date_to'],'%Y-%m-%d %H:%M:%S')
+                    no = dt_end - dt_start
+                    leave_days = no.days + 1
+            [leaves.append((dt_start + datetime.timedelta(days=x)).strftime('%Y-%m-%d')) for x in range(int(leave_days))]
+            leaves.sort()
+        return leaves
+
 class wizard_compute_tasks(wizard.interface):
 
     def _compute_date(self, cr, uid, data, context):
@@ -63,115 +83,149 @@ class wizard_compute_tasks(wizard.interface):
         resource_pool = pool.get('resource.resource')
         resource_leaves_pool = pool.get('resource.calendar.leaves')
         resource_week_pool = pool.get('resource.calendar.week')
-        
+        user_pool = pool.get('res.users')
+
         project_id = data['form']['project_id']
         project = project_pool.browse(cr,uid,project_id)
         task_ids = task_pool.search(cr,uid,[('project_id','=',project_id)])
         if task_ids:
+            wktime_cal = []
+            leaves = []
+            task_ids.sort()
             task_obj = task_pool.browse(cr,uid,task_ids)
             task_1 = task_obj[0]
-            if task_1.date_start:
-                date_dt = datetime.datetime.strptime(task_1.date_start,"%Y-%m-%d %H:%M:%S")
-            else:
-                date_dt = datetime.datetime.strptime(project.date_start,"%Y-%m-%d")
-            dt = datetime.datetime.strftime(date_dt,"%Y-%m-%d %H:%M")
+            dt_start = datetime.datetime.strftime(datetime.datetime.strptime(project.date_start,"%Y-%m-%d"),"%Y-%m-%d %H:%M")
+            calendar_id = project.resource_calendar_id.id
 
-            for i in range(len(task_obj)):
-                final_lst = []
+#     If project has a working calendar then that would be used otherwise
+#     the default faces calendar would  be used
+            if calendar_id:
+                resource_leave_ids = resource_leaves_pool.search(cr,uid,[('calendar_id','=',calendar_id)])
+                time_range = "8:00-8:00"
+                non_working = ""
+                wk = {"0":"mon","1":"tue","2":"wed","3":"thu","4":"fri","5":"sat","6":"sun"}
+                wk_days = {}
+                wk_time = {}
+                wktime_list = []
+                week_ids = resource_week_pool.search(cr,uid,[('calendar_id','=',calendar_id)])
+                week_obj = resource_week_pool.read(cr,uid,week_ids,['dayofweek','hour_from','hour_to'])
+
+#     Converting time formats into appropriate format required
+#     and creating a list like [('mon', '8:00-12:00'), ('mon', '13:00-18:00')]
+                for week in week_obj:
+                    res_str = ""
+                    if wk.has_key(week['dayofweek']):
+                        day = wk[week['dayofweek']]
+                        wk_days[week['dayofweek']] = wk[week['dayofweek']]
+
+                    hour_from_str = timeformat_convert(cr,uid,week['hour_from'])
+                    hour_to_str = timeformat_convert(cr,uid,week['hour_to'])
+                    res_str = hour_from_str + '-' + hour_to_str
+                    wktime_list.append((day,res_str))
+
+#     Converting it to format like [('mon', '8:00-12:00', '13:00-18:00')]
+                for item in wktime_list:
+                    if wk_time.has_key(item[0]):
+                        wk_time[item[0]].append(item[1])
+                    else:
+                        wk_time[item[0]] = [item[0]]
+                        wk_time[item[0]].append(item[1])
+
+                for k,v in wk_time.items():
+                    wktime_cal.append(tuple(v))
+
+#     For non working days adding [('tue,wed,fri,sat,sun', '8:00-8:00')]
+                for k,v in wk_days.items():
+                    if wk.has_key(k):
+                        wk.pop(k)
+                for v in wk.itervalues():
+                    non_working += v + ','
+                if non_working:
+                    wktime_cal.append((non_working[:-1],time_range))
+
+#     If project working calendar has any leaves
+                if resource_leave_ids:
+                    res_leaves = resource_leaves_pool.read(cr,uid,resource_leave_ids,['date_from','date_to'])
+                    for leave in range(len(res_leaves)):
+                        dt_start = datetime.datetime.strptime(res_leaves[leave]['date_from'],'%Y-%m-%d %H:%M:%S')
+                        dt_end = datetime.datetime.strptime(res_leaves[leave]['date_to'],'%Y-%m-%d %H:%M:%S')
+                        no = dt_end - dt_start
+                        leave_days = no.days + 1
+                    [leaves.append((dt_start + datetime.timedelta(days=x)).strftime('%Y-%m-%d')) for x in range(int(leave_days))]
+                    leaves.sort()
+
+#    To create resources which are the Project Members
+            resource = project.members
+            resource_objs = []
+            for no in range(len(resource)):
                 leaves = []
-                if task_obj[i].user_id.id:
-                    resource_id = resource_pool.search(cr,uid,[('user_id','=',task_obj[i].user_id.id)])
-                    if resource_id :
-                        resource_obj = resource_pool.browse(cr,uid,resource_id)[0]
-                        if resource_obj.calendar_id:
-                            calendar_id = resource_obj.calendar_id.id
-                            resource_leave_ids = resource_leaves_pool.search(cr,uid,[('resource_id','=',resource_id)])
-                        else:
-                            calendar_id = project.resource_calendar_id.id
-                            resource_leave_ids = resource_leaves_pool.search(cr,uid,[('calendar_id','=',project.resource_calendar_id.id)])
+                resource_id = resource_pool.search(cr,uid,[('user_id','=',resource[no].id)])
+                if resource_id:
+            #   Getting list of leaves for specific resource
+                    leaves = leaves_resource(cr,uid,resource_id)
+                resource_objs.append(classobj(str(resource[no].name),(Resource,),{'__doc__':resource[no].name,'__name__':resource[no].name,'vacation':tuple(leaves)}))
 
-                        time_range = "8:00-8:00"
-                        non_working = ""
-                        wk = {"0":"mon","1":"tue","2":"wed","3":"thu","4":"fri","5":"sat","6":"sun"}
-                        wk_days = {}
-                        wk_time = {}
-                        tlist = []
-                        week_ids = resource_week_pool.search(cr,uid,[('calendar_id','=',calendar_id)])
-                        week_obj = resource_week_pool.read(cr,uid,week_ids,['dayofweek','hour_from','hour_to'])
+#     To create dynamic no of tasks
+            def tasks(j,eff):
+                def task():
+                    """
+                    task is a dynamic method!
+                    """
+                    effort = eff
+                task.__doc__ = "TaskNO%d" %j
+                task.__name__ = "task%d" %j
+                return task
 
-                        for week in week_obj:
-                            res_str = ""
-                            if wk.has_key(week['dayofweek']):
-                                day = wk[week['dayofweek']]
-                                wk_days[week['dayofweek']] = wk[week['dayofweek']]
+#     To create dynamic no of tasks with the resource specified
+            def tasks_resource(j,eff,obj):
+                def task():
+                    """
+                    task is a dynamic method!
+                    """
+                    effort = eff
+                    resource = obj
+                task.__doc__ = "TaskNO%d" %j
+                task.__name__ = "task%d" %j
+                return task
 
-                            hour_from_str = timeformat_convert(cr,uid,week['hour_from'])
-                            hour_to_str = timeformat_convert(cr,uid,week['hour_to'])
-                            res_str = hour_from_str + '-' + hour_to_str
-                            tlist.append((day,res_str))
+#    Creating the project with all the tasks and resources
+            def Project():
+                resource = reduce(operator.or_,resource_objs)
+                title = project.name
+                start = dt_start
 
-                        for item in tlist:
-                            if wk_time.has_key(item[0]):
-                                wk_time[item[0]].append(item[1])
-                            else:
-                                wk_time[item[0]] = [item[0]]
-                                wk_time[item[0]].append(item[1])
-
-                        for k,v in wk_time.items():
-                            final_lst.append(tuple(v))
-
-                        for k,v in wk_days.items():
-                            if wk.has_key(k):
-                                wk.pop(k)
-                        for v in wk.itervalues():
-                            non_working += v + ','
-                        if non_working:
-                            final_lst.append((non_working[:-1],time_range))
-
-                        if resource_leave_ids:
-                            res_leaves = resource_leaves_pool.read(cr,uid,resource_leave_ids,['date_from','date_to'])
-                            for leave in range(len(res_leaves)):
-                                dt_start = datetime.datetime.strptime(res_leaves[leave]['date_from'],'%Y-%m-%d %H:%M:%S')
-                                dt_end = datetime.datetime.strptime(res_leaves[leave]['date_to'],'%Y-%m-%d %H:%M:%S')
-                                no = dt_end - dt_start
-                                leave_days = no.days + 1
-                            [leaves.append((dt_start + datetime.timedelta(days=x)).strftime('%Y-%m-%d')) for x in range(int(leave_days))]
-                            leaves.sort()
-
-
-                hours = task_obj[i].remaining_hours / task_obj[i].occupation_rate
-                hours = str(hours)[:-2] + 'H'
-
-                class user(Resource):
-                 pass
-
-                if i == 0:
-                    new_dt = dt
-                else:
-                    data = task_pool.read(cr,uid,[task_obj[i-1].id],['date_end'])[0]
-                    new_dt = data['date_end'][0:16]
-
-                def Project_1():
-                    resource = user
-                    title = project.name
-                    start = new_dt
-                    effort = hours
-
-                    if final_lst or leaves:
-                        working_days = final_lst
+#    If project has calendar
+                if wktime_cal or leaves:
+                        working_days = wktime_cal
                         vacation = tuple(leaves)
 
-                    def task1():
-                        start = new_dt
-                        effort = hours
-                        title = task_obj[i].name
-
-                project_1 = BalancedProject(Project_1)
-                s_date = project_1.calendar.WorkingDate(project_1.task1.start).to_datetime()
-                e_date = project_1.calendar.WorkingDate(project_1.task1.end).to_datetime()
-                task_pool.write(cr,uid,[task_obj[i].id],{'date_start':s_date,'date_end':e_date})
+#    Dynamic Creation of tasks
+                for i in range(len(task_obj)):
+                    hours = str(task_obj[i].remaining_hours / task_obj[i].occupation_rate)[:-2] + 'H'
+                    if task_obj[i].user_id:
+                        for resource_object in resource_objs:
+                            if resource_object.__name__ == task_obj[i].user_id.name:
+                               task = tasks_resource(i,hours,resource_object)
+                    else:
+                        task = tasks(i,hours)
 
+            project = BalancedProject(Project)
+            task_no = len(task_obj)
+            loop_no = 0
+            for t in project:
+                no2 = loop_no
+                while loop_no <= task_no:
+                    s_date = t.start.to_datetime()
+                    e_date = t.end.to_datetime()
+                    print 'Start Date And End Date:::',s_date,e_date,t.name,t.booked_resource
+                    if loop_no != 0:
+                        user_id = user_pool.search(cr,uid,[('name','=',t.booked_resource[0].__name__)])
+                        task_pool.write(cr,uid,[task_obj[loop_no - 1].id],{'date_start':s_date,'date_end':e_date,'user_id':user_id[0]})
+                    loop_no = task_no + 1
+                loop_no = no2
+                loop_no +=1
         return {}
+
     states = {
         'init': {
             'actions': [],
@@ -180,7 +234,8 @@ class wizard_compute_tasks(wizard.interface):
                 ('compute', 'Compute')
             ]},
         },
-        
+
+
         'compute': {
             'actions': [_compute_date],
             'result': {'type':'form','arch':success_msg,'fields':{}, 'state':[('end', 'Ok')]},
@@ -190,4 +245,3 @@ wizard_compute_tasks('wizard.compute.tasks')
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From 5b202562aefd1db0d9131a4c4dcee9720e7ccd6d Mon Sep 17 00:00:00 2001
From: "Rvo (Open ERP)" <rvo@tinyerp.co.in>
Date: Wed, 10 Feb 2010 11:44:22 +0530
Subject: [PATCH 03/28] [IMP]:Improved phase scheduling with resource
 allocation

bzr revid: rvo@tinyerp.co.in-20100210061422-cr69k568arzm7b5a
---
 addons/project_long_term/project.py           |   9 +-
 .../wizard/compute_phases_date.py             | 278 +++++++++++-------
 2 files changed, 173 insertions(+), 114 deletions(-)

diff --git a/addons/project_long_term/project.py b/addons/project_long_term/project.py
index 3f16b33ea31..ffe3ac38842 100644
--- a/addons/project_long_term/project.py
+++ b/addons/project_long_term/project.py
@@ -40,12 +40,12 @@ class project_phase(osv.osv):
          if (obj_self in prev_ids) or (obj_self in next_ids):
              return False
          ids = [id for id in prev_ids if id in next_ids]
-         
+
          #both prev_ids and next_ids must be unique
          if ids:
              return False
          #unrelated project
-         
+
          prev_ids = [rec.id for rec in prev_ids]
          next_ids = [rec.id for rec in next_ids]
 
@@ -59,7 +59,7 @@ class project_phase(osv.osv):
              if ids:
                  return False
              prev_ids = prv_phase_ids
-             
+
         #iter next_ids
          while next_ids:
              cr.execute('select distinct next_phase_id from project_phase_next_rel where phase_id in ('+','.join(map(str, next_ids))+')')
@@ -100,7 +100,9 @@ project_phase()
 class project_resource_allocation(osv.osv):
     _name = 'project.resource.allocation'
     _description = 'Project Resource Allocation'
+    _rec_name = 'resource_id'
     _columns = {
+#        'name': fields.char('Name',size = 64),
         'resource_id': fields.many2one('resource.resource', 'Resource', required=True),
         'phase_id': fields.many2one('project.phase', 'Project Phase', required=True),
         'useability': fields.float('Useability', help="Useability of this ressource for this project phase in percentage (=50%)"),
@@ -108,6 +110,7 @@ class project_resource_allocation(osv.osv):
     _defaults = {
         'useability': lambda *a: 100,
     }
+
 project_resource_allocation()
 
 class project(osv.osv):
diff --git a/addons/project_long_term/wizard/compute_phases_date.py b/addons/project_long_term/wizard/compute_phases_date.py
index 8b3c76c9ef3..ec51739628e 100644
--- a/addons/project_long_term/wizard/compute_phases_date.py
+++ b/addons/project_long_term/wizard/compute_phases_date.py
@@ -24,19 +24,29 @@ import pooler
 from tools.translate import _
 import datetime
 from resource.faces import *
+from new import classobj
+import operator
 
 compute_form = """<?xml version="1.0" ?>
-<form string="Compute Scheduling of Tasks">
+<form string="Compute Scheduling of Phases">
 
-    <field name="project_id" colspan="4"/>
+    <field name="phase_id" colspan="4"/>
 
 </form>"""
 
 compute_fields = {
-    'project_id': {'string':'Project', 'type':'many2one', 'relation': 'project.project', 'required':'True'},
+    'phase_id': {'string':'Phase', 'type':'many2one', 'relation': 'project.phase', 'required':'True'},
 
 }
+
+success_msg = """<?xml version="1.0" ?>
+<form string="Compute Scheduling of Phases">
+    <label string="Phase Scheduling completed successfully."/>
+</form>"""
+
 def timeformat_convert(cr, uid, time_string, context={}):
+#    Function to convert input time string:: 8.5 to output time string 8:30
+
         strg = str(time_string)[-2:]
         last_strg = str(time_string)[0:-2]
         if strg != '.0':
@@ -51,124 +61,175 @@ def timeformat_convert(cr, uid, time_string, context={}):
 
         return converted_strg
 
+def leaves_resource(cr,uid,id):
+#    To get the leaves for the resource_ids working on phase
+
+        pool = pooler.get_pool(cr.dbname)
+        resource_leaves_pool = pool.get('resource.calendar.leaves')
+        resource_leave_ids = resource_leaves_pool.search(cr,uid,[('resource_id','=',id)])
+        leaves = []
+        if resource_leave_ids:
+            res_leaves = resource_leaves_pool.read(cr,uid,resource_leave_ids,['date_from','date_to'])
+            for leave in range(len(res_leaves)):
+                    dt_start = datetime.datetime.strptime(res_leaves[leave]['date_from'],'%Y-%m-%d %H:%M:%S')
+                    dt_end = datetime.datetime.strptime(res_leaves[leave]['date_to'],'%Y-%m-%d %H:%M:%S')
+                    no = dt_end - dt_start
+                    leave_days = no.days + 1
+            [leaves.append((dt_start + datetime.timedelta(days=x)).strftime('%Y-%m-%d')) for x in range(int(leave_days))]
+            leaves.sort()
+        return leaves
+
+def resource_list(cr,uid,obj):
+#    To get the resource_ids working on phase
+
+        pool = pooler.get_pool(cr.dbname)
+        resource_pool = pool.get('resource.resource')
+        resources = obj.resource_ids
+        resource_objs = []
+        for no in range(len(resources)):
+            resource_id = resource_pool.search(cr,uid,[('id','=',resources[no].resource_id.id)])
+            if resource_id:
+            #   Getting list of leaves for specific resource
+                leaves = leaves_resource(cr,uid,resource_id)
+            #   Creating the faces.Resource object with resource specific efficiency and vacation
+                resource_objs.append(classobj(str(resources[no].resource_id.name),(Resource,),{'__doc__':resources[no].resource_id.name,'__name__':resources[no].resource_id.name,'efficiency':resources[no].useability/100,'vacation':tuple(leaves)}))
+        return resource_objs
+
 class wizard_compute_phases(wizard.interface):
 
     def _compute_date(self, cr, uid, data, context):
-        project_id = data['form']['project_id']
-        project = pooler.get_pool(cr.dbname).get('project.project').browse(cr,uid,project_id)
-        phase_ids = pooler.get_pool(cr.dbname).get('project.phase').search(cr,uid,[('project_id','=',project_id)])
-        if phase_ids:
-            phase_obj = pooler.get_pool(cr.dbname).get('project.phase').browse(cr,uid,phase_ids)
-            phase_1 = phase_obj[0]
-            if phase_1.date_start:
-                date_dt = datetime.datetime.strptime(phase_1.date_start,"%Y-%m-%d %H:%M:%S")
-            else:
-                date_dt = datetime.datetime.strptime(project.date_start,"%Y-%m-%d")
-            dt = datetime.datetime.strftime(date_dt,"%Y-%m-%d %H:%M")
+        pool = pooler.get_pool(cr.dbname)
+        project_pool = pool.get('project.project')
+        phase_pool = pool.get('project.phase')
+        resource_pool = pool.get('resource.resource')
+        resource_leaves_pool = pool.get('resource.calendar.leaves')
+        resource_week_pool = pool.get('resource.calendar.week')
+        avg_hr = 0.0
+        wktime_cal = []
+        leaves = []
+        phase_id = data['form']['phase_id']
+        phase = phase_pool.browse(cr,uid,phase_id)
+        calendar_id = phase.project_id.resource_calendar_id.id
 
-            for i in range(len(phase_obj)):
-                final_lst = []
-                leaves = []
-#                if phase_obj[i].user_id.id:
-#                    resource_id = pooler.get_pool(cr.dbname).get('resource.resource').search(cr,uid,[('user_id','=',task_obj[i].user_id.id)])
-#                    resource_obj = pooler.get_pool(cr.dbname).get('resource.resource').browse(cr,uid,resource_id)[0]
-                if project.resource_calendar_id:
-                        non_working = ""
-                        time_range = "8:00-8:00"
-                        wk = {"0":"mon","1":"tue","2":"wed","3":"thu","4":"fri"}
-                        wk_days = {}
-                        wk_time = {}
-                        tlist = []
-                        hours = []
-                        hr = 0
+#     If project has a working calendar then that would be used otherwise
+#     the default faces calendar would  be used
+        if calendar_id:
+            time_range = "8:00-8:00"
+            non_working = ""
+            wk = {"0":"mon","1":"tue","2":"wed","3":"thu","4":"fri","5":"sat","6":"sun"}
+            wk_days = {}
+            wk_time = {}
+            wktime_list = []
+            hours = []
+            hr = 0
+            week_ids = resource_week_pool.search(cr,uid,[('calendar_id','=',calendar_id)])
+            week_obj = resource_week_pool.read(cr,uid,week_ids,['dayofweek','hour_from','hour_to'])
 
-                        week_ids = pooler.get_pool(cr.dbname).get('resource.calendar.week').search(cr,uid,[('calendar_id','=',project.resource_calendar_id.id)])
-                        week_obj = pooler.get_pool(cr.dbname).get('resource.calendar.week').read(cr,uid,week_ids,['dayofweek','hour_from','hour_to'])
+#     Converting time formats into appropriate format required
+#     and creating a list like [('mon', '8:00-12:00'), ('mon', '13:00-18:00')]
+            for week in week_obj:
+                res_str = ""
+                if wk.has_key(week['dayofweek']):
+                    day = wk[week['dayofweek']]
+                    wk_days[week['dayofweek']] = wk[week['dayofweek']]
 
-                        for week in week_obj:
-                            res_str = ""
-                            if wk.has_key(week['dayofweek']):
-                                day = wk[week['dayofweek']]
-                                wk_days[week['dayofweek']] = wk[week['dayofweek']]
+                hour_from_str = timeformat_convert(cr,uid,week['hour_from'])
+                hour_to_str = timeformat_convert(cr,uid,week['hour_to'])
+                res_str = hour_from_str + '-' + hour_to_str
+                hours.append(week['hour_from'])
+                hours.append(week['hour_to'])
+                wktime_list.append((day,res_str))
 
-                            hour_from_str = timeformat_convert(cr,uid,week['hour_from'])
-                            hour_to_str = timeformat_convert(cr,uid,week['hour_to'])
-                            hours.append(week['hour_from'])
-                            hours.append(week['hour_to'])
-                            res_str = hour_from_str + '-' + hour_to_str
-                            tlist.append((day,res_str))
-
-                        for item in tlist:
-                            if wk_time.has_key(item[0]):
-                                wk_time[item[0]].append(item[1])
-                            else:
-                                wk_time[item[0]] = [item[0]]
-                                wk_time[item[0]].append(item[1])
-
-                        for k,v in wk_time.items():
-                            final_lst.append(tuple(v))
-
-                        for k,v in wk_days.items():
-                            if wk.has_key(k):
-                                wk.pop(k)
-                        for v in wk.itervalues():
-                            non_working += v + ','
-                        if non_working:
-                            final_lst.append((non_working[:-1],time_range))
-
-                        leave_ids = pooler.get_pool(cr.dbname).get('resource.calendar.leaves').search(cr,uid,[('calendar_id','=',project.resource_calendar_id.id)])
-                        if leave_ids:
-                            res_leaves = pooler.get_pool(cr.dbname).get('resource.calendar.leaves').read(cr,uid,leave_ids,['date_from','date_to'])
-                            for leave in range(len(res_leaves)):
-                                dt_start = datetime.datetime.strptime(res_leaves[leave]['date_from'],'%Y-%m-%d %H:%M:%S')
-                                dt_end = datetime.datetime.strptime(res_leaves[leave]['date_to'],'%Y-%m-%d %H:%M:%S')
-                                no = dt_end - dt_start
-                                leave_days = no.days + 1
-                            [leaves.append((dt_start + datetime.timedelta(days=x)).strftime('%Y-%m-%d')) for x in range(int(leave_days))]
-                            leaves.sort()
-
-                        for hour in range(0,4):
-                            if hour%2 ==0:
-                                hr += float(hours[hour+1]) - float(hours[hour])
-
-                man_days = str(phase_obj[i].duration * hr)[:-2] + 'H'
-
-                if i == 0:
-                    new_dt = dt
+#     Converting it to format like [('mon', '8:00-12:00', '13:00-18:00')]
+            for item in wktime_list:
+                if wk_time.has_key(item[0]):
+                    wk_time[item[0]].append(item[1])
                 else:
-                    data = pooler.get_pool(cr.dbname).get('project.phase').read(cr,uid,[phase_obj[i-1].id],['date_end'])[0]
-                    if phase_obj[i].constraint_date_start and data['date_end'] < phase_obj[i].constraint_date_start:
-                        new_dt = phase_obj[i].constraint_date_start[0:16]
-                    else:
-                        new_dt = data['date_end'][0:16]
+                    wk_time[item[0]] = [item[0]]
+                    wk_time[item[0]].append(item[1])
 
-                class user(Resource):
-                 pass
+            for k,v in wk_time.items():
+                wktime_cal.append(tuple(v))
 
-                def Project_1():
-                    resource = user
-                    title = project.name
-                    start = new_dt
-                    effort = man_days
+            for hour in range(len(hours)):
+                if hour%2 ==0:
+                    hr += float(hours[hour+1]) - float(hours[hour])
+            avg_hr = hr/len(wktime_cal)
 
-                    if final_lst or leaves:
-                        working_days = final_lst
+#     For non working days adding [('tue,wed,fri,sat,sun', '8:00-8:00')]
+            for k,v in wk_days.items():
+                if wk.has_key(k):
+                    wk.pop(k)
+            for v in wk.itervalues():
+                non_working += v + ','
+            if non_working:
+                wktime_cal.append((non_working[:-1],time_range))
+
+#     If project working calendar has any leaves
+            resource_leave_ids = resource_leaves_pool.search(cr,uid,[('calendar_id','=',calendar_id)])
+            if resource_leave_ids:
+                res_leaves = resource_leaves_pool.read(cr,uid,resource_leave_ids,['date_from','date_to'])
+                for leave in range(len(res_leaves)):
+                    dt_start = datetime.datetime.strptime(res_leaves[leave]['date_from'],'%Y-%m-%d %H:%M:%S')
+                    dt_end = datetime.datetime.strptime(res_leaves[leave]['date_to'],'%Y-%m-%d %H:%M:%S')
+                    no = dt_end - dt_start
+                    leave_days = no.days + 1
+                [leaves.append((dt_start + datetime.timedelta(days=x)).strftime('%Y-%m-%d')) for x in range(int(leave_days))]
+                leaves.sort()
+
+
+        def phase_schedule(cr,uid,phase,start_date,avg_hour = 0.0):
+           if phase:
+
+                #    To get resources and the duration for the phase
+                resources_list = resource_list(cr,uid,phase)
+                if not avg_hour:
+                    avg_hour = 8.0
+                man_days = str(phase.duration * avg_hour)[:-2] + 'H'
+
+                #    Creating a new project for each phase
+                def Project():
+                    start = start_date
+
+                    #    If project has working calendar else the default one would be considered
+                    if wktime_cal or leaves:
+                        working_days = wktime_cal
                         vacation = tuple(leaves)
 
-                    def phase1():
-                        start = new_dt
+                    def phase():
                         effort = man_days
-                        title = phase_obj[i].name
+                        resource = reduce(operator.or_,resources_list)
 
-                project_1 = BalancedProject(Project_1)
-                start_date = project_1.calendar.WorkingDate(project_1.phase1.start).to_datetime()
-                e_date = project_1.calendar.WorkingDate(project_1.phase1.end).to_datetime()
-                if phase_obj[i].constraint_date_end and str(e_date) > phase_obj[i].constraint_date_end:
-                    end_date = phase_obj[i].constraint_date_end
+                project = BalancedProject(Project)
+                print 'Project Phase Start & End:::',project.phase.name,project.phase.booked_resource,project.phase.start.to_datetime(),project.phase.end.to_datetime()
+                s_date = project.phase.start.to_datetime()
+                e_date = project.phase.end.to_datetime()
+
+                #    According to constraints on date start and date end on phase recalculation done
+                if phase.constraint_date_start and str(s_date) < phase.constraint_date_start:
+                    start_date = phase.constraint_date_start
+                else:
+                    start_date = s_date
+                if phase.constraint_date_end and str(e_date) > phase.constraint_date_end:
+                    end_date = phase.constraint_date_end[:-3]
                 else:
                     end_date = e_date
 
-                pooler.get_pool(cr.dbname).get('project.phase').write(cr,uid,[phase_obj[i].id],{'date_start':start_date,'date_end':end_date})
+                #    Writing the dates back
+                phase_pool.write(cr,uid,[phase.id],{'date_start':start_date,'date_end':end_date})
+                date_start = end_date
+
+                #    Recursive calling the next phases till all the phases are scheduled
+                for phase in phase.next_phase_ids:
+                   print 'Phase Start Date::',date_start
+                   phase_schedule(cr,uid,phase,date_start)
+
+        #    Phase Scheduling starts from here with the call to phase_schedule method
+        start_dt = datetime.datetime.strftime((datetime.datetime.strptime(phase.project_id.date_start,"%Y-%m-%d")),"%Y-%m-%d %H:%M")
+        if avg_hr:
+            phase_schedule(cr,uid,phase,start_dt,avg_hr)
+        else:
+            phase_schedule(cr,uid,phase,start_dt)
 
         return {}
     states = {
@@ -176,21 +237,16 @@ class wizard_compute_phases(wizard.interface):
             'actions': [],
             'result': {'type':'form', 'arch':compute_form, 'fields':compute_fields, 'state':[
                 ('end', 'Cancel'),
-                ('ok', 'Ok')
+                ('compute', 'Compute')
 
             ]},
         },
-        'ok': {
+        'compute': {
             'actions': [_compute_date],
-            'result': {'type':'state', 'state':'end'},
+            'result': {'type':'form','arch':success_msg,'fields':{}, 'state':[('end', 'Ok')]},
         }
     }
 wizard_compute_phases('wizard.compute.phases')
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From 112e2a7541019253339035b3a2573d9ef5d0cfb5 Mon Sep 17 00:00:00 2001
From: "Rvo (Open ERP)" <rvo@tinyerp.co.in>
Date: Wed, 10 Feb 2010 14:54:57 +0530
Subject: [PATCH 04/28] [IMP]:Improved the time format for
 planned_hours,duration on tasks and phases respectively

bzr revid: rvo@tinyerp.co.in-20100210092457-dhy7id0az46euz5a
---
 addons/project/wizard/compute_tasks_date.py   | 24 +++++++------------
 .../wizard/compute_phases_date.py             | 22 ++++++-----------
 2 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/addons/project/wizard/compute_tasks_date.py b/addons/project/wizard/compute_tasks_date.py
index a5037997dde..b9991fbe448 100644
--- a/addons/project/wizard/compute_tasks_date.py
+++ b/addons/project/wizard/compute_tasks_date.py
@@ -44,17 +44,12 @@ compute_fields = {
 def timeformat_convert(cr, uid, time_string, context={}):
 #    Function to convert input time string:: 8.5 to output time string 8:30
 
-        strg = str(time_string)[-2:]
-        last_strg = str(time_string)[0:-2]
-        if strg != '.0':
-            if '.' not in strg:
-                strg = '.' + strg
-                last_strg = str(time_string)[:-3]
-            new_strg = round(float(strg) / 0.016666667)
-            converted_strg = last_strg + ':' + str(new_strg)[:-2]
-        else:
-            converted_strg = last_strg + ':00'
-        return converted_strg
+        split_list = str(time_string).split('.')
+        hour_part = split_list[0]
+        mins_part = split_list[1]
+        round_mins  = int(round(float(mins_part) * 60,-2))
+        converted_string = hour_part + ':' + str(round_mins)[0:2]
+        return converted_string
 
 def leaves_resource(cr,uid,id):
 #    To get the leaves for the members working on project
@@ -94,7 +89,7 @@ class wizard_compute_tasks(wizard.interface):
             task_ids.sort()
             task_obj = task_pool.browse(cr,uid,task_ids)
             task_1 = task_obj[0]
-            dt_start = datetime.datetime.strftime(datetime.datetime.strptime(project.date_start,"%Y-%m-%d"),"%Y-%m-%d %H:%M")
+            date_start = datetime.datetime.strftime(datetime.datetime.strptime(project.date_start,"%Y-%m-%d"),"%Y-%m-%d %H:%M")
             calendar_id = project.resource_calendar_id.id
 
 #     If project has a working calendar then that would be used otherwise
@@ -117,7 +112,6 @@ class wizard_compute_tasks(wizard.interface):
                     if wk.has_key(week['dayofweek']):
                         day = wk[week['dayofweek']]
                         wk_days[week['dayofweek']] = wk[week['dayofweek']]
-
                     hour_from_str = timeformat_convert(cr,uid,week['hour_from'])
                     hour_to_str = timeformat_convert(cr,uid,week['hour_to'])
                     res_str = hour_from_str + '-' + hour_to_str
@@ -192,7 +186,7 @@ class wizard_compute_tasks(wizard.interface):
             def Project():
                 resource = reduce(operator.or_,resource_objs)
                 title = project.name
-                start = dt_start
+                start = date_start
 
 #    If project has calendar
                 if wktime_cal or leaves:
@@ -201,7 +195,7 @@ class wizard_compute_tasks(wizard.interface):
 
 #    Dynamic Creation of tasks
                 for i in range(len(task_obj)):
-                    hours = str(task_obj[i].remaining_hours / task_obj[i].occupation_rate)[:-2] + 'H'
+                    hours = str(task_obj[i].remaining_hours / task_obj[i].occupation_rate)+ 'H'
                     if task_obj[i].user_id:
                         for resource_object in resource_objs:
                             if resource_object.__name__ == task_obj[i].user_id.name:
diff --git a/addons/project_long_term/wizard/compute_phases_date.py b/addons/project_long_term/wizard/compute_phases_date.py
index ec51739628e..f713942708b 100644
--- a/addons/project_long_term/wizard/compute_phases_date.py
+++ b/addons/project_long_term/wizard/compute_phases_date.py
@@ -47,19 +47,12 @@ success_msg = """<?xml version="1.0" ?>
 def timeformat_convert(cr, uid, time_string, context={}):
 #    Function to convert input time string:: 8.5 to output time string 8:30
 
-        strg = str(time_string)[-2:]
-        last_strg = str(time_string)[0:-2]
-        if strg != '.0':
-            if '.' not in strg:
-                strg = '.' + strg
-                last_strg = str(time_string)[:-3]
-
-            new_strg = round(float(strg) / 0.016666667)
-            converted_strg = last_strg + ':' + str(new_strg)[:-2]
-        else:
-            converted_strg = last_strg + ':00'
-
-        return converted_strg
+        split_list = str(time_string).split('.')
+        hour_part = split_list[0]
+        mins_part = split_list[1]
+        round_mins  = int(round(float(mins_part) * 60,-2))
+        converted_string = hour_part + ':' + str(round_mins)[0:2]
+        return converted_string
 
 def leaves_resource(cr,uid,id):
 #    To get the leaves for the resource_ids working on phase
@@ -185,7 +178,7 @@ class wizard_compute_phases(wizard.interface):
                 resources_list = resource_list(cr,uid,phase)
                 if not avg_hour:
                     avg_hour = 8.0
-                man_days = str(phase.duration * avg_hour)[:-2] + 'H'
+                man_days = str(phase.duration * avg_hour) + 'H'
 
                 #    Creating a new project for each phase
                 def Project():
@@ -221,7 +214,6 @@ class wizard_compute_phases(wizard.interface):
 
                 #    Recursive calling the next phases till all the phases are scheduled
                 for phase in phase.next_phase_ids:
-                   print 'Phase Start Date::',date_start
                    phase_schedule(cr,uid,phase,date_start)
 
         #    Phase Scheduling starts from here with the call to phase_schedule method

From 8173762fa4cfea3f87b97984bf1865671e195ae4 Mon Sep 17 00:00:00 2001
From: "Rvo (Open ERP)" <rvo@tinyerp.co.in>
Date: Wed, 10 Feb 2010 16:28:27 +0530
Subject: [PATCH 05/28] [IMP]:Changes in tasks and phases according to working
 calendar of project

bzr revid: rvo@tinyerp.co.in-20100210105827-5hofq1ageft6s2hm
---
 addons/project/wizard/compute_tasks_date.py            | 7 +++----
 addons/project_long_term/wizard/compute_phases_date.py | 8 +++++---
 addons/resource/faces/task.py                          | 2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/addons/project/wizard/compute_tasks_date.py b/addons/project/wizard/compute_tasks_date.py
index b9991fbe448..2abd7411135 100644
--- a/addons/project/wizard/compute_tasks_date.py
+++ b/addons/project/wizard/compute_tasks_date.py
@@ -154,7 +154,7 @@ class wizard_compute_tasks(wizard.interface):
             for no in range(len(resource)):
                 leaves = []
                 resource_id = resource_pool.search(cr,uid,[('user_id','=',resource[no].id)])
-                if resource_id:
+                if resource_id and wktime_cal:
             #   Getting list of leaves for specific resource
                     leaves = leaves_resource(cr,uid,resource_id)
                 resource_objs.append(classobj(str(resource[no].name),(Resource,),{'__doc__':resource[no].name,'__name__':resource[no].name,'vacation':tuple(leaves)}))
@@ -184,12 +184,11 @@ class wizard_compute_tasks(wizard.interface):
 
 #    Creating the project with all the tasks and resources
             def Project():
-                resource = reduce(operator.or_,resource_objs)
                 title = project.name
                 start = date_start
-
+                resource = reduce(operator.or_,resource_objs)
 #    If project has calendar
-                if wktime_cal or leaves:
+                if wktime_cal:
                         working_days = wktime_cal
                         vacation = tuple(leaves)
 
diff --git a/addons/project_long_term/wizard/compute_phases_date.py b/addons/project_long_term/wizard/compute_phases_date.py
index f713942708b..2d4cf9fd70e 100644
--- a/addons/project_long_term/wizard/compute_phases_date.py
+++ b/addons/project_long_term/wizard/compute_phases_date.py
@@ -79,13 +79,15 @@ def resource_list(cr,uid,obj):
         resource_pool = pool.get('resource.resource')
         resources = obj.resource_ids
         resource_objs = []
+        leaves = []
+        calendar_id = obj.project_id.resource_calendar_id
         for no in range(len(resources)):
             resource_id = resource_pool.search(cr,uid,[('id','=',resources[no].resource_id.id)])
-            if resource_id:
+            if resource_id and calendar_id:
             #   Getting list of leaves for specific resource
                 leaves = leaves_resource(cr,uid,resource_id)
             #   Creating the faces.Resource object with resource specific efficiency and vacation
-                resource_objs.append(classobj(str(resources[no].resource_id.name),(Resource,),{'__doc__':resources[no].resource_id.name,'__name__':resources[no].resource_id.name,'efficiency':resources[no].useability/100,'vacation':tuple(leaves)}))
+            resource_objs.append(classobj(str(resources[no].resource_id.name),(Resource,),{'__doc__':resources[no].resource_id.name,'__name__':resources[no].resource_id.name,'efficiency':resources[no].useability/100,'vacation':tuple(leaves)}))
         return resource_objs
 
 class wizard_compute_phases(wizard.interface):
@@ -185,7 +187,7 @@ class wizard_compute_phases(wizard.interface):
                     start = start_date
 
                     #    If project has working calendar else the default one would be considered
-                    if wktime_cal or leaves:
+                    if wktime_cal:
                         working_days = wktime_cal
                         vacation = tuple(leaves)
 
diff --git a/addons/resource/faces/task.py b/addons/resource/faces/task.py
index 6fdb28db3f6..e737c333c7c 100755
--- a/addons/resource/faces/task.py
+++ b/addons/resource/faces/task.py
@@ -1941,7 +1941,7 @@ class Task(object):
 
         func.task_func = instrumented # will be used in the gui
         self._function = instrumented
-        self.name = name
+        self.name = func.func_name
         self.up = parent
         self.children = []
         self._sources = {} # all tasks, I am linked to

From 3e1b34660e6f7ac5be4686040c932a43e7d6d1dd Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Wed, 10 Feb 2010 17:31:17 +0530
Subject: [PATCH 06/28] [FIX]: add company id to all default currency

bzr revid: mga@tinyerp.com-20100210120117-kp220957hc2hmhy1
---
 bin/addons/base/base_data.xml | 61 ++++++++++++++++++++++++-----------
 1 file changed, 42 insertions(+), 19 deletions(-)

diff --git a/bin/addons/base/base_data.xml b/bin/addons/base/base_data.xml
index c8d3e39dd22..c8ad4c2b636 100644
--- a/bin/addons/base/base_data.xml
+++ b/bin/addons/base/base_data.xml
@@ -1012,7 +1012,7 @@
             <field name="type">default</field>
             <field model="res.country" name="country_id" ref="be"/>
         </record>
-       
+        
         <!-- Currencies -->
         <record id="EUR" model="res.currency">
             <field name="name">EUR</field>
@@ -1026,11 +1026,34 @@
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
         
+        <!-- Basic Company  -->
+        <record id="main_company" model="res.company">
+            <field name="name">Tiny sprl</field>
+            <field name="partner_id" ref="main_partner"/>
+            <field name="rml_header1">Free Business Solutions</field>
+            <field name="rml_footer1">Web: http://tiny.be - Tel: (+32).81.81.37.00 - Bank: CPH 126-2013269-07</field>
+            <field name="rml_footer2">IBAN: BE74 1262 0132 6907 - SWIFT: GKCCBEBB - VAT: BE0477.472.701</field>
+            <field name="currency_id" ref="base.EUR"/>
+        </record>
+        
+        <assert id="main_company" model="res.company">
+            <test expr="currency_id.code == 'eur'.upper()"/>
+            <test expr="name">Tiny sprl</test>
+        </assert>
+        <record id="user_admin" model="res.users">
+            <field name="company_id" ref="main_company"/>
+        </record>    
+        <record id="EUR" model="res.currency">
+            <field name="company_id" ref="main_company"/>
+        </record>
+        
+        <!-- Currencies -->
         <record id="USD" model="res.currency">
             <field name="name">USD</field>
             <field name="code">USD</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateUSD" model="res.currency.rate">
             <field name="rate">1.3785</field>
@@ -1043,6 +1066,7 @@
             <field name="code">VEB</field>
             <field name="rounding">2.95</field>
             <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateVEB" model="res.currency.rate">
             <field name="rate">3132.9</field>
@@ -1055,6 +1079,7 @@
             <field name="code">CAD</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateCAD" model="res.currency.rate">
             <field name="rate">1.451</field>
@@ -1068,6 +1093,7 @@
             <field name="code">CHF</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateCHF" model="res.currency.rate">
             <field name="rate">1.644</field>
@@ -1080,6 +1106,7 @@
             <field name="code">BRL</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateBRL" model="res.currency.rate">
             <field name="rate">2.588</field>
@@ -1092,6 +1119,7 @@
             <field name="code">CNY</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateCNY" model="res.currency.rate">
             <field name="rate">10.4311</field>
@@ -1105,6 +1133,7 @@
             <field name="code">COP</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
         </record>
         
         <record id="CZK" model="res.currency">
@@ -1112,6 +1141,7 @@
             <field name="code">CZK</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
         </record>
         
         <record id="DKK" model="res.currency">
@@ -1119,6 +1149,7 @@
             <field name="code">DKK</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateDKK" model="res.currency.rate">
             <field name="rate">7.4416</field>
@@ -1132,6 +1163,7 @@
             <field name="code">HUF</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
         </record>
         
         <record id="IDR" model="res.currency">
@@ -1139,6 +1171,7 @@
             <field name="code">IDR</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
         </record>
         
         <record id="LVL" model="res.currency">
@@ -1146,6 +1179,7 @@
             <field name="code">LVL</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateLVL" model="res.currency.rate">
             <field name="rate">0.71</field>
@@ -1159,6 +1193,7 @@
             <field name="code">NOK</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateNOK" model="res.currency.rate">
             <field name="rate">7.93</field>
@@ -1172,6 +1207,7 @@
             <field name="code">PAB</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
         </record>
         <record id="ratePAB" model="res.currency.rate">
             <field name="rate">1.3813</field>
@@ -1185,6 +1221,7 @@
             <field name="code">PLN</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
         </record>
         
         <record id="SEK" model="res.currency">
@@ -1192,6 +1229,7 @@
             <field name="code">SEK</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
         </record>
         
         <record id="GBP" model="res.currency">
@@ -1199,6 +1237,7 @@
             <field name="code">GBP</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateGBP" model="res.currency.rate">
             <field name="rate">0.675</field>
@@ -1211,6 +1250,7 @@
             <field name="code">ARS</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
         </record>
         
 		<record id="rateARS" model="res.currency.rate">
@@ -1224,30 +1264,13 @@
             <field name="code">Rs</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateINR" model="res.currency.rate">
             <field name="rate">0.634</field>
             <field name="currency_id" ref="INR"/>
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
-       
-        <!-- Basic Company  -->
-        <record id="main_company" model="res.company">
-            <field name="name">Tiny sprl</field>
-            <field name="partner_id" ref="main_partner"/>
-            <field name="rml_header1">Free Business Solutions</field>
-            <field name="rml_footer1">Web: http://tiny.be - Tel: (+32).81.81.37.00 - Bank: CPH 126-2013269-07</field>
-            <field name="rml_footer2">IBAN: BE74 1262 0132 6907 - SWIFT: GKCCBEBB - VAT: BE0477.472.701</field>
-            <field name="currency_id" ref="EUR"/>
-        </record>
-        
-        <assert id="main_company" model="res.company">
-            <test expr="currency_id.code == 'eur'.upper()"/>
-            <test expr="name">Tiny sprl</test>
-        </assert>
-        <record id="user_admin" model="res.users">
-            <field name="company_id" ref="main_company"/>
-        </record>    
 
     </data>
 </openerp>

From 27dbc19d1f7a0ba675a91c3ae1c88699c1d30ad7 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Wed, 10 Feb 2010 18:04:26 +0530
Subject: [PATCH 07/28] [FIX]:date display format

bzr revid: nch@tinyerp.com-20100210123426-5n8ja8r9euztw90r
---
 bin/osv/orm.py | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 0808357d753..0c551ae4766 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1830,7 +1830,14 @@ class orm(orm_template):
         fget = self.fields_get(cr, uid, fields)
         float_int_fields = filter(lambda x: fget[x]['type'] in ('float','integer'), fields)
         sum = {}
-        flist = groupby
+
+        group_by = groupby
+        if fget[groupby]['type'] in ('date','datetime'):
+            flist = "to_char(%s,'yyyy-mm') as %s "%(groupby,groupby)
+            groupby = "to_char(%s,'yyyy-mm')"%(groupby)
+        else:
+            flist = groupby
+
         fields_pre = [f for f in float_int_fields if
                    f == self.CONCURRENCY_CHECK_FIELD
                 or (f in self._columns and getattr(self._columns[f], '_classic_write'))]
@@ -1843,22 +1850,30 @@ class orm(orm_template):
                     flist += ',sum('+f+') as '+f
         cr.execute('select min(id) as id,'+flist+' from ' + self._table +qu1+' group by '+ groupby + limit_str + offset_str,qu2)
         alldata = {}
+        groupby = group_by
         for r in cr.dictfetchall():
             alldata[r['id']] = r
             del r['id']
-
         data = self.read(cr, uid, alldata.keys(), [groupby], context=context)
+        today = datetime.date.today()
+
         for d in data:
+            d['__domain'] = [(groupby,'=',alldata[d['id']][groupby] or False)] + domain
             if fget.has_key(groupby):
-                if fget[groupby]['type'] == 'many2one':
-                    d[groupby] = d[groupby] and d[groupby][1] or ''
                 if d[groupby] and fget[groupby]['type'] in ('date','datetime'):
-                   today = datetime.date.today()
-                   if d[groupby][:10] == str(today):
-                       d[groupby] = 'Today'
+                   dt = datetime.datetime.strptime(alldata[d['id']][groupby][:7],'%Y-%m')
+                   days = calendar.monthrange(dt.year, dt.month)[1]
+
+                   if d[groupby][:7] == today.strftime('%Y-%m'):
+                       d[groupby] = 'This Month'
                    else:
                        d[groupby] = datetime.datetime.strptime(d[groupby][:10],'%Y-%m-%d').strftime('%B %Y')
-            d['__domain'] = [(groupby,'=',alldata[d['id']][groupby] or False)] + domain
+
+                   d['__domain'] = [(groupby,'>=',alldata[d['id']][groupby] and datetime.datetime.strptime(alldata[d['id']][groupby][:7] + '-01','%Y-%m-%d').strftime('%Y-%m-%d') or False),\
+                                    (groupby,'<=',alldata[d['id']][groupby] and datetime.datetime.strptime(alldata[d['id']][groupby][:7] + '-' + str(days),'%Y-%m-%d').strftime('%Y-%m-%d') or False)] + domain
+                elif fget[groupby]['type'] == 'many2one':
+                    d[groupby] = d[groupby] and d[groupby][1] or ''
+
             del alldata[d['id']][groupby]
             d.update(alldata[d['id']])
             del d['id']

From 892908e4aa7e872628a181986b4c6d7842f6f4fe Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 10 Feb 2010 17:09:49 +0100
Subject: [PATCH 08/28] [IMP] delegate always visible

bzr revid: fp@tinyerp.com-20100210160949-27o44cm943jvgyvp
---
 addons/project/project_view.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index adfec910870..0aa7a4b15c1 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -364,7 +364,7 @@
                     <field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
                     <field name="state" invisible="context.get('set_visible',False)"/>
                     <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
-                    <button groups="base.group_extended" name="%(wizard_delegate_task)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-execute" help="For changing to delegate state" invisible="context.get('show_delegated',True)" />
+                    <button groups="base.group_extended" name="%(wizard_delegate_task)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-execute" help="For changing to delegate state"/>
                     <button name="%(wizard_close_task)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to" help="For changing to done state"/>
                     <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
                 </tree>
@@ -595,15 +595,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Messages">
-					<group colspan="6">
+                    <group colspan="6">
                         <field name="subject" select="1" string="Title"/>
                         <field name="project_id"/>
-						<field name="user_id" select="1"/>
-                      	<field name="date" select="2"/>
-					 </group>
-						<separator string="Description"  colspan="4"/>
-						<field name="description"  nolabel="1" colspan="4"/>
-				</form>
+                        <field name="user_id" select="1"/>
+                          <field name="date" select="2"/>
+                     </group>
+                        <separator string="Description"  colspan="4"/>
+                        <field name="description"  nolabel="1" colspan="4"/>
+                </form>
             </field>
        </record>
 

From 7c0193958c2cc8ce96ab6f1f7d28e152819cd861 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 10 Feb 2010 17:19:55 +0100
Subject: [PATCH 09/28] [IMP] project management - delegation, pending view

bzr revid: fp@tinyerp.com-20100210161955-wgq319dap77hmozh
---
 addons/project/project_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 0aa7a4b15c1..c7bb188cb6a 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -349,6 +349,7 @@
                     <field name="name"/>
                     <field name="project_id" icon="gtk-indent"/>
                     <field name="user_id"/>
+                    <field name="delegated_user_id" invisible="context.get('show_delegated', True)"/>
                     <field name="remaining_hours" widget="float_time" sum="Remaining Hours"  invisible="context.get('set_visible',False)"/>
                     <field name="date_deadline" invisible="context.get('set_visible',False)"/>
                     <field name="type" groups="base.group_extended" invisible="context.get('set_visible',False)"/>

From 63dbe0dde77c666e45de0b20344db88804540977 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 10 Feb 2010 18:06:54 +0100
Subject: [PATCH 10/28] [IMP] project management view

bzr revid: fp@tinyerp.com-20100210170654-rsbq5i6dtp2efo4a
---
 addons/project/project_view.xml | 32 +-------------------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index c7bb188cb6a..a63505fdc10 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -121,6 +121,7 @@
             <field name="field_parent">child_ids</field>
             <field name="arch" type="xml">
                 <tree string="Projects">
+                    <field name="sequence" invisible="1"/>
                     <field name="name" string="Project Name"/>
                     <field name="user_id" string="Project Manager"/>
                     <field name="partner_id" string="Partner"/>
@@ -183,37 +184,6 @@
             </field>
         </record>
 
-        <record id="view_my_project" model="ir.ui.view">
-            <field name="name">project.project.tree</field>
-            <field name="model">project.project</field>
-            <field name="type">tree</field>
-            <field name="field_parent">child_ids</field>
-            <field name="arch" type="xml">
-                <tree string="My projects">
-                    <field name="name" string="Project Name"/>
-                    <field name="partner_id" string="Partner"/>
-                    <field name="planned_hours" widget="float_time"/>
-                    <field name="effective_hours" widget="float_time"/>
-                    <field name="progress_rate" widget="progressbar"/>
-                    <field name="state"/>
-                </tree>
-            </field>
-        </record>
-
-       <record id="open_view_my_project_open" model="ir.actions.act_window">
-            <field name="name">Projects Structure</field>
-            <field name="res_model">project.project</field>
-            <field name="view_type">tree</field>
-            <field name="domain">[('parent_id','=',False)]</field>
-            <field name="view_id" ref="view_my_project"/>
-        </record>
-        <!--<menuitem
-            action="open_view_my_project_open"
-            id="menu_open_view_my_project_open"
-            parent="project.menu_all_project"/>-->
-
-    <!-- Wizard for compute remaining hours -->
-
         <record id="view_config_compute_remaining" model="ir.ui.view">
             <field name="name">Compute Remaining Hours </field>
             <field name="model">config.compute.remaining</field>

From d4036f08410b657a356db1959569cc9d36fb50fa Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Thu, 11 Feb 2010 05:02:11 +0000
Subject: [PATCH 11/28] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100211050211-14pimoayc9zo5n26
---
 bin/addons/base/i18n/ja.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po
index 7415207bce6..20da92f99fe 100644
--- a/bin/addons/base/i18n/ja.po
+++ b/bin/addons/base/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-02-09 06:18+0000\n"
+"PO-Revision-Date: 2010-02-10 05:46+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-10 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-02-11 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base

From 7c1cbd8f220b3d2b6f33da3913cfb6223049cfd5 Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Thu, 11 Feb 2010 05:02:38 +0000
Subject: [PATCH 12/28] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100211050238-tjj8emn8474eae1u
---
 addons/account/i18n/bs.po                 |  22 +--
 addons/account_tax_include/i18n/bs.po     |  18 +--
 addons/crm/i18n/fr.po                     |   2 +-
 addons/project/i18n/it.po                 |   8 +-
 addons/project_gtd/i18n/zh_CN.po          |   8 +-
 addons/purchase/i18n/bs.po                |  30 ++--
 addons/purchase_analytic_plans/i18n/bs.po |   6 +-
 addons/report_purchase/i18n/bs.po         |   8 +-
 addons/sale/i18n/bs.po                    | 162 +++++++++++-----------
 9 files changed, 136 insertions(+), 128 deletions(-)

diff --git a/addons/account/i18n/bs.po b/addons/account/i18n/bs.po
index 8d11ca24fbb..15c8cd2d1b2 100644
--- a/addons/account/i18n/bs.po
+++ b/addons/account/i18n/bs.po
@@ -7,30 +7,30 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-15 14:07+0000\n"
-"Last-Translator: DenisD <denis_delismajlovic@yahoo.com>\n"
+"PO-Revision-Date: 2010-02-10 12:49+0000\n"
+"Last-Translator: adnan <adnankraljic@yahoo.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-16 04:35+0000\n"
+"X-Launchpad-Export-Date: 2010-02-11 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
-msgstr ""
+msgstr "Interni naziv"
 
 #. module: account
 #: view:account.tax.code:0
 msgid "Account Tax Code"
-msgstr ""
+msgstr "Šifra poreza"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree9
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree9
 msgid "Unpaid Supplier Invoices"
-msgstr ""
+msgstr "Neplaćeni ulazni računi"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_entries
@@ -55,7 +55,7 @@ msgstr "Sredstvo"
 #. module: account
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Neispravan naziv modela u definiciji zadatka."
 
 #. module: account
 #: help:account.journal,currency:0
@@ -65,7 +65,7 @@ msgstr ""
 #. module: account
 #: wizard_view:account_use_models,init_form:0
 msgid "Select Message"
-msgstr ""
+msgstr "Odaberi poruku"
 
 #. module: account
 #: help:product.category,property_account_income_categ:0
@@ -99,18 +99,18 @@ msgstr ""
 #. module: account
 #: view:account.account:0
 msgid "Account Statistics"
-msgstr ""
+msgstr "Statistike konta"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_vat_declaration
 #: model:ir.ui.menu,name:account.menu_wizard_vat_declaration
 msgid "Print Taxes Report"
-msgstr ""
+msgstr "Štampaj porezni izvještaj"
 
 #. module: account
 #: field:account.account,parent_id:0
 msgid "Parent"
-msgstr ""
+msgstr "Roditelj"
 
 #. module: account
 #: selection:account.move,type:0
diff --git a/addons/account_tax_include/i18n/bs.po b/addons/account_tax_include/i18n/bs.po
index 946b34165eb..c08b3ab2aa7 100644
--- a/addons/account_tax_include/i18n/bs.po
+++ b/addons/account_tax_include/i18n/bs.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 08:32+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-02-10 12:26+0000\n"
+"Last-Translator: adnan <adnankraljic@yahoo.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:10+0000\n"
+"X-Launchpad-Export-Date: 2010-02-11 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
@@ -24,29 +24,29 @@ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
 #. module: account_tax_include
 #: field:account.invoice,price_type:0
 msgid "Price method"
-msgstr ""
+msgstr "Cjenovna procedura"
 
 #. module: account_tax_include
 #: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
 msgid "Invoices and prices with taxes included"
-msgstr ""
+msgstr "Računi i cijene sa uključenim porezom"
 
 #. module: account_tax_include
 #: selection:account.invoice,price_type:0
 msgid "Tax included"
-msgstr ""
+msgstr "Porez uključen"
 
 #. module: account_tax_include
 #: selection:account.invoice,price_type:0
 msgid "Tax excluded"
-msgstr ""
+msgstr "Porez nije uključen"
 
 #. module: account_tax_include
 #: view:account.tax:0
 msgid "Compute Code for Taxes included prices"
-msgstr ""
+msgstr "Izračunaj cijene sa porezima"
 
 #. module: account_tax_include
 #: field:account.invoice.line,price_subtotal_incl:0
 msgid "Subtotal"
-msgstr ""
+msgstr "Sub-ukupno"
diff --git a/addons/crm/i18n/fr.po b/addons/crm/i18n/fr.po
index e1363416114..406f9422bc5 100644
--- a/addons/crm/i18n/fr.po
+++ b/addons/crm/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-10 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-02-11 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/project/i18n/it.po b/addons/project/i18n/it.po
index 559ff2ed681..a166cbb39d3 100644
--- a/addons/project/i18n/it.po
+++ b/addons/project/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-16 12:14+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-02-10 21:46+0000\n"
+"Last-Translator: Davide Corio <davide.corio@domsense.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-02-11 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
@@ -24,7 +24,7 @@ msgstr "Attività Assegnate"
 #. module: project
 #: model:process.process,name:project.process_process_tasksprocess0
 msgid "Tasks Process"
-msgstr ""
+msgstr "Flusso Attività"
 
 #. module: project
 #: help:project.task.delegate,init,name:0
diff --git a/addons/project_gtd/i18n/zh_CN.po b/addons/project_gtd/i18n/zh_CN.po
index 9e9213c6871..aa4227dfa83 100644
--- a/addons/project_gtd/i18n/zh_CN.po
+++ b/addons/project_gtd/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-01 14:56+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-02-11 03:12+0000\n"
+"Last-Translator: 一念轮回 <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:19+0000\n"
+"X-Launchpad-Export-Date: 2010-02-11 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
@@ -128,7 +128,7 @@ msgstr "类型"
 #. module: project_gtd
 #: field:project.gtd.timebox,col_effective_hours:0
 msgid "Effective Hours"
-msgstr ""
+msgstr "有效时间"
 
 #. module: project_gtd
 #: model:ir.actions.wizard,name:project_gtd.open_gtd_timebox_empty
diff --git a/addons/purchase/i18n/bs.po b/addons/purchase/i18n/bs.po
index aa1b7951401..9128c6f9b5f 100644
--- a/addons/purchase/i18n/bs.po
+++ b/addons/purchase/i18n/bs.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-09 23:39+0000\n"
+"PO-Revision-Date: 2010-02-10 09:31+0000\n"
 "Last-Translator: adnan <adnankraljic@yahoo.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-10 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-02-11 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
@@ -24,7 +24,7 @@ msgstr "Račun izdat&Plaćeno"
 #. module: purchase
 #: model:process.node,note:purchase.process_node_invoiceafterpacking0
 msgid "Supplier Invoice pre-generated on receptions for control"
-msgstr ""
+msgstr "Račun dobavljača pregenirisan prilikom primke - kontrole"
 
 #. module: purchase
 #: field:purchase.order,location_id:0
@@ -34,7 +34,7 @@ msgstr "Odredište"
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "From Picking"
-msgstr ""
+msgstr "Iz zaprimanja"
 
 #. module: purchase
 #: rml:purchase.order:0
@@ -263,6 +263,8 @@ msgid ""
 "Manual: no invoice will be pre-generated. The accountant will have to encode "
 "manually."
 msgstr ""
+"Iz naloga: draft računa će biti pregenerisan na osnovu nabavnog naloga. "
+"Odgovorna osoba samo mora validirati račun radi kontrole."
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_packinginvoice0
@@ -452,6 +454,8 @@ msgid ""
 "This is computed as the minimum scheduled date of all purchase order lines' "
 "products."
 msgstr ""
+"Ovo je proračunato kao najbliži predviđeni datuma isporuke koji se nalazi u "
+"svim nabavnim nalozima."
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
@@ -487,7 +491,7 @@ msgstr "Potvrdi nabavni nalog"
 #: help:purchase.order,picking_ids:0
 msgid ""
 "This is the list of picking list that have been generated for this purchase"
-msgstr ""
+msgstr "Ovo je lista pakiranja koja je generisana za kupovinu."
 
 #. module: purchase
 #: model:ir.module.module,shortdesc:purchase.module_meta_information
@@ -560,7 +564,7 @@ msgstr "Račun pakiranja"
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
 msgid "Creates invoice from packin list"
-msgstr ""
+msgstr "Kreiraj račun na osnovu liste isporuke."
 
 #. module: purchase
 #: help:purchase.order,date_order:0
@@ -580,7 +584,7 @@ msgstr "Datum"
 #. module: purchase
 #: help:purchase.order,origin:0
 msgid "Reference of the document that generated this purchase order request."
-msgstr ""
+msgstr "Referenca dokumenta koja generira ovaj zahtjev za narudžbenicu."
 
 #. module: purchase
 #: rml:purchase.order:0
@@ -635,7 +639,7 @@ msgstr "Ukupno :"
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
 msgid "When purchase order is approved , it creates its packing list."
-msgstr ""
+msgstr "Odobrenje nabavnog naloga generiše kreiranje liste pakiranja."
 
 #. module: purchase
 #: view:purchase.order.line:0
@@ -735,7 +739,7 @@ msgstr "Zahtjev za ponudu"
 #. module: purchase
 #: model:process.node,name:purchase.process_node_packinginvoice0
 msgid "Out Packing"
-msgstr ""
+msgstr "Bez pakiranja"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_productrecept0
@@ -776,7 +780,7 @@ msgstr "Opis"
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_productrecept0
 msgid "Product recept invoice"
-msgstr ""
+msgstr "Primka proizvoda na osnovu računa"
 
 #. module: purchase
 #: rml:purchase.quotation:0
@@ -812,7 +816,7 @@ msgstr "Nabavni nalog je potvrđen od strane korisnika."
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_purchaseinvoice0
 msgid "Purchase Invoice"
-msgstr ""
+msgstr "Faktura nabavke"
 
 #. module: purchase
 #: rml:purchase.order:0
@@ -832,7 +836,7 @@ msgstr "Ukupni iznos"
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Date Ordered"
-msgstr "Datum naruđbe"
+msgstr "Datum nabavnog naloga"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -863,7 +867,7 @@ msgstr "Odobrena nabavka"
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_packinginvoice0
 msgid "From Packing list, Create invoice."
-msgstr ""
+msgstr "Iz liste pakovanja kreiraj račun"
 
 #. module: purchase
 #: field:purchase.order,amount_total:0
diff --git a/addons/purchase_analytic_plans/i18n/bs.po b/addons/purchase_analytic_plans/i18n/bs.po
index cc5face9dbc..db28f42e853 100644
--- a/addons/purchase_analytic_plans/i18n/bs.po
+++ b/addons/purchase_analytic_plans/i18n/bs.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-04 05:55+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-02-10 12:28+0000\n"
+"Last-Translator: adnan <adnankraljic@yahoo.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-02-11 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/report_purchase/i18n/bs.po b/addons/report_purchase/i18n/bs.po
index 856e02ca347..590e5bc590c 100644
--- a/addons/report_purchase/i18n/bs.po
+++ b/addons/report_purchase/i18n/bs.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-15 19:47+0000\n"
+"PO-Revision-Date: 2010-02-10 12:30+0000\n"
 "Last-Translator: adnan <adnankraljic@yahoo.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-02-11 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
@@ -136,6 +136,8 @@ msgid ""
 "    Purchase By Product, Purchase By Category of Product, All Months, "
 "Current Month."
 msgstr ""
+"Modul će omogućiti slijedeće poglede :\n"
+"Kupovina po proizvodu, kategoriji, za sve mjesece ili samo određeni."
 
 #. module: report_purchase
 #: selection:report.purchase.order.category,state:0
@@ -152,7 +154,7 @@ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0
 msgid "Manual in progress"
-msgstr ""
+msgstr "Manual u izradi"
 
 #. module: report_purchase
 #: model:ir.actions.act_window,name:report_purchase.action_order_category_tree
diff --git a/addons/sale/i18n/bs.po b/addons/sale/i18n/bs.po
index 218a3b4564e..496965651d8 100644
--- a/addons/sale/i18n/bs.po
+++ b/addons/sale/i18n/bs.po
@@ -7,34 +7,34 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-04 05:56+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-02-10 13:15+0000\n"
+"Last-Translator: Tarik_985 <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-02-11 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
 #: selection:sale.order,picking_policy:0
 msgid "Partial Delivery"
-msgstr ""
+msgstr "Djelomična isporuka"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Recreate Procurement"
-msgstr ""
+msgstr "Ponovo kreiraj nabavni nalog"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_confirmquotation0
 msgid "Confirm Quotation"
-msgstr ""
+msgstr "Potvrdi upit"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_deliveryorder0
 msgid "Delivery Order"
-msgstr ""
+msgstr "Otpremnica"
 
 #. module: sale
 #: field:sale.order.line,address_allotment_id:0
@@ -44,7 +44,7 @@ msgstr ""
 #. module: sale
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Pogrešan model name u definisanju radnje"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -61,12 +61,12 @@ msgstr ""
 #. module: sale
 #: selection:sale.order.line,type:0
 msgid "from stock"
-msgstr ""
+msgstr "sa zaliha"
 
 #. module: sale
 #: field:sale.config.picking_policy,step:0
 msgid "Steps To Deliver a Sale Order"
-msgstr ""
+msgstr "Koraci da bi se otpremila roba iz prodajnog naloga"
 
 #. module: sale
 #: wizard_field:sale.advance_payment_inv,init,qtty:0
@@ -182,33 +182,33 @@ msgstr ""
 #. module: sale
 #: field:sale.order,order_policy:0
 msgid "Shipping Policy"
-msgstr ""
+msgstr "Način otpreme"
 
 #. module: sale
 #: selection:sale.order,state:0
 #: selection:sale.order.line,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Poništeno"
 
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Shipping Exception"
-msgstr ""
+msgstr "Izuzeci otpreme"
 
 #. module: sale
 #: field:sale.order,amount_total:0
 msgid "Total"
-msgstr ""
+msgstr "Ukupno"
 
 #. module: sale
 #: field:sale.order,origin:0
 msgid "Origin"
-msgstr ""
+msgstr "Porijeklo"
 
 #. module: sale
 #: field:sale.order,partner_invoice_id:0
 msgid "Invoice Address"
-msgstr ""
+msgstr "Adresa kupca/primaoca računa"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_packinglist0
@@ -223,18 +223,18 @@ msgstr ""
 #. module: sale
 #: selection:sale.config.picking_policy,picking_policy:0
 msgid "All at Once"
-msgstr ""
+msgstr "Sve od jednom"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleprocurement0
 msgid "Procurement is created after confirmation of sale order."
-msgstr ""
+msgstr "Narudzba je kreirana nakon potvrde nalog za prodaju."
 
 #. module: sale
 #: field:sale.order,project_id:0
 #: field:sale.shop,project_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Analitičko konto"
 
 #. module: sale
 #: rml:sale.order:0
@@ -244,33 +244,33 @@ msgstr ""
 #. module: sale
 #: field:sale.order.line,type:0
 msgid "Procure Method"
-msgstr ""
+msgstr "Metoda nabavke"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Dodatni podaci"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Fax :"
-msgstr ""
+msgstr "Fax:"
 
 #. module: sale
 #: field:sale.order.line,price_net:0
 msgid "Net Price"
-msgstr ""
+msgstr "Neto cijena"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree9
 #: model:ir.ui.menu,name:sale.menu_action_order_tree9
 msgid "My sales order in progress"
-msgstr ""
+msgstr "Moji prodajni nalozi u procesu"
 
 #. module: sale
 #: field:sale.order.line,product_uos_qty:0
 msgid "Quantity (UoS)"
-msgstr ""
+msgstr "Količina (JM)"
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -284,72 +284,72 @@ msgstr ""
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Potvrđeno"
 
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
-msgstr ""
+msgstr "Standardni rok plaćanja"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree_all
 #: model:ir.ui.menu,name:sale.menu_action_order_tree_all
 msgid "All Sales Order"
-msgstr ""
+msgstr "Svi Prodajni nalozi"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_confirm0
 msgid "Confirm"
-msgstr ""
+msgstr "Potvrdi"
 
 #. module: sale
 #: field:sale.order,partner_shipping_id:0
 msgid "Shipping Address"
-msgstr ""
+msgstr "Adresa isporuke"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
 msgid "Shipped Quantities"
-msgstr ""
+msgstr "Isporučena količina"
 
 #. module: sale
 #: selection:sale.config.picking_policy,order_policy:0
 msgid "Invoice Based on Sales Orders"
-msgstr ""
+msgstr "Račun sa referencom na Prodajni nalog"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_shop
 #: view:sale.shop:0
 msgid "Sale Shop"
-msgstr ""
+msgstr "Prodavnica"
 
 #. module: sale
 #: field:sale.shop,warehouse_id:0
 msgid "Warehouse"
-msgstr ""
+msgstr "Skladište"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Order N°"
-msgstr ""
+msgstr "Nalog N°"
 
 #. module: sale
 #: field:sale.order,order_line:0
 #: view:sale.order.line:0
 msgid "Order Lines"
-msgstr ""
+msgstr "Stavke naloga"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Disc.(%)"
-msgstr ""
+msgstr "Popust (%)"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
-msgstr ""
+msgstr "Stavke računa"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_forceassignation0
@@ -359,7 +359,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Untaxed amount"
-msgstr ""
+msgstr "Neoporezovan iznos"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_packing0
@@ -372,12 +372,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:sale.action_order_tree8
 #: model:ir.ui.menu,name:sale.menu_action_order_tree8
 msgid "My sales order waiting Invoice"
-msgstr ""
+msgstr "Moji Prodajni nalozi spremni za fakturisanje"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Shipping address :"
-msgstr ""
+msgstr "Adresa isporuke"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
@@ -389,7 +389,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.order,picking_policy:0
 msgid "Complete Delivery"
-msgstr ""
+msgstr "Potpuna isporuka"
 
 #. module: sale
 #: view:sale.order:0
@@ -399,51 +399,51 @@ msgstr ""
 #. module: sale
 #: field:sale.order.line,product_uom_qty:0
 msgid "Quantity (UoM)"
-msgstr ""
+msgstr "Količina (JM)"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_tree1
 #: model:ir.ui.menu,name:sale.menu_action_order_line_tree1
 #: view:sale.order.line:0
 msgid "Sales Order Lines"
-msgstr ""
+msgstr "Stavke Prodajnog naloga"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
 msgid "Ordered Quantities"
-msgstr ""
+msgstr "Naručena količina"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_saleorderprocurement0
 msgid "Sale Order Procurement"
-msgstr ""
+msgstr "Nabavka na osnovu Prodajnog naloga"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_packing0
 msgid "Packing"
-msgstr ""
+msgstr "Pakovanje"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Total :"
-msgstr ""
+msgstr "Ukupno :"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Confirm Order"
-msgstr ""
+msgstr "Potvrdi nalog"
 
 #. module: sale
 #: field:sale.order,name:0
 msgid "Order Reference"
-msgstr ""
+msgstr "Referenca naloga"
 
 #. module: sale
 #: selection:sale.order,state:0
 #: view:sale.order.line:0
 #: selection:sale.order.line,state:0
 msgid "Done"
-msgstr ""
+msgstr "Urađeno"
 
 #. module: sale
 #: field:sale.order,pricelist_id:0
@@ -454,12 +454,12 @@ msgstr ""
 #. module: sale
 #: model:ir.ui.menu,name:sale.menu_shop_configuration
 msgid "Configuration"
-msgstr ""
+msgstr "Podešavanja"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice on Order After Delivery"
-msgstr ""
+msgstr "Račun sa referencom na Prodajni nalog poslije otpreme"
 
 #. module: sale
 #: constraint:ir.ui.view:0
@@ -484,7 +484,7 @@ msgstr ""
 #. module: sale
 #: field:sale.order,client_order_ref:0
 msgid "Customer Ref"
-msgstr ""
+msgstr "Ref kupca"
 
 #. module: sale
 #: view:sale.order:0
@@ -495,7 +495,7 @@ msgstr ""
 #: model:process.node,name:sale.process_node_saleprocurement0
 #: field:sale.order.line,procurement_id:0
 msgid "Procurement"
-msgstr ""
+msgstr "Nabavka"
 
 #. module: sale
 #: view:sale.shop:0
@@ -1068,17 +1068,17 @@ msgstr ""
 #. module: sale
 #: rml:sale.order:0
 msgid "Quotation N°"
-msgstr ""
+msgstr "Upit Broj"
 
 #. module: sale
 #: field:stock.move,sale_line_id:0
 msgid "Sale Order Line"
-msgstr ""
+msgstr "Stavka prodajnog naloga"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
 msgid "Cancel Assignation"
-msgstr ""
+msgstr "Dodjela"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
@@ -1089,24 +1089,26 @@ msgstr ""
 #: model:ir.actions.wizard,name:sale.wizard_sale_order_line_invoice
 #: model:ir.actions.wizard,name:sale.wizard_sale_order_make_invoice
 msgid "Make invoices"
-msgstr ""
+msgstr "Kreiraj račune"
 
 #. module: sale
 #: help:sale.order,partner_order_id:0
 msgid ""
 "The name and address of the contact that requested the order or quotation."
 msgstr ""
+"Ime i adresa kontakt osobe koja je podnijela zahtjev za upitom ili prodajnim "
+"nalogom."
 
 #. module: sale
 #: field:sale.order,partner_id:0
 #: field:sale.order.line,order_partner_id:0
 msgid "Customer"
-msgstr ""
+msgstr "Kupac"
 
 #. module: sale
 #: field:product.product,pricelist_purchase:0
 msgid "Purchase Pricelists"
-msgstr ""
+msgstr "Cjenovnik kupovine"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order
@@ -1115,12 +1117,12 @@ msgstr ""
 #: view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sale Order"
-msgstr ""
+msgstr "Prodajni nalog"
 
 #. module: sale
 #: field:sale.config.picking_policy,name:0
 msgid "Name"
-msgstr ""
+msgstr "Ime"
 
 #. module: sale
 #: field:sale.order,invoice_quantity:0
@@ -1131,23 +1133,23 @@ msgstr ""
 #: model:ir.actions.act_window,name:sale.action_order_tree_new
 #: model:ir.ui.menu,name:sale.menu_action_order_tree_new
 msgid "New Quotation"
-msgstr ""
+msgstr "Novi upit"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Total amount"
-msgstr ""
+msgstr "Ukupni iznos"
 
 #. module: sale
 #: rml:sale.order:0
 #: field:sale.order,date_order:0
 msgid "Date Ordered"
-msgstr ""
+msgstr "Datum naruđbe"
 
 #. module: sale
 #: field:sale.order.line,product_uos:0
 msgid "Product UoS"
-msgstr ""
+msgstr "Proizvod UoS"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1157,7 +1159,7 @@ msgstr ""
 #. module: sale
 #: field:sale.order.line,product_uom:0
 msgid "Product UoM"
-msgstr ""
+msgstr "Proizvod UoM"
 
 #. module: sale
 #: help:sale.config.picking_policy,step:0
@@ -1176,42 +1178,42 @@ msgstr ""
 #. module: sale
 #: model:process.node,name:sale.process_node_order0
 msgid "Order"
-msgstr ""
+msgstr "Nalog"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Payment Terms"
-msgstr ""
+msgstr "Uvjieti plaćanja"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Invoice Corrected"
-msgstr ""
+msgstr "Račun ispravljen"
 
 #. module: sale
 #: field:sale.order.line,delay:0
 msgid "Delivery Delay"
-msgstr ""
+msgstr "Odgoda isporuke"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Related invoices"
-msgstr ""
+msgstr "Povezani računi"
 
 #. module: sale
 #: field:sale.shop,name:0
 msgid "Shop Name"
-msgstr ""
+msgstr "Naziv prodajnog mjesta"
 
 #. module: sale
 #: field:sale.order,payment_term:0
 msgid "Payment Term"
-msgstr ""
+msgstr "Uslovi plaćanja"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Payment Before Delivery"
-msgstr ""
+msgstr "Plaćanje prije isporuke"
 
 #. module: sale
 #: help:sale.order,invoice_ids:0
@@ -1240,18 +1242,18 @@ msgstr ""
 #. module: sale
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Greška: nevažeći EAN kod"
 
 #. module: sale
 #: field:sale.order,picked_rate:0
 #: field:sale.order,shipped:0
 msgid "Picked"
-msgstr ""
+msgstr "Izuzeto"
 
 #. module: sale
 #: view:sale.shop:0
 msgid "Accounting"
-msgstr ""
+msgstr "Računovodstvo"
 
 #. module: sale
 #: selection:sale.config.picking_policy,order_policy:0
@@ -1261,7 +1263,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Stock Moves"
-msgstr ""
+msgstr "Kretanje zaliha"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree

From 0a5f82bd3b22aa2fc8fe3a0baa53c7020b314313 Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Thu, 11 Feb 2010 10:59:24 +0530
Subject: [PATCH 13/28] [FIX] context_get on user object if the value is none

bzr revid: mra@tinyerp.com-20100211052924-ykzul05nd9h1mmo1
---
 bin/addons/base/res/res_user.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index d3e72831c12..20882fa617e 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -229,7 +229,7 @@ class users(osv.osv):
     def _get_company(self,cr, uid, context={}, uid2=False):
         if not uid2:
             uid2 = uid
-        user = self.pool.get('res.users').browse(cr, uid, uid2, context)        
+        user = self.pool.get('res.users').browse(cr, uid, uid2, context)
         return user.company_id.id
 
     def _get_menu(self,cr, uid, context={}):
@@ -296,13 +296,12 @@ class users(osv.osv):
         result = {}
         for k in self._columns.keys():
             if k.startswith('context_'):
-                res = getattr(user,k)
+                res = getattr(user,k) or False
                 if isinstance(res, browse_record):
-                    res = res.id 
-                result[k[8:]] = res        
+                    res = res.id
+                result[k[8:]] = res
         return result
 
-    
     def action_get(self, cr, uid, context={}):
         dataobj = self.pool.get('ir.model.data')
         data_id = dataobj._get_id(cr, 1, 'base', 'action_res_users_my')
@@ -312,7 +311,7 @@ class users(osv.osv):
     def login(self, db, login, password):
         if not password:
             return False
-        cr = pooler.get_db(db).cursor()    
+        cr = pooler.get_db(db).cursor()
         cr.execute('select id from res_users where login=%s and password=%s and active', (tools.ustr(login), tools.ustr(password)))
         res = cr.fetchone()
         cr.close()
@@ -333,8 +332,8 @@ class users(osv.osv):
         cached_pass = self._uid_cache.get(db, {}).get(uid)
         if (cached_pass is not None) and cached_pass == passwd:
             return True
-        cr = pooler.get_db(db).cursor()    
-        cr.execute('select count(1) from res_users where id=%s and password=%s and active=%s', (int(uid), passwd, True))    
+        cr = pooler.get_db(db).cursor()
+        cr.execute('select count(1) from res_users where id=%s and password=%s and active=%s', (int(uid), passwd, True))
         res = cr.fetchone()[0]
         cr.close()
         if not bool(res):
@@ -350,14 +349,14 @@ class users(osv.osv):
     def access(self, db, uid, passwd, sec_level, ids):
         if not passwd:
             return False
-        cr = pooler.get_db(db).cursor()    
+        cr = pooler.get_db(db).cursor()
         cr.execute('select id from res_users where id=%s and password=%s', (uid, passwd))
         res = cr.fetchone()
         cr.close()
         if not res:
             raise security.ExceptionNoTb('Bad username or password')
         return res[0]
-   
+
 users()
 
 class config_users(osv.osv_memory):

From 34cbb6821f97cb182cbb39a6e0dce9369a608d39 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Thu, 11 Feb 2010 11:04:49 +0530
Subject: [PATCH 14/28] [FIX]:added missing sequence field in project.project

bzr revid: nch@tinyerp.com-20100211053449-d42va557q11gnj5u
---
 addons/project/project.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 17bafe9aa30..a57f782ef10 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -120,6 +120,7 @@ class project(osv.osv):
     _columns = {
         'complete_name': fields.function(_complete_name, method=True, string="Project Name", type='char', size=250),
         'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the project without removing it."),
+        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of Projects."),
         'category_id': fields.many2one('account.analytic.account','Analytic Account', help="Link this project to an analytic account if you need financial management on projects. It enables you to connect projects with budgets, planning, cost and revenue analysis, timesheets on projects, etc."),
         'priority': fields.integer('Sequence'),
         'warn_manager': fields.boolean('Warn Manager', help="If you check this field, the project manager will receive a request each time a task is completed by his team."),
@@ -138,10 +139,11 @@ class project(osv.osv):
 #                                 \n If it is to be reviewed then the state is \'Pending\'.\n When the project is completed the state is set to \'Done\'.'),
         'type_ids': fields.many2many('project.task.type', 'project_task_type_rel', 'project_id', 'type_id', 'Tasks Stages'),
      }
-
+    _order = "sequence"
     _defaults = {
         'active': lambda *a: True,
         'priority': lambda *a: 1,
+        'sequence': lambda *a: 10,
     }
     def _check_dates(self, cr, uid, ids):
          leave = self.read(cr, uid, ids[0],['date_start','date'])

From 46109153833e7437d98a4e08ec80547949fd5ace Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Thu, 11 Feb 2010 11:57:23 +0530
Subject: [PATCH 15/28] [FIX] Account : Search panel should display code before
 name

lp bug: https://launchpad.net/bugs/519218 fixed

bzr revid: jvo@tinyerp.com-20100211062723-dflckotm8ml891kp
---
 addons/account/account_view.xml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 7ccba2faf9b..3ef24386c2d 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -146,12 +146,26 @@
             </field>
         </record>
 
-
+		<record id="view_account_search" model="ir.ui.view">
+            <field name="name">account.account.search</field>
+            <field name="model">account.account</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Accounts">
+                    <field name="code" select="1"/>
+                    <field name="name" select="1"/>
+                    <field name="user_type" select="1"/>
+                    <field name="type" select="1"/>
+                </search>
+            </field>
+        </record>
+        
         <record id="action_account_form" model="ir.actions.act_window">
             <field name="name">List of Accounts</field>
             <field name="res_model">account.account</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
+            <field name="search_view_id" ref="view_account_search"/>
         </record>
         <menuitem id="account_account_menu" name="Financial Accounts" parent="account.menu_finance_accounting"/>
         <menuitem action="action_account_form" id="menu_action_account_form" parent="account_account_menu"/>

From aaa722ce9919ee03a565ffff58f9c621466b86af Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Thu, 11 Feb 2010 12:05:49 +0530
Subject: [PATCH 16/28] [IMP] project: query to get projects on user

bzr revid: mra@tinyerp.com-20100211063549-ate1k1qpbmip99ae
---
 addons/project/project.py | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index a57f782ef10..314b4f56eb7 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -49,13 +49,14 @@ class project(osv.osv):
 
     def search(self, cr, user, args, offset=0, limit=None, order=None,
             context=None, count=False):
-        if user==1:
+        if user == 1:
                 return super(project, self).search(cr, user, args, offset=offset, limit=limit, order=order,
                                                        context=context, count=count)
         if context and context.has_key('user_prefence') and context['user_prefence']:
                 cr.execute("""SELECT project.id FROM project_project project
                            LEFT JOIN account_analytic_account account ON account.id = project.category_id
-                           WHERE (account.user_id = %s)"""%(user))
+                           LEFT JOIN project_user_rel rel ON rel.project_id = project.category_id
+                           WHERE (account.user_id = %s or rel.uid = %s)"""%(user, user))
                 res = cr.fetchall()
                 return [(r[0]) for r in res]
         return super(project, self).search(cr, user, args, offset=offset, limit=limit, order=order,
@@ -538,6 +539,7 @@ config_compute_remaining()
 class message(osv.osv):
     _name = "project.message"
     _description = "Message"
+
     _columns = {
         'subject': fields.char('Subject', size=128, required="True"),
         'description': fields.text('Description'),
@@ -545,6 +547,7 @@ class message(osv.osv):
         'date': fields.date('Date'),
         'user_id': fields.many2one('res.users', 'User', required="True"),
         }
+
     def _default_project(self, cr, uid, context={}):
         if 'project_id' in context and context['project_id']:
             return int(context['project_id'])
@@ -556,20 +559,6 @@ class message(osv.osv):
 
 message()
 
-def _project_get(self, cr, uid, context={}):
-    if uid==1:
-        ids = self.pool.get('project.project').search(cr, uid, [])
-        res = self.pool.get('project.project').read(cr, uid, ids, ['id','name'], context)
-        res = [(str(r['id']),r['name']) for r in res]
-    else:
-        cr.execute("""SELECT project.id,account.name FROM project_project project
-                   LEFT JOIN account_analytic_account account ON account.id = project.category_id
-                   WHERE (account.user_id = %s)"""%(uid))
-        res = cr.fetchall()
-        print res
-        res = [(str(r[0]),r[1]) for r in res]
-    return res
-
 class users(osv.osv):
     _inherit = 'res.users'
     _description = "Users"
@@ -578,4 +567,4 @@ class users(osv.osv):
      }
 users()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

From 0504c236e119268f1e2f406022821ef0bb46cfcd Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Thu, 11 Feb 2010 12:29:32 +0530
Subject: [PATCH 17/28] [IMP+ADD] crm, crm_caldav: Removed caldav stuff from
 crm module. Now core crm module has  only  simple meeting  future like stable
 5.0.

and crm_caldav has more  futures  like:
        *  Recurrent meeting
        *  Alarms
        *  Invitation facility
        *  Share meeting with other calendar clients like sunbird

bzr revid: hmo@tinyerp.com-20100211065932-lm4lzinl15zq0dqb
---
 addons/crm/__terp__.py                   |   3 +-
 addons/crm/crm_meeting.py                |  27 +-
 addons/crm/crm_meeting_data.xml          | 329 +---------------------
 addons/crm/crm_meeting_menu.xml          |  17 +-
 addons/crm/crm_meeting_view.xml          |  88 ++----
 addons/crm/crm_meeting_wizard.xml        |  14 +-
 addons/crm_caldav/__init__.py            |  30 ++
 addons/crm_caldav/__terp__.py            |  54 ++++
 addons/crm_caldav/crm_meeting.py         |  45 +++
 addons/crm_caldav/crm_meeting_data.xml   | 331 +++++++++++++++++++++++
 addons/crm_caldav/crm_meeting_menu.xml   |  22 ++
 addons/crm_caldav/crm_meeting_view.xml   |  92 +++++++
 addons/crm_caldav/crm_meeting_wizard.xml |  18 ++
 13 files changed, 642 insertions(+), 428 deletions(-)
 create mode 100644 addons/crm_caldav/__init__.py
 create mode 100644 addons/crm_caldav/__terp__.py
 create mode 100644 addons/crm_caldav/crm_meeting.py
 create mode 100644 addons/crm_caldav/crm_meeting_data.xml
 create mode 100644 addons/crm_caldav/crm_meeting_menu.xml
 create mode 100644 addons/crm_caldav/crm_meeting_view.xml
 create mode 100644 addons/crm_caldav/crm_meeting_wizard.xml

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 5ef83f99cbe..50ed460729a 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -44,8 +44,7 @@ The CRM module has a email gateway for the synchronisation interface
 between mails and Open ERP.""", 
     'author': 'Tiny', 
     'website': 'http://www.openerp.com', 
-    'depends': ['base', 
-                        'caldav', 
+    'depends': ['base',                         
                         'process', 
                         'mail_gateway', 
                     ], 
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 192fcd7c94f..396c9758b07 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -21,6 +21,8 @@
 
 from osv import fields, osv
 import crm
+from datetime import datetime, timedelta
+from datetime import datetime, timedelta
 
 class crm_opportunity(osv.osv):
     _name = 'crm.opportunity'
@@ -32,7 +34,27 @@ class crm_meeting(osv.osv):
     _name = 'crm.meeting'
     _description = "Meeting Cases"
     _order = "id desc"
-    _inherit = ["crm.case", "calendar.event"]
+    _inherit = "crm.case"
+
+    def _get_duration(self, cr, uid, ids, name, arg, context):
+        res = {}
+        for event in self.browse(cr, uid, ids, context=context):
+            start = datetime.strptime(event.date, "%Y-%m-%d %H:%M:%S")
+            res[event.id] = 0
+            if event.date_deadline:
+                end = datetime.strptime(event.date_deadline[:19], "%Y-%m-%d %H:%M:%S")
+                diff = end - start
+                duration =  float(diff.days)* 24 + (float(diff.seconds) / 3600)
+                res[event.id] = round(duration, 2)
+        return res
+
+    def _set_duration(self, cr, uid, id, name, value, arg, context):
+        event = self.browse(cr, uid, id, context=context)
+        start = datetime.strptime(event.date, "%Y-%m-%d %H:%M:%S")
+        end = start + timedelta(hours=value)
+        cr.execute("UPDATE %s set date_deadline='%s' \
+                        where id=%s"% (self._table, end.strftime("%Y-%m-%d %H:%M:%S"), id))
+        return True
 
     _columns = {
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 
@@ -41,7 +63,8 @@ class crm_meeting(osv.osv):
                             ('object_id.model', '=', 'crm.meeting')]", \
             help='Category related to the section.Subdivide the CRM cases \
 independently or section-wise.'), 
-        'attendee_ids': fields.many2many('calendar.attendee', 'event_attendee_rel', 'event_id', 'attendee_id', 'Attendees'),
+        'duration': fields.function(_get_duration, method=True, \
+                                    fnct_inv=_set_duration, string='Duration'),        
         'phonecall_id':fields.many2one ('crm.phonecall', 'Phonecall'),        
         'opportunity_id':fields.many2one ('crm.opportunity', 'Opportunity'),
     }
diff --git a/addons/crm/crm_meeting_data.xml b/addons/crm/crm_meeting_data.xml
index 58982e4dc6c..0b8da1389bf 100644
--- a/addons/crm/crm_meeting_data.xml
+++ b/addons/crm/crm_meeting_data.xml
@@ -20,333 +20,6 @@
 	        <field name="name">Phone Call</field>
 	        <field name="section_id" ref="section_sales_department"/>
 	        <field name="object_id" search="[('model','=','crm.meeting')]" model="ir.model"/>
-	    </record>
-
-	    <record model="res.request.link" id="request_link_meeting">
-	        <field name="name">Case Meeting</field>
-	        <field name="object">crm.meeting</field>
-	    </record>		
-		
-
-<!--		Event Attribute mapping for Calendar-->
-
-        <record model="basic.calendar" id="base_calendar.basic_calendar1">
-			<field name="name">Meetings</field>
-		</record>
-
-        <record model="basic.calendar.lines" id="caldav.calendar_lines_event">
-			<field name="name">vevent</field>
-			<field name="calendar_id" ref="base_calendar.basic_calendar1" />
-			<field name="object_id" search="[('model','=','crm.meeting')]" />
-            <field name="domain">[('user_id','=', uid)]</field>
-		</record>
-
-        <record model="basic.calendar.lines" id="caldav.calendar_lines_alarm">
-			<field name="name">valarm</field>
-			<field name="calendar_id" ref="base_calendar.basic_calendar1" />
-			<field name="object_id" search="[('model','=','calendar.alarm')]" />
-		</record>
-		
-		<record model="basic.calendar.lines" id="caldav.calendar_lines_attendee">
-			<field name="name">attendee</field>
-			<field name="calendar_id" ref="base_calendar.basic_calendar1" />
-			<field name="object_id" search="[('model','=','calendar.attendee')]" />
-		</record>
-		
-        <record model="basic.calendar.fields" id="map_event_1">
-            <field name="name" ref="base_calendar.field_event_uid"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
-	        <field name="field_id" search="[('name','=','id'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_2">
-            <field name="name" ref="base_calendar.field_event_recurrence-id"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
-	        <field name="field_id" search="[('name','=','recurrent_id'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-        
-        <record model="basic.calendar.fields" id="map_event_3">
-            <field name="name" ref="base_calendar.field_event_vtimezone"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
-	        <field name="field_id" search="[('name','=','vtimezone'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_4">
-			<field name="name" ref="base_calendar.field_event_attendee" />
-			<field name="type_id" ref="caldav.calendar_lines_event" />
-			<field name="field_id" search="[('name','=','attendee_ids'),('model_id.model','=','crm.meeting')]" />
-			<field name="fn">field</field>
-		</record>		
-
-        <record model="basic.calendar.fields" id="map_event_5">
-            <field name="name" ref="base_calendar.field_event_rrule"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
-	        <field name="field_id" search="[('name','=','rrule'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_6">
-            <field name="name" ref="base_calendar.field_event_dtend"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
-	        <field name="field_id" search="[('name','=','date_deadline'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_7">
-            <field name="name" ref="base_calendar.field_event_valarm"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
-	        <field name="field_id" search="[('name','=','caldav_alarm_id'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_8">
-			<field name="name" ref="base_calendar.field_event_priority"/>
-		    <field name="type_id" ref="caldav.calendar_lines_event" />
-			<field name="field_id" search="[('name','=','priority'),('model_id.model','=','crm.meeting')]" />
-		    <field name="fn">field</field>
-		    <field name="mapping">{'1': '1', '2': '2', '3': '2','4': '2', '5': '3', '6': '4', '7': '4', '8': '4', '9': '5'}</field>
-		</record>	
-		
-
-        <record model="basic.calendar.fields" id="map_event_9">
-            <field name="name" ref="base_calendar.field_event_location"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
-	        <field name="field_id" search="[('name','=','location'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_10">
-            <field name="name" ref="base_calendar.field_event_exrule"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
-	        <field name="field_id" search="[('name','=','exrule'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_11">
-			<field name="name" ref="base_calendar.field_event_status"/>
-		    <field name="type_id" ref="caldav.calendar_lines_event" />
-			<field name="field_id" search="[('name','=','state'),('model_id.model','=','crm.meeting')]" />
-			<field name="mapping">{'tentative': 'draft', 'confirmed': 'open', 'cancelled': 'cancel'}</field>
-		    <field name="fn">field</field>
-		</record>
-
-        <record model="basic.calendar.fields" id="map_event_12">
-            <field name="name" ref="base_calendar.field_event_exdate"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
-	        <field name="field_id" search="[('name','=','exdate'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_13">
-            <field name="name" ref="base_calendar.field_event_dtstamp"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
-	        <field name="field_id" search="[('name','=','date'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_14">
-            <field name="name" ref="base_calendar.field_event_description"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
-	        <field name="field_id" search="[('name','=','description'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_15">
-            <field name="name" ref="base_calendar.field_event_dtstart"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
-	        <field name="field_id" search="[('name','=','date'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_16">
-            <field name="name" ref="base_calendar.field_event_class"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
-	        <field name="field_id" search="[('name','=','class'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_18">
-            <field name="name" ref="base_calendar.field_event_created"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
-	        <field name="field_id" search="[('name','=','create_date'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_19">
-            <field name="name" ref="base_calendar.field_event_url"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
-	        <field name="field_id" search="[('name','=','caldav_url'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_20">
-            <field name="name" ref="base_calendar.field_event_summary"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
-	        <field name="field_id" search="[('name','=','name'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>       
-
-
-
-        <record model="basic.calendar.fields" id="map_alarm_1">
-            <field name="name" ref="base_calendar.field_alarm_attendee"/>
-            <field name="type_id" ref="caldav.calendar_lines_alarm" />
-	        <field name="field_id" search="[('name','=','attendee_ids'),('model_id.model','=','calendar.alarm')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_alarm_2">
-            <field name="name" ref="base_calendar.field_alarm_trigger_duration"/>
-            <field name="type_id" ref="caldav.calendar_lines_alarm" />
-	        <field name="field_id" search="[('name','=','trigger_duration'),('model_id.model','=','res.alarm')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_alarm_3">
-            <field name="name" ref="base_calendar.field_alarm_description"/>
-            <field name="type_id" ref="caldav.calendar_lines_alarm" />
-	        <field name="field_id" search="[('name','=','description'),('model_id.model','=','calendar.alarm')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_alarm_4">
-            <field name="name" ref="base_calendar.field_alarm_attach"/>
-            <field name="type_id" ref="caldav.calendar_lines_alarm" />
-	        <field name="field_id" search="[('name','=','attach'),('model_id.model','=','calendar.alarm')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_alarm_5">
-            <field name="name" ref="base_calendar.field_alarm_trigger_occurs"/>
-            <field name="type_id" ref="caldav.calendar_lines_alarm" />
-	        <field name="field_id" search="[('name','=','trigger_occurs'),('model_id.model','=','res.alarm')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_alarm_6">
-            <field name="name" ref="base_calendar.field_alarm_trigger_interval"/>
-            <field name="type_id" ref="caldav.calendar_lines_alarm" />
-	        <field name="field_id" search="[('name','=','trigger_interval'),('model_id.model','=','res.alarm')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_alarm_7">
-            <field name="name" ref="base_calendar.field_alarm_summary"/>
-            <field name="type_id" ref="caldav.calendar_lines_alarm" />
-	        <field name="field_id" search="[('name','=','name'),('model_id.model','=','calendar.alarm')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_alarm_8">
-            <field name="name" ref="base_calendar.field_alarm_duration"/>
-            <field name="type_id" ref="caldav.calendar_lines_alarm" />
-	        <field name="field_id" search="[('name','=','duration'),('model_id.model','=','res.alarm')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_alarm_9">
-            <field name="name" ref="base_calendar.field_alarm_repeat"/>
-            <field name="type_id" ref="caldav.calendar_lines_alarm" />
-	        <field name="field_id" search="[('name','=','repeat'),('model_id.model','=','res.alarm')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_alarm_10">
-            <field name="name" ref="base_calendar.field_alarm_action"/>
-            <field name="type_id" ref="caldav.calendar_lines_alarm" />
-	        <field name="field_id" search="[('name','=','action'),('model_id.model','=','calendar.alarm')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_alarm_11">
-            <field name="name" ref="base_calendar.field_alarm_trigger_related"/>
-            <field name="type_id" ref="caldav.calendar_lines_alarm" />
-	        <field name="field_id" search="[('name','=','trigger_related'),('model_id.model','=','res.alarm')]" />
-            <field name="fn">field</field>
-        </record>
-
-
-        <record model="basic.calendar.fields" id="map_attendee_1">
-            <field name="name" ref="base_calendar.field_attendee_cn"/>
-            <field name="type_id" ref="caldav.calendar_lines_attendee" />
-	        <field name="field_id" search="[('name','=','cn'),('model_id.model','=','calendar.attendee')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_attendee_2">
-            <field name="name" ref="base_calendar.field_attendee_sent-by"/>
-            <field name="type_id" ref="caldav.calendar_lines_attendee" />
-	        <field name="field_id" search="[('name','=','sent_by'),('model_id.model','=','calendar.attendee')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_attendee_3">
-            <field name="name" ref="base_calendar.field_attendee_language"/>
-            <field name="type_id" ref="caldav.calendar_lines_attendee" />
-	        <field name="field_id" search="[('name','=','language'),('model_id.model','=','calendar.attendee')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_attendee_4">
-            <field name="name" ref="base_calendar.field_attendee_delegated-from"/>
-            <field name="type_id" ref="caldav.calendar_lines_attendee" />
-	        <field name="field_id" search="[('name','=','delegated_from'),('model_id.model','=','calendar.attendee')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_attendee_5">
-            <field name="name" ref="base_calendar.field_attendee_member"/>
-            <field name="type_id" ref="caldav.calendar_lines_attendee" />
-	        <field name="field_id" search="[('name','=','member'),('model_id.model','=','calendar.attendee')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_attendee_6">
-            <field name="name" ref="base_calendar.field_attendee_cutype"/>
-            <field name="type_id" ref="caldav.calendar_lines_attendee" />
-	        <field name="field_id" search="[('name','=','cutype'),('model_id.model','=','calendar.attendee')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_attendee_7">
-            <field name="name" ref="base_calendar.field_attendee_role"/>
-            <field name="type_id" ref="caldav.calendar_lines_attendee" />
-	        <field name="field_id" search="[('name','=','role'),('model_id.model','=','calendar.attendee')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_attendee_8">
-            <field name="name" ref="base_calendar.field_attendee_partstat"/>
-            <field name="type_id" ref="caldav.calendar_lines_attendee" />
-	        <field name="field_id" search="[('name','=','state'),('model_id.model','=','calendar.attendee')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_attendee_9">
-            <field name="name" ref="base_calendar.field_attendee_delegated-to"/>
-            <field name="type_id" ref="caldav.calendar_lines_attendee" />
-	        <field name="field_id" search="[('name','=','delegated_to'),('model_id.model','=','calendar.attendee')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_attendee_10">
-            <field name="name" ref="base_calendar.field_attendee_dir"/>
-            <field name="type_id" ref="caldav.calendar_lines_attendee" />
-	        <field name="field_id" search="[('name','=','dir'),('model_id.model','=','calendar.attendee')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_attendee_11">
-            <field name="name" ref="base_calendar.field_attendee_rsvp"/>
-            <field name="type_id" ref="caldav.calendar_lines_attendee" />
-	        <field name="field_id" search="[('name','=','rsvp'),('model_id.model','=','calendar.attendee')]" />
-            <field name="fn">field</field>
-        </record>
-
-		
-
+	    </record>	    
 	</data>
 </openerp>
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index a4c894d7a0a..a52f3b5b297 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -116,22 +116,7 @@
         ALL MEETINGS
     -->
     <menuitem name="Meetings" id="menu_meeting_sale" parent="base.menu_base_partner" sequence="3"/>
-    <menuitem name="Meetings" id="menu_crm_case_categ_meet" action="crm_case_categ_meet" parent="menu_meeting_sale" sequence="1"/>
-
-    <record id="action_view_attendee_form" model="ir.actions.act_window">
-	 	<field name="name">Meeting Invitations</field>
-	 	<field name="type">ir.actions.act_window</field>
-	 	<field name="res_model">calendar.attendee</field>
-	 	<field name="view_type">form</field>
-	 	<field name="view_mode">tree,form</field>
-	 	<field name="view_id" ref="caldav.caldav_attendee_tree_view" />	 	
-        <field name="domain">[('ref','like','crm.meeting,')]</field>
-	 	<field name="context">{'default_sent_by_uid': uid}</field>
-	 </record>
-
-    <menuitem id="menu_attendee_invitations"
-			name="Meeting Invitations" parent="menu_meeting_sale"
-			sequence="10" action="action_view_attendee_form" />
+    <menuitem name="Meetings" id="menu_crm_case_categ_meet" action="crm_case_categ_meet" parent="menu_meeting_sale" sequence="1"/>    
     
 
     <record model="ir.actions.act_window" id="crm_case_category_act_meetall3">
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 78a0fc6e776..5adcf8856e6 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -24,84 +24,41 @@
         <field name="model">crm.meeting</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Meetings Form">            	
+            <form string="Meetings">            	
             	<group col="6" colspan="4">
                     <field name="name" select="1" string="Summary"
-            			colspan="4" />
-                    <field name="location" />
+            			colspan="4" />   
+                    <field name="categ_id"/>                 
             		<field name="date" string="Start Date" required="1" />
             		<field name="duration" widget="float_time" />
             		<field name="date_deadline" string="End Date" required="1" />
             		
-            		<field name="categ_id"/>
-                    <field name="alarm_id" string="Reminder" widget="selection" />
-            		<group colspan="2" col="3" attrs="{'readonly':[('recurrent_uid','!=',False)]}">
-                            <field name="rrule_type" string="Recurrency"
-                            	on_change="onchange_rrule_type(rrule_type)"
-                            	colspan="1" />
-                            <button string="Custom"
-            					name="%(caldav.action_calendar_custom_rrule_wizard)d"
-            					icon="gtk-save-as" type="action" context="{'model' : 'crm.meeting'}"
-                                attrs="{'readonly': [('rrule_type','!=','custom')]}"
-                                />
-                    </group>
-
+            		
             	</group>
             	<notebook colspan="4">
-            		<page string="Description">
+            		<page string="Meeting">
             			<separator string="Description" colspan="4" />
             			<field name="description" nolabel="1" colspan="4" />
-            		</page>
-            		<page string="Attendee Detail">
-            			<button string="Invite People"
-            				name="%(caldav.action_view_calendar_invite_attendee_wizard)d"
-            				icon="terp-partner" type="action"
-            				context="{'model' : 'crm.meeting', 'attendee_field':'attendee_ids'}" colspan="2"/>
-            			<field name="attendee_ids" colspan="4"
-            				nolabel="1" widget="one2many" mode="tree,form">
-            				<tree string="Atendee details" editable="top">
-            					<field name="email" />
-            					<field name="role" select="1" />
-            					<field name="state" />
-            				</tree>
-            				<form string="Atendee details">
-            					<notebook colspan="4">
-            						<page string="Details">
-            							<field name="email" />
-            							<field name="rsvp" select="1" />
-            							<field name="cutype" select="1" />
-            							<field name="role" select="1" />
-            							<separator colspan="4" string="" />
-            							<field name="state" />
-            						</page>
-            						<page string="Other">
-            							<field name="user_id"/>
-            							<field name="partner_address_id" select="1" />
-            							<newline />
-            						</page>
-            					</notebook>
-            				</form>
-            			</field>
-            		</page>
+                        <separator colspan="4"/>
+                        <group col="8" colspan="4">
+                            <field name="state" select="2"/>
+                            <button name="case_close" string="Done" states="open,draft,pending" type="object"  icon="gtk-close"/>
+                            <button name="case_open" string="Open" states="draft,pending" type="object"  icon="gtk-go-forward"/>
+                            <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"  icon="gtk-cancel"/>
+                            <button name="case_pending" string="Pending" states="draft,open" type="object"  icon="gtk-media-pause"/>
+                            <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"  icon="gtk-go-up"/>
+                            <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"  icon="gtk-convert"/>
+                        </group>
+            		</page>            		
             		<page string="Other Information">
             			<field name="priority"/>
-            			<field name="show_as"/>            			
-            			<field name="class"/>
             			<field name="user_id" on_change="onchange_user_id(user_id)"/>
                         <field name="section_id" widget="selection"
-            			/>
-            			<field name="vtimezone"/>
-            			<field name="recurrent_id" invisible="1" />
-            			<field name="recurrent_uid" invisible="1" />
-            			<field name="rrule" invisible="1" />
+            			/>            			
             		</page>
             	</notebook>
-            	<group col="3" colspan="4" attrs="{'invisible':[('rrule_type','in', ('none', False))]}">
-            		<label string="" />
-            		<button string="Modify this Occurrence"
-            			name="%(base_calendar.wizard_edit_this_event)d" icon="gtk-save"
-            			type="action" context="{'model' : 'crm.meeting', 'date': date, 'date_deadline': date_deadline}" />
-            	</group>
+    
+                            	
             </form>
         </field>
     </record>
@@ -111,7 +68,7 @@
         <field name="model">crm.meeting</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Meetings Tree"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
+            <tree string="Meetings"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
                 <field name="id" widget="char"/>
                 <field name="name" string="Title"/>
                 <field name="date" string="Meeting Date"/>
@@ -119,10 +76,7 @@
                 <field name="priority"/>
                 <field name="categ_id"/>
                 <field name="user_id"/>
-                <field name="state"/>
-                <button name="case_open" string="Confirm Meeting" states="draft,cancel,pending" type="object" icon="terp-crm"/>
-                <button name="case_cancel" string="Cancel Meeting" states="draft,open,pending" type="object" icon="gtk-cancel"/>
-                <button name="case_reset" string="Reset to Unconfirmed" states="done,open,cancel" type="object" icon="gtk-convert"/>
+                <field name="state"/>                
             </tree>
         </field>
     </record>
diff --git a/addons/crm/crm_meeting_wizard.xml b/addons/crm/crm_meeting_wizard.xml
index e53d3117ebb..41d8d37da0c 100644
--- a/addons/crm/crm_meeting_wizard.xml
+++ b/addons/crm/crm_meeting_wizard.xml
@@ -1,18 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 	<data>
-		<wizard string="Import .ics File" model="crm.meeting"
-			name="calendar.event.import" id="base_calendar.wizard_cal_event_import" />
-
-		<wizard string="Subscribe"
-			model="crm.meeting" name="calendar.event.subscribe"
-			id="base_calendar.wizard_cal_event_subscribe" />
-
-		<wizard string="Export .ics File" model="crm.meeting"
-			name="calendar.event.export" id="base_calendar.wizard_cal_event_export" />
-
-		<wizard string="Edit this event" model="crm.meeting"
-			name="calendar.event.edit.this" id="base_calendar.wizard_edit_this_event"
-			menu="False" />
+		
 	</data>
 </openerp>
diff --git a/addons/crm_caldav/__init__.py b/addons/crm_caldav/__init__.py
new file mode 100644
index 00000000000..e0b36eaac3d
--- /dev/null
+++ b/addons/crm_caldav/__init__.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+
+import crm_meeting
+
+
+
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/crm_caldav/__terp__.py b/addons/crm_caldav/__terp__.py
new file mode 100644
index 00000000000..19357a428be
--- /dev/null
+++ b/addons/crm_caldav/__terp__.py
@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    'name': 'Extened Module to Add CalDav future on Meeting',
+    'version': '1.0',
+    'category': 'Generic Modules/CRM & SRM',
+    'description': """
+    New Futures in Meeting:
+        *  Recurrent meeting
+        *  Alarms
+        *  Invitation facility
+        *  Share meeting with other calendar clients like sunbird         
+""", 
+    'author': 'Tiny', 
+    'website': 'http://www.openerp.com', 
+    'depends': ['base', 
+                        'caldav', 
+                        'crm', 
+                        'mail_gateway', 
+                    ], 
+    'init_xml': [ 
+                'crm_meeting_data.xml',                 
+    ], 
+
+    'update_xml': [        
+        'crm_meeting_wizard.xml', 
+        'crm_meeting_view.xml', 
+        'crm_meeting_menu.xml',         
+    ],
+    'demo_xml': [], 
+    'installable': True, 
+    'active': False,     
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_caldav/crm_meeting.py b/addons/crm_caldav/crm_meeting.py
new file mode 100644
index 00000000000..be7ba346c26
--- /dev/null
+++ b/addons/crm_caldav/crm_meeting.py
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from crm import crm
+class crm_meeting(osv.osv):
+    _name = 'crm.meeting'
+    _description = "Meetings"
+    _order = "id desc"
+    _inherit = ["crm.case", "calendar.event"]
+
+    _columns = { 
+        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 
+        'categ_id': fields.many2one('crm.case.categ', 'Category', \
+                            domain="[('section_id','=',section_id),\
+                            ('object_id.model', '=', 'crm.meeting')]", \
+            help='Category related to the section.Subdivide the CRM cases \
+independently or section-wise.'),            
+        'phonecall_id':fields.many2one ('crm.phonecall', 'Phonecall'),        
+        'opportunity_id':fields.many2one ('crm.opportunity', 'Opportunity'),       
+        'attendee_ids': fields.many2many('calendar.attendee', 'event_attendee_rel', 'event_id', 'attendee_id', 'Attendees'),
+        
+    }
+
+crm_meeting()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_caldav/crm_meeting_data.xml b/addons/crm_caldav/crm_meeting_data.xml
new file mode 100644
index 00000000000..ae7315da835
--- /dev/null
+++ b/addons/crm_caldav/crm_meeting_data.xml
@@ -0,0 +1,331 @@
+<?xml version="1.0"?>
+<openerp>
+	<data noupdate="1">
+
+        <record model="res.request.link" id="request_link_meeting">
+	        <field name="name">Case Meeting</field>
+	        <field name="object">crm.meeting</field>
+	    </record>        
+
+<!--		Event Attribute mapping for Calendar-->
+
+        <record model="basic.calendar" id="base_calendar.basic_calendar1">
+			<field name="name">Meetings</field>
+		</record>
+
+        <record model="basic.calendar.lines" id="caldav.calendar_lines_event">
+			<field name="name">vevent</field>
+			<field name="calendar_id" ref="base_calendar.basic_calendar1" />
+			<field name="object_id" search="[('model','=','crm.meeting')]" />
+            <field name="domain">[('user_id','=', uid)]</field>
+		</record>
+
+        <record model="basic.calendar.lines" id="caldav.calendar_lines_alarm">
+			<field name="name">valarm</field>
+			<field name="calendar_id" ref="base_calendar.basic_calendar1" />
+			<field name="object_id" search="[('model','=','calendar.alarm')]" />
+		</record>
+		
+		<record model="basic.calendar.lines" id="caldav.calendar_lines_attendee">
+			<field name="name">attendee</field>
+			<field name="calendar_id" ref="base_calendar.basic_calendar1" />
+			<field name="object_id" search="[('model','=','calendar.attendee')]" />
+		</record>
+		
+        <record model="basic.calendar.fields" id="map_event_1">
+            <field name="name" ref="base_calendar.field_event_uid"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','id'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_2">
+            <field name="name" ref="base_calendar.field_event_recurrence-id"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','recurrent_id'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+        
+        <record model="basic.calendar.fields" id="map_event_3">
+            <field name="name" ref="base_calendar.field_event_vtimezone"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','vtimezone'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_4">
+			<field name="name" ref="base_calendar.field_event_attendee" />
+			<field name="type_id" ref="caldav.calendar_lines_event" />
+			<field name="field_id" search="[('name','=','attendee_ids'),('model_id.model','=','crm.meeting')]" />
+			<field name="fn">field</field>
+		</record>		
+
+        <record model="basic.calendar.fields" id="map_event_5">
+            <field name="name" ref="base_calendar.field_event_rrule"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','rrule'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_6">
+            <field name="name" ref="base_calendar.field_event_dtend"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','date_deadline'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_7">
+            <field name="name" ref="base_calendar.field_event_valarm"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','caldav_alarm_id'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_8">
+			<field name="name" ref="base_calendar.field_event_priority"/>
+		    <field name="type_id" ref="caldav.calendar_lines_event" />
+			<field name="field_id" search="[('name','=','priority'),('model_id.model','=','crm.meeting')]" />
+		    <field name="fn">field</field>
+		    <field name="mapping">{'1': '1', '2': '2', '3': '2','4': '2', '5': '3', '6': '4', '7': '4', '8': '4', '9': '5'}</field>
+		</record>	
+		
+
+        <record model="basic.calendar.fields" id="map_event_9">
+            <field name="name" ref="base_calendar.field_event_location"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','location'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_10">
+            <field name="name" ref="base_calendar.field_event_exrule"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','exrule'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_11">
+			<field name="name" ref="base_calendar.field_event_status"/>
+		    <field name="type_id" ref="caldav.calendar_lines_event" />
+			<field name="field_id" search="[('name','=','state'),('model_id.model','=','crm.meeting')]" />
+			<field name="mapping">{'tentative': 'draft', 'confirmed': 'open', 'cancelled': 'cancel'}</field>
+		    <field name="fn">field</field>
+		</record>
+
+        <record model="basic.calendar.fields" id="map_event_12">
+            <field name="name" ref="base_calendar.field_event_exdate"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','exdate'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_13">
+            <field name="name" ref="base_calendar.field_event_dtstamp"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','date'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_14">
+            <field name="name" ref="base_calendar.field_event_description"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','description'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_15">
+            <field name="name" ref="base_calendar.field_event_dtstart"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','date'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_16">
+            <field name="name" ref="base_calendar.field_event_class"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','class'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_18">
+            <field name="name" ref="base_calendar.field_event_created"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','create_date'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_19">
+            <field name="name" ref="base_calendar.field_event_url"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','caldav_url'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_20">
+            <field name="name" ref="base_calendar.field_event_summary"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','name'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>       
+
+
+
+        <record model="basic.calendar.fields" id="map_alarm_1">
+            <field name="name" ref="base_calendar.field_alarm_attendee"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	        <field name="field_id" search="[('name','=','attendee_ids'),('model_id.model','=','calendar.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_2">
+            <field name="name" ref="base_calendar.field_alarm_trigger_duration"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	        <field name="field_id" search="[('name','=','trigger_duration'),('model_id.model','=','res.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_3">
+            <field name="name" ref="base_calendar.field_alarm_description"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	        <field name="field_id" search="[('name','=','description'),('model_id.model','=','calendar.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_4">
+            <field name="name" ref="base_calendar.field_alarm_attach"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	        <field name="field_id" search="[('name','=','attach'),('model_id.model','=','calendar.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_5">
+            <field name="name" ref="base_calendar.field_alarm_trigger_occurs"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	        <field name="field_id" search="[('name','=','trigger_occurs'),('model_id.model','=','res.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_6">
+            <field name="name" ref="base_calendar.field_alarm_trigger_interval"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	        <field name="field_id" search="[('name','=','trigger_interval'),('model_id.model','=','res.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_7">
+            <field name="name" ref="base_calendar.field_alarm_summary"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	        <field name="field_id" search="[('name','=','name'),('model_id.model','=','calendar.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_8">
+            <field name="name" ref="base_calendar.field_alarm_duration"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	        <field name="field_id" search="[('name','=','duration'),('model_id.model','=','res.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_9">
+            <field name="name" ref="base_calendar.field_alarm_repeat"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	        <field name="field_id" search="[('name','=','repeat'),('model_id.model','=','res.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_10">
+            <field name="name" ref="base_calendar.field_alarm_action"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	        <field name="field_id" search="[('name','=','action'),('model_id.model','=','calendar.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_11">
+            <field name="name" ref="base_calendar.field_alarm_trigger_related"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	        <field name="field_id" search="[('name','=','trigger_related'),('model_id.model','=','res.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+
+        <record model="basic.calendar.fields" id="map_attendee_1">
+            <field name="name" ref="base_calendar.field_attendee_cn"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	        <field name="field_id" search="[('name','=','cn'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_2">
+            <field name="name" ref="base_calendar.field_attendee_sent-by"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	        <field name="field_id" search="[('name','=','sent_by'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_3">
+            <field name="name" ref="base_calendar.field_attendee_language"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	        <field name="field_id" search="[('name','=','language'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_4">
+            <field name="name" ref="base_calendar.field_attendee_delegated-from"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	        <field name="field_id" search="[('name','=','delegated_from'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_5">
+            <field name="name" ref="base_calendar.field_attendee_member"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	        <field name="field_id" search="[('name','=','member'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_6">
+            <field name="name" ref="base_calendar.field_attendee_cutype"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	        <field name="field_id" search="[('name','=','cutype'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_7">
+            <field name="name" ref="base_calendar.field_attendee_role"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	        <field name="field_id" search="[('name','=','role'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_8">
+            <field name="name" ref="base_calendar.field_attendee_partstat"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	        <field name="field_id" search="[('name','=','state'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_9">
+            <field name="name" ref="base_calendar.field_attendee_delegated-to"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	        <field name="field_id" search="[('name','=','delegated_to'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_10">
+            <field name="name" ref="base_calendar.field_attendee_dir"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	        <field name="field_id" search="[('name','=','dir'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_11">
+            <field name="name" ref="base_calendar.field_attendee_rsvp"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	        <field name="field_id" search="[('name','=','rsvp'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+		
+
+	</data>
+</openerp>
diff --git a/addons/crm_caldav/crm_meeting_menu.xml b/addons/crm_caldav/crm_meeting_menu.xml
new file mode 100644
index 00000000000..7c01fa3415d
--- /dev/null
+++ b/addons/crm_caldav/crm_meeting_menu.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<openerp>
+<data noupdate="1">    
+
+    <record id="action_view_attendee_form" model="ir.actions.act_window">
+	 	<field name="name">Meeting Invitations</field>
+	 	<field name="type">ir.actions.act_window</field>
+	 	<field name="res_model">calendar.attendee</field>
+	 	<field name="view_type">form</field>
+	 	<field name="view_mode">tree,form</field>
+	 	<field name="view_id" ref="caldav.caldav_attendee_tree_view" />	 	
+        <field name="domain">[('ref','like','crm.meeting,')]</field>
+	 	<field name="context">{'default_sent_by_uid': uid}</field>
+	 </record>
+
+    <menuitem id="menu_attendee_invitations"
+			name="Meeting Invitations" parent="crm.menu_meeting_sale"
+			sequence="10" action="action_view_attendee_form" /> 
+
+    
+</data>
+</openerp>
diff --git a/addons/crm_caldav/crm_meeting_view.xml b/addons/crm_caldav/crm_meeting_view.xml
new file mode 100644
index 00000000000..16e1423456a
--- /dev/null
+++ b/addons/crm_caldav/crm_meeting_view.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>	
+
+        <record id="meeting_form_view_inherit1" model="ir.ui.view">
+                <field name="name">CRM - Meetings Form Inherit1</field>
+                <field name="model">crm.meeting</field>
+                <field name="type">form</field>
+                <field name="inherit_id" ref="crm.crm_case_form_view_meet"/>                
+                <field name="arch" type="xml">
+                    <field name="date_deadline" position="after">                        
+                        <group colspan="2" col="4" >
+                                <field name="rrule_type" string="Recurrency"
+                                	on_change="onchange_rrule_type(rrule_type)"
+                                	colspan="1" attrs="{'readonly':[('recurrent_uid','!=',False)]}"/>
+                                <button string="Custom"
+                					name="%(caldav.action_calendar_custom_rrule_wizard)d"
+                					icon="gtk-save-as" type="action" context="{'model' : 'crm.meeting'}"
+                                    attrs="{'readonly': [('rrule_type','!=','custom')]}"
+                                    />
+                                <button string="Edit" help="Edit only this Occurrency Meeting" attrs="{'invisible':[('rrule_type','in', ('none', False))]}"
+                    			name="%(base_calendar.wizard_edit_this_event)d" icon="gtk-save"
+                    			type="action" context="{'model' : 'crm.meeting', 'date': date, 'date_deadline': date_deadline}" />
+                        </group>
+                        <field name="alarm_id" string="Reminder" widget="selection" /> 
+                        <field name="location" />
+                    </field>
+                </field>
+        </record>
+
+        <record id="meeting_form_view_inherit2" model="ir.ui.view">
+                <field name="name">CRM - Meetings Form Inherit2</field>
+                <field name="model">crm.meeting</field>
+                <field name="type">form</field>
+                <field name="inherit_id" ref="crm.crm_case_form_view_meet"/>                
+                <field name="arch" type="xml">
+                    <xpath expr="/form/notebook/page[@string='Meeting']" position="after">
+                        <page string="Invitation Detail">
+                			<button string="Invite People"
+                				name="%(caldav.action_view_calendar_invite_attendee_wizard)d"
+                				icon="terp-partner" type="action"
+                				context="{'model' : 'crm.meeting', 'attendee_field':'attendee_ids'}" colspan="2"/>
+                			<field name="attendee_ids" colspan="4"
+                				nolabel="1" widget="one2many" mode="tree,form">
+                				<tree string="Invitation details" editable="top">
+                					<field name="email" />
+                					<field name="role" select="1" />
+                					<field name="state" />
+                				</tree>
+                				<form string="Invitation details">
+                					<notebook colspan="4">
+                						<page string="Details">
+                							<field name="email" />
+                							<field name="rsvp" select="1" />
+                							<field name="cutype" select="1" />
+                							<field name="role" select="1" />
+                							<separator colspan="4" string="" />
+                							<field name="state" />
+                						</page>
+                						<page string="Other">
+                							<field name="user_id"/>
+                							<field name="partner_address_id" select="1" />
+                							<newline />
+                						</page>
+                					</notebook>
+                				</form>
+                			</field>
+            		    </page>
+                    </xpath>
+                </field>
+        </record>
+
+
+        <record id="meeting_form_view_inherit3" model="ir.ui.view">
+                <field name="name">CRM - Meetings Form Inherit3</field>
+                <field name="model">crm.meeting</field>
+                <field name="type">form</field>
+                <field name="inherit_id" ref="crm.crm_case_form_view_meet"/>                
+                <field name="arch" type="xml">
+                    <xpath expr="/form/notebook/page[@string='Other Information']/field[@name='section_id']" position="after">
+                        <newline/>
+                        <field name="show_as"/>            			
+            			<field name="class"/>
+                        <field name="vtimezone"/>
+            			<field name="recurrent_id" invisible="1" />
+            			<field name="recurrent_uid" invisible="1" />
+            			<field name="rrule" invisible="1" />
+                    </xpath>
+                </field>
+        </record>
+	</data>
+</openerp>
diff --git a/addons/crm_caldav/crm_meeting_wizard.xml b/addons/crm_caldav/crm_meeting_wizard.xml
new file mode 100644
index 00000000000..e53d3117ebb
--- /dev/null
+++ b/addons/crm_caldav/crm_meeting_wizard.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data>
+		<wizard string="Import .ics File" model="crm.meeting"
+			name="calendar.event.import" id="base_calendar.wizard_cal_event_import" />
+
+		<wizard string="Subscribe"
+			model="crm.meeting" name="calendar.event.subscribe"
+			id="base_calendar.wizard_cal_event_subscribe" />
+
+		<wizard string="Export .ics File" model="crm.meeting"
+			name="calendar.event.export" id="base_calendar.wizard_cal_event_export" />
+
+		<wizard string="Edit this event" model="crm.meeting"
+			name="calendar.event.edit.this" id="base_calendar.wizard_edit_this_event"
+			menu="False" />
+	</data>
+</openerp>

From 8b880cbf01c25eac9c96ded9ebe96d306d22f0f5 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 11 Feb 2010 08:08:49 +0100
Subject: [PATCH 18/28] merge

bzr revid: fp@tinyerp.com-20100211070849-44l42nwos1sjnah0
---
 bin/addons/base/res/res_user.py | 2 +-
 bin/service/security.py         | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 20882fa617e..f49010c9048 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -299,7 +299,7 @@ class users(osv.osv):
                 res = getattr(user,k) or False
                 if isinstance(res, browse_record):
                     res = res.id
-                result[k[8:]] = res
+                result[k[8:]] = res or False
         return result
 
     def action_get(self, cr, uid, context={}):
diff --git a/bin/service/security.py b/bin/service/security.py
index c74ed2c7aba..a1ae4fab311 100644
--- a/bin/service/security.py
+++ b/bin/service/security.py
@@ -30,9 +30,12 @@ class ExceptionNoTb(Exception):
         self.args = (msg, '')
 
 def login(db, login, password):
+    print 'login'
     pool = pooler.get_pool(db)
     user_obj = pool.get('res.users')
-    return user_obj.login(db, login, password)
+    res = user_obj.login(db, login, password)
+    print 'login end'
+    return res
 
 def check_super(passwd):
     if passwd == tools.config['admin_passwd']:

From 03f0c3f9e0e05e988338b779c06adeb7ba69bf74 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 11 Feb 2010 08:09:10 +0100
Subject: [PATCH 19/28] [FIX] bad data reference

bzr revid: fp@tinyerp.com-20100211070910-u25bonrsxij2yh6z
---
 addons/project_planning/security/ir.model.access.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_planning/security/ir.model.access.csv b/addons/project_planning/security/ir.model.access.csv
index e00e0a01554..a589a05b669 100644
--- a/addons/project_planning/security/ir.model.access.csv
+++ b/addons/project_planning/security/ir.model.access.csv
@@ -3,6 +3,6 @@
 "access_report_account_analytic_planning_line","report_account_analytic.planning.line","model_report_account_analytic_planning_line","project.group_project_manager",1,1,1,1
 "access_report_account_analytic_planning_stat_manager","report_account_analytic.planning.stat manager","model_report_account_analytic_planning_stat","project.group_project_manager",1,1,1,1
 "access_report_account_analytic_planning_stat","report_account_analytic.planning.stat","model_report_account_analytic_planning_stat","project.group_project_user",1,0,0,0
-"access_account_analytic_account_project_manager","account.analytic.account project manager","account.model_account_analytic_account","project.group_project_manager",1,1,1,1
+"access_account_analytic_account_project_manager","account.analytic.account project manager","analytic.model_account_analytic_account","project.group_project_manager",1,1,1,1
 "access_report_account_analytic_planning_user","report_account_analytic.planning.user","model_report_account_analytic_planning_user","project.group_project_manager",1,1,1,1
 "access_report_account_analytic_planning_account","report_account_analytic.planning.account","model_report_account_analytic_planning_account","project.group_project_manager",1,1,1,1

From 48a33faa5ec791a2e97e3c4f6985536aa94a6c94 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Thu, 11 Feb 2010 13:55:01 +0530
Subject: [PATCH 20/28] [IMP]: crm(meeting): Meeting views improvement

bzr revid: rpa@openerp.co.in-20100211082501-15fu84s06t29btzk
---
 addons/crm/crm_meeting_menu.xml        |  1 +
 addons/crm/crm_meeting_view.xml        | 21 +++++++++++++--------
 addons/crm/crm_phonecall_menu.xml      |  1 +
 addons/crm_caldav/crm_meeting.py       |  1 -
 addons/crm_caldav/crm_meeting_view.xml | 19 ++++++++++++++++---
 5 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index a52f3b5b297..64356d382ae 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -9,6 +9,7 @@
         src_model="res.partner"
         view_mode="calendar,tree,form,gantt"
         context="{'default_partner_id': active_id, 'default_duration': 4.0}"
+        domain="[('partner_id', '=', active_id)]"
     />
 
 
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 5adcf8856e6..5591297d9be 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -32,11 +32,22 @@
             		<field name="date" string="Start Date" required="1" />
             		<field name="duration" widget="float_time" />
             		<field name="date_deadline" string="End Date" required="1" />
-            		
-            		
             	</group>
             	<notebook colspan="4">
             		<page string="Meeting">
+            		<separator colspan="4" string="Communication"/>
+                        <field name="partner_id" string="Partner"
+                        	on_change="onchange_partner_id(partner_id)" />
+                        <field name="partner_address_id"
+                        	string="Contact"
+                        	on_change="onchange_partner_address_id(partner_address_id, email_from)" />
+                        <field name="email_from"/>
+            		<separator colspan="4" string="Status and Categarization"/>
+                        <group colspan="4" col="6">
+                            <field name="priority"/>
+							 <field name="user_id" />
+	                        <field name="section_id" widget="selection" />            	
+	                    </group>
             			<separator string="Description" colspan="4" />
             			<field name="description" nolabel="1" colspan="4" />
                         <separator colspan="4"/>
@@ -50,12 +61,6 @@
                             <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"  icon="gtk-convert"/>
                         </group>
             		</page>            		
-            		<page string="Other Information">
-            			<field name="priority"/>
-            			<field name="user_id" on_change="onchange_user_id(user_id)"/>
-                        <field name="section_id" widget="selection"
-            			/>            			
-            		</page>
             	</notebook>
     
                             	
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index 4bb8f0aaabb..e3d001583f0 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -9,6 +9,7 @@
         src_model="res.partner"
         view_mode="calendar,tree,form"
         context="{'default_partner_id': active_id, 'default_duration': 1.0}"
+        domain="[('partner_id', '=', active_id)]"
         />
 
 
diff --git a/addons/crm_caldav/crm_meeting.py b/addons/crm_caldav/crm_meeting.py
index be7ba346c26..137d19e141a 100644
--- a/addons/crm_caldav/crm_meeting.py
+++ b/addons/crm_caldav/crm_meeting.py
@@ -37,7 +37,6 @@ independently or section-wise.'),
         'phonecall_id':fields.many2one ('crm.phonecall', 'Phonecall'),        
         'opportunity_id':fields.many2one ('crm.opportunity', 'Opportunity'),       
         'attendee_ids': fields.many2many('calendar.attendee', 'event_attendee_rel', 'event_id', 'attendee_id', 'Attendees'),
-        
     }
 
 crm_meeting()
diff --git a/addons/crm_caldav/crm_meeting_view.xml b/addons/crm_caldav/crm_meeting_view.xml
index 16e1423456a..4405084fc71 100644
--- a/addons/crm_caldav/crm_meeting_view.xml
+++ b/addons/crm_caldav/crm_meeting_view.xml
@@ -77,10 +77,10 @@
                 <field name="type">form</field>
                 <field name="inherit_id" ref="crm.crm_case_form_view_meet"/>                
                 <field name="arch" type="xml">
-                    <xpath expr="/form/notebook/page[@string='Other Information']/field[@name='section_id']" position="after">
+                    <xpath expr="/form/notebook/page/group/field[@name='section_id']" position="after">
                         <newline/>
-                        <field name="show_as"/>            			
-            			<field name="class"/>
+                        <field name="show_as" string="Show time as"/>            			
+            			<field name="class" string="Privacy"/>
                         <field name="vtimezone"/>
             			<field name="recurrent_id" invisible="1" />
             			<field name="recurrent_uid" invisible="1" />
@@ -88,5 +88,18 @@
                     </xpath>
                 </field>
         </record>
+        
+        <record id="meeting_form_view_inherit4" model="ir.ui.view">
+                <field name="name">CRM - Meetings Form Inherit4</field>
+                <field name="model">crm.meeting</field>
+                <field name="type">form</field>
+                <field name="inherit_id" ref="crm.crm_case_form_view_meet"/>                
+                <field name="arch" type="xml">
+                    <xpath expr="/form/notebook/page/group/field[@name='user_id']" position="replace">
+                        <field name="user_id" on_change="onchange_user_id(user_id)"/>
+                    </xpath>
+                </field>
+        </record>
+        
 	</data>
 </openerp>

From d2a634c9ad7d24c5502cbbd861444f67cc2c1145 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Thu, 11 Feb 2010 14:27:45 +0530
Subject: [PATCH 21/28] [FIX] caldav: return None value is created problem in
 rpc respone. so return False value

bzr revid: hmo@tinyerp.com-20100211085745-24sjqdmhw47g3334
---
 addons/caldav/caldav.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/caldav/caldav.py b/addons/caldav/caldav.py
index b3a5229f27e..dc21e1b345b 100644
--- a/addons/caldav/caldav.py
+++ b/addons/caldav/caldav.py
@@ -755,8 +755,8 @@ rule or repeating pattern for anexception to a recurrence set"),
     
     def onchange_user_id(self, cr, uid, ids, user_id, *args, **argv):
         if not user_id:
-            return {'value': {'vtimezone': None}}
-        value = {'vtimezone': None}
+            return {'value': {'vtimezone': False}}
+        value = {'vtimezone': False}
         cr.execute('select context_tz from res_users where id=%s' % (user_id))
         timezone = cr.fetchone()[0]
         if timezone:

From 197f0b0135df1c63354eb0ed958c563744e18e6c Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Thu, 11 Feb 2010 14:44:55 +0530
Subject: [PATCH 22/28] [IMP]: base_calendar, crm_caldav: Minor improvements

bzr revid: rpa@openerp.co.in-20100211091455-4jcbscgn3zbmf73c
---
 addons/base_calendar/wizard/wizard_cal_edit_event.py | 2 +-
 addons/crm_caldav/crm_meeting_view.xml               | 2 +-
 addons/crm_caldav/crm_meeting_wizard.xml             | 4 ----
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/addons/base_calendar/wizard/wizard_cal_edit_event.py b/addons/base_calendar/wizard/wizard_cal_edit_event.py
index c7f4e44dbd1..c3ad48c72cc 100644
--- a/addons/base_calendar/wizard/wizard_cal_edit_event.py
+++ b/addons/base_calendar/wizard/wizard_cal_edit_event.py
@@ -24,7 +24,7 @@ import pooler
 
 class event_edit_this(wizard.interface):
     event_form = """<?xml version="1.0"?>
-                <form string="Edit Event">
+                <form string="Edit this Occurence">
                     <separator string="" colspan="4" />
                     <newline />
                     <field name='name' colspan="4" />
diff --git a/addons/crm_caldav/crm_meeting_view.xml b/addons/crm_caldav/crm_meeting_view.xml
index 4405084fc71..edd0e3c3572 100644
--- a/addons/crm_caldav/crm_meeting_view.xml
+++ b/addons/crm_caldav/crm_meeting_view.xml
@@ -16,7 +16,7 @@
                                 <button string="Custom"
                 					name="%(caldav.action_calendar_custom_rrule_wizard)d"
                 					icon="gtk-save-as" type="action" context="{'model' : 'crm.meeting'}"
-                                    attrs="{'readonly': [('rrule_type','!=','custom')]}"
+                                    attrs="{'invisible': [('rrule_type','!=','custom')]}"
                                     />
                                 <button string="Edit" help="Edit only this Occurrency Meeting" attrs="{'invisible':[('rrule_type','in', ('none', False))]}"
                     			name="%(base_calendar.wizard_edit_this_event)d" icon="gtk-save"
diff --git a/addons/crm_caldav/crm_meeting_wizard.xml b/addons/crm_caldav/crm_meeting_wizard.xml
index e53d3117ebb..a0f517766f5 100644
--- a/addons/crm_caldav/crm_meeting_wizard.xml
+++ b/addons/crm_caldav/crm_meeting_wizard.xml
@@ -4,10 +4,6 @@
 		<wizard string="Import .ics File" model="crm.meeting"
 			name="calendar.event.import" id="base_calendar.wizard_cal_event_import" />
 
-		<wizard string="Subscribe"
-			model="crm.meeting" name="calendar.event.subscribe"
-			id="base_calendar.wizard_cal_event_subscribe" />
-
 		<wizard string="Export .ics File" model="crm.meeting"
 			name="calendar.event.export" id="base_calendar.wizard_cal_event_export" />
 

From 459fb2a5c128a78200ffd6c99e0a155ab425fc97 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Thu, 11 Feb 2010 15:23:30 +0530
Subject: [PATCH 23/28] [IMP] caldav: Improve view

bzr revid: hmo@tinyerp.com-20100211095330-8o8xhdl5i9pcf7le
---
 addons/caldav/caldav.py                | 14 +++++------
 addons/caldav/caldav_view.xml          | 15 ++++++------
 addons/crm/crm_meeting_view.xml        |  9 ++++----
 addons/crm_caldav/crm_meeting.py       | 32 ++++++++++++++++++++++----
 addons/crm_caldav/crm_meeting_view.xml | 25 ++++++++++++++++++++
 5 files changed, 72 insertions(+), 23 deletions(-)

diff --git a/addons/caldav/caldav.py b/addons/caldav/caldav.py
index dc21e1b345b..f2cd5f90163 100644
--- a/addons/caldav/caldav.py
+++ b/addons/caldav/caldav.py
@@ -314,7 +314,7 @@ class calendar_attendee(osv.osv):
                     obj = model_obj.read(cr, uid, res_id, ['date'])[0]
                     result[id][name] = obj.get('date')
                 else:
-                    result[id][name] = None
+                    result[id][name] = False
             if name == 'event_end_date':
                 if attdata.ref:
                     model, res_id = tuple(attdata.ref.split(','))
@@ -322,7 +322,7 @@ class calendar_attendee(osv.osv):
                     obj = model_obj.read(cr, uid, res_id, ['date_deadline'])[0]
                     result[id][name] = obj.get('date_deadline')
                 else:
-                    result[id][name] = None
+                    result[id][name] = False
             if name == 'sent_by_uid':
                 if attdata.ref:
                     model, res_id = tuple(attdata.ref.split(','))
@@ -353,8 +353,8 @@ class calendar_attendee(osv.osv):
     _columns = {
         'cutype': fields.selection([('individual', 'Individual'), \
                     ('group', 'Group'), ('resource', 'Resource'), \
-                    ('room', 'Room'), ('unknown', 'Unknown') ], \
-                    'User Type', help="Specify the type of calendar user"), 
+                    ('room', 'Room'), ('unknown', '') ], \
+                    'Invite Type', help="Specify the type of Invitation"), 
         'member': fields.char('Member', size=124, 
                     help="Indicate the groups that the attendee belongs to"), 
         'role': fields.selection([('req-participant', 'Participation required'), \
@@ -438,7 +438,7 @@ request was delegated to"),
                                 att2.email) +  ' - Status: ' + att2.state.title())
             body_vals = {'name': res_obj.name, 
                         'start_date': res_obj.date, 
-                        'end_date': res_obj.date_deadline or None, 
+                        'end_date': res_obj.date_deadline or False, 
                         'description': res_obj.description or '-', 
                         'location': res_obj.location or '-', 
                         'attendees': '<br>'.join(att_infos), 
@@ -737,7 +737,7 @@ defines the list of date/time exceptions for arecurring calendar component."),
         'exrule': fields.char('Exception Rule', size=352, help="defines a \
 rule or repeating pattern for anexception to a recurrence set"), 
         'rrule': fields.char('Recurrent Rule', size=124), 
-        'rrule_type': fields.selection([('none', 'None'), ('daily', 'Daily'), \
+        'rrule_type': fields.selection([('none', ''), ('daily', 'Daily'), \
                             ('weekly', 'Weekly'), ('monthly', 'Monthly'), \
                             ('yearly', 'Yearly'), ('custom', 'Custom')], 'Recurrency'), 
         'alarm_id': fields.many2one('res.alarm', 'Alarm'), 
@@ -745,7 +745,7 @@ rule or repeating pattern for anexception to a recurrence set"),
         'recurrent_uid': fields.integer('Recurrent ID'), 
         'recurrent_id': fields.datetime('Recurrent ID date'), 
         'vtimezone': fields.selection(_tz_get, 'Timezone', size=64), 
-        'user_id': fields.many2one('res.users', 'Responsible'), 
+        'user_id': fields.many2one('res.users', 'Responsible'),        
     }
     
     _defaults = {
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index 32038d3e3ee..2956b00d585 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -62,7 +62,7 @@
             <field name="model">calendar.attendee</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            	<form string="Atendee details">
+            	<form string="Invitation details">
             		<field name="user_id"
             			on_change="onchange_user_id(user_id)" readonly="1" />
             		<field name="email" select="1" readonly="1" />
@@ -70,11 +70,11 @@
                     <field name="partner_address_id" select="1" readonly="1" />
             		<newline />
             		<field name="role" select="1" readonly="1" string="Role" />
-            		<field name="cutype" select="1" readonly="1"  string="Invitation type" />
+            		<field name="cutype" select="1" readonly="1"  string="Invite type" />
             		<newline />
             		<field name="rsvp" readonly="1" />
             		<notebook colspan="4">
-            			<page string="Details">
+            			<page string="Events">
             				<field name="event_date" />
                             <field name="event_end_date" />
             				<newline />
@@ -117,10 +117,11 @@
             <field name="model">calendar.attendee</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-            	<tree string="Atendee details" editable="top">
-            		<field name="email" select="1" />
-            		<field name="role" select="1" />
-            		<field name="cutype" select="1" />
+            	<tree string="Invitation details" editable="top">
+            		<field name="email" />
+                    <field name="partner_id" string="Partner" />
+                    <field name="partner_address_id" string="Contact" />
+            		<field name="role" />            		
             		<field name="state" />
             	</tree>
             </field>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 5591297d9be..fb1e42fe167 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -28,7 +28,7 @@
             	<group col="6" colspan="4">
                     <field name="name" select="1" string="Summary"
             			colspan="4" />   
-                    <field name="categ_id"/>                 
+                    <field name="categ_id" widget="selection" string="Meeting Type" domain="[('object_id.model', '=', 'crm.meeting')]"/>                 
             		<field name="date" string="Start Date" required="1" />
             		<field name="duration" widget="float_time" />
             		<field name="date_deadline" string="End Date" required="1" />
@@ -75,11 +75,12 @@
         <field name="arch" type="xml">
             <tree string="Meetings"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
                 <field name="id" widget="char"/>
-                <field name="name" string="Title"/>
-                <field name="date" string="Meeting Date"/>
+                <field name="name" string="Subject"/>
+                <field name="partner_id" string="Partner"/>               
                 <field name="section_id" />
-                <field name="priority"/>
+                <field name="date" string="Meeting Date"/>                
                 <field name="categ_id"/>
+                <field name="priority"/>
                 <field name="user_id"/>
                 <field name="state"/>                
             </tree>
diff --git a/addons/crm_caldav/crm_meeting.py b/addons/crm_caldav/crm_meeting.py
index 137d19e141a..b7ec46fb4f6 100644
--- a/addons/crm_caldav/crm_meeting.py
+++ b/addons/crm_caldav/crm_meeting.py
@@ -29,11 +29,9 @@ class crm_meeting(osv.osv):
 
     _columns = { 
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 
-        'categ_id': fields.many2one('crm.case.categ', 'Category', \
-                            domain="[('section_id','=',section_id),\
-                            ('object_id.model', '=', 'crm.meeting')]", \
-            help='Category related to the section.Subdivide the CRM cases \
-independently or section-wise.'),            
+        'categ_id': fields.many2one('crm.case.categ', 'Meeting Type', \
+                            domain="[('object_id.model', '=', 'crm.meeting')]", \
+            ),            
         'phonecall_id':fields.many2one ('crm.phonecall', 'Phonecall'),        
         'opportunity_id':fields.many2one ('crm.opportunity', 'Opportunity'),       
         'attendee_ids': fields.many2many('calendar.attendee', 'event_attendee_rel', 'event_id', 'attendee_id', 'Attendees'),
@@ -41,4 +39,28 @@ independently or section-wise.'),
 
 crm_meeting()
 
+class calendar_attendee(osv.osv):
+    _inherit = 'calendar.attendee'
+
+    def _compute_data(self, cr, uid, ids, name, arg, context):        
+        name = name[0]
+        result = super(calendar_attendee, self)._compute_data(cr, uid, ids, name, arg, context)
+
+        for attdata in self.browse(cr, uid, ids, context=context):
+            id = attdata.id
+            result[id] = {}
+            if name == 'categ_id':
+                if attdata.ref:
+                    model, res_id = tuple(attdata.ref.split(','))
+                    model_obj = self.pool.get(model)
+                    obj = model_obj.read(cr, uid, res_id, ['categ_id'])[0]
+                    result[id][name] = obj.get('categ_id')
+                else:
+                    result[id][name] = False
+        return result
+    _columns = {
+        'categ_id': fields.function(_compute_data, method=True, string='Event Type', type="many2one", relation="crm.case.categ", multi='categ_id'), 
+    }
+calendar_attendee()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_caldav/crm_meeting_view.xml b/addons/crm_caldav/crm_meeting_view.xml
index edd0e3c3572..56eccd606cd 100644
--- a/addons/crm_caldav/crm_meeting_view.xml
+++ b/addons/crm_caldav/crm_meeting_view.xml
@@ -100,6 +100,31 @@
                     </xpath>
                 </field>
         </record>
+
+
+        <record id="attendee_form_view_inherit" model="ir.ui.view">
+                <field name="name">calendar.attendee.form.inherit</field>
+                <field name="model">calendar.attendee</field>
+                <field name="type">form</field>
+                <field name="inherit_id" ref="caldav.caldav_attendee_form_view"/>                
+                <field name="arch" type="xml">
+                    <field name="language" position="after">
+                        <field name="categ_id" string="Event Type"/>
+                    </field>
+                </field>
+        </record>
+
+        <record id="attendee_tree_view_inherit" model="ir.ui.view">
+                <field name="name">calendar.attendee.tree.inherit</field>
+                <field name="model">calendar.attendee</field>
+                <field name="type">tree</field>
+                <field name="inherit_id" ref="caldav.caldav_attendee_tree_view"/>                
+                <field name="arch" type="xml">
+                    <field name="role" position="after">
+                        <field name="categ_id" string="Event Type"/>
+                    </field>
+                </field>
+        </record>
         
 	</data>
 </openerp>

From f06610bef31801274bc521ddd4815e2673415b71 Mon Sep 17 00:00:00 2001
From: "UCO (OpenERP)" <>
Date: Thu, 11 Feb 2010 15:37:09 +0530
Subject: [PATCH 24/28] [IMP] base_report_designer: Add the option of save the
 rml

bzr revid: sbh@tinyerp.com-20100211100709-gtc9r2dvcuvnhl9g
---
 .../wizard/base_report_designer_modify.py     | 50 +++++++++++++++++--
 1 file changed, 46 insertions(+), 4 deletions(-)

diff --git a/addons/base_report_designer/wizard/base_report_designer_modify.py b/addons/base_report_designer/wizard/base_report_designer_modify.py
index 4fe9a42f5b7..273608c03d9 100644
--- a/addons/base_report_designer/wizard/base_report_designer_modify.py
+++ b/addons/base_report_designer/wizard/base_report_designer_modify.py
@@ -134,6 +134,25 @@ send_form_fields = {
     }
 }
 
+rml_form_arch = '''<?xml version="1.0"?>
+<form string="Save As" colspan="4">
+    <field name="file_rml"/>
+</form>
+'''
+
+rml_form_fields = {
+       'file_rml': {
+        'string': 'Save As',
+        'type': 'binary',
+    } 
+}
+
+save_rml_arch = '''<?xml version="1.0"?>
+<form string="File saved">
+    <separator string="File saved" colspan="4"/>
+    <label string="Your .rml file is saved and report has been modified."/>
+</form>'''
+
 def _get_default(obj, cursor, user, data, context):
     return {}
 
@@ -148,11 +167,12 @@ class base_report_designer_modify(wizard.interface):
         pool = pooler.get_pool(cr.dbname)
         sxwval = StringIO.StringIO(base64.decodestring(data['form']['file_sxw']))
         fp = tools.file_open('normalized_oo2rml.xsl',subdir='addons/base_report_designer/wizard/tiny_sxw2rml')
+        newrmlcontent = str(tiny_sxw2rml.sxw2rml(sxwval, xsl=fp.read()))
         report = pool.get('ir.actions.report.xml').write(cr, uid, [data['form']['report_id']], {
             'report_sxw_content': base64.decodestring(data['form']['file_sxw']),
-            'report_rml_content': str(tiny_sxw2rml.sxw2rml(sxwval, xsl=fp.read()))
+            'report_rml_content': newrmlcontent
         })
-        return {}
+        return {'file_rml': base64.encodestring(newrmlcontent)}
 
     def _get_report(self, cr, uid, data, context):
         pool = pooler.get_pool(cr.dbname)
@@ -207,12 +227,24 @@ class base_report_designer_modify(wizard.interface):
                 'fields': send_form_fields,
                 'state': [
                     ('end','Close'),
-                    ('send_form_result', 'Update the report'),
+                    ('save_rml_to', 'Update the report'),
                 ]
             }
         },
-        'send_form_result': {
+        'save_rml_to': {
             'actions': [_upload_report],
+            'result': {
+                    'type': 'form',
+                    'arch': rml_form_arch,
+                    'fields': rml_form_fields,
+                    'state': [
+                            ('save_rml', 'Save rml'),
+                            ('send_form_result','Skip'),
+                        ]
+            }
+        },
+        'send_form_result': {
+            'actions': [],
             'result': {
                 'type': 'form',
                 'arch': send_form_result_arch,
@@ -222,6 +254,16 @@ class base_report_designer_modify(wizard.interface):
                 ]
             }
         },
+        'save_rml': {
+            'actions': [],
+            'result': {
+                'type': 'form',
+                'arch': save_rml_arch, 'fields': {},
+                'state': [
+                    ('end','Close'),
+                ]
+            }
+        },
     }
 
 base_report_designer_modify('base_report_designer.modify')

From 4181af70254532c79c3c1c7781ff460bab6edd81 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Thu, 11 Feb 2010 15:57:00 +0530
Subject: [PATCH 25/28] [IMP] caldav: improve view

bzr revid: hmo@tinyerp.com-20100211102700-tal1q4nhufvslmpw
---
 addons/caldav/caldav.py       |  2 +-
 addons/caldav/caldav_view.xml | 43 ++++++++++++++++++-----------------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/addons/caldav/caldav.py b/addons/caldav/caldav.py
index f2cd5f90163..dc1e24c3c29 100644
--- a/addons/caldav/caldav.py
+++ b/addons/caldav/caldav.py
@@ -386,7 +386,7 @@ request was delegated to"),
         'user_id': fields.many2one('res.users', 'User'), 
         'partner_address_id': fields.many2one('res.partner.address', 'Contact'), 
         'partner_id': fields.related('partner_address_id', 'partner_id', type='many2one', relation='res.partner', string='Partner'), 
-        'email': fields.char('Email', size=124, required=True), 
+        'email': fields.char('Email', size=124, required=True, help="Email of Invited Person"), 
         'event_date': fields.function(_compute_data, method=True, string='Event Date', type="datetime", multi='event_date'), 
         'event_end_date': fields.function(_compute_data, method=True, string='Event End Date', type="datetime", multi='event_end_date'), 
         'ref': fields.reference('Document Ref', selection=_links_get, size=128), 
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index 2956b00d585..98648604b74 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -63,26 +63,27 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             	<form string="Invitation details">
-            		<field name="user_id"
-            			on_change="onchange_user_id(user_id)" readonly="1" />
-            		<field name="email" select="1" readonly="1" />
-                    <field name="partner_id" select="1" readonly="1" />
-                    <field name="partner_address_id" select="1" readonly="1" />
-            		<newline />
-            		<field name="role" select="1" readonly="1" string="Role" />
-            		<field name="cutype" select="1" readonly="1"  string="Invite type" />
-            		<newline />
-            		<field name="rsvp" readonly="1" />
+            		<field name="email" string="Invitation To"/> 
+                    <field name="sent_by_uid" string="Invitation From"/>
             		<notebook colspan="4">
-            			<page string="Events">
-            				<field name="event_date" />
-                            <field name="event_end_date" />
-            				<newline />
-            				<field name="sent_by_uid" readonly="1"/>
-            				<field name="dir" widget='url' readonly="1"/>
-            				<field name="language" readonly="1"/>
-            				<newline />
-            				<field name="ref" colspan="4" readonly="1"/>
+            			<page string="Invitation">
+                            <separator string="Invitation Detail" colspan="4" />
+                            <group colspan="4" col="4">
+                                <field name="user_id" string="Invited User"/>
+                                <newline/>
+                                <field name="partner_id" string="Partner"/>
+                                <field name="partner_address_id" string="Contact"/>
+                                <field name="role" string="Role" />
+                                <field name="cutype" string="Invitation type" />
+                                <field name="rsvp" /> 
+                            </group>
+                            <separator string="Event Detail" colspan="4" />
+                            <group colspan="4" col="4">
+                                <field name="event_date" />
+                                <field name="event_end_date" />
+                                <field name="language"/>
+                                <field name="ref" colspan="4"/>
+                            </group>
             			</page>
             			<page string="Delegation Info">
             				<separator string="Delegated From" colspan="4" />
@@ -117,8 +118,8 @@
             <field name="model">calendar.attendee</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-            	<tree string="Invitation details" editable="top">
-            		<field name="email" />
+            	<tree string="Invitation details">
+            		<field name="email" string="Invitation To"/>
                     <field name="partner_id" string="Partner" />
                     <field name="partner_address_id" string="Contact" />
             		<field name="role" />            		

From d26d83ecc73ea51a99a4ab64f837896caca7bd07 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Thu, 11 Feb 2010 15:58:17 +0530
Subject: [PATCH 26/28] [IMP] caldav: improve string

bzr revid: hmo@tinyerp.com-20100211102817-k0d4lajgdmu09vyq
---
 addons/caldav/caldav.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/caldav/caldav.py b/addons/caldav/caldav.py
index dc1e24c3c29..0efd4665f0d 100644
--- a/addons/caldav/caldav.py
+++ b/addons/caldav/caldav.py
@@ -389,7 +389,7 @@ request was delegated to"),
         'email': fields.char('Email', size=124, required=True, help="Email of Invited Person"), 
         'event_date': fields.function(_compute_data, method=True, string='Event Date', type="datetime", multi='event_date'), 
         'event_end_date': fields.function(_compute_data, method=True, string='Event End Date', type="datetime", multi='event_end_date'), 
-        'ref': fields.reference('Document Ref', selection=_links_get, size=128), 
+        'ref': fields.reference('Event Ref', selection=_links_get, size=128), 
         'availability': fields.selection([('free', 'Free'), ('busy', 'Busy')], 'Free/Busy', readonly="True"), 
      }
     _defaults = {

From d4553ff9c619287cefb7cf02278fbb4f7fd64996 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Thu, 11 Feb 2010 18:07:41 +0530
Subject: [PATCH 27/28] [REF]: base_calendar, caldav: Interchange of module
 names and files

bzr revid: rpa@openerp.co.in-20100211123741-b2gwowgfrfom93mz
---
 addons/base_calendar/__init__.py              |    4 +-
 addons/base_calendar/__terp__.py              |   18 +-
 addons/base_calendar/base_calendar.py         | 1943 ++++++++++-------
 addons/base_calendar/base_calendar_view.xml   |  295 ++-
 .../DAV/BufferingHTTPServer.py                |    0
 .../DAV/WebDAVServer.py                       |    0
 .../{base_calendar => caldav}/DAV/__init__.py |    0
 .../DAV/constants.py                          |    0
 .../{base_calendar => caldav}/DAV/davcmd.py   |    0
 .../{base_calendar => caldav}/DAV/davcopy.py  |    0
 .../{base_calendar => caldav}/DAV/davmove.py  |    0
 .../{base_calendar => caldav}/DAV/delete.py   |    0
 .../{base_calendar => caldav}/DAV/errors.py   |    0
 addons/{base_calendar => caldav}/DAV/iface.py |    0
 .../{base_calendar => caldav}/DAV/propfind.py |    0
 .../{base_calendar => caldav}/DAV/status.py   |    0
 addons/{base_calendar => caldav}/DAV/utils.py |    0
 addons/caldav/__init__.py                     |    5 +
 addons/caldav/__terp__.py                     |   20 +-
 addons/caldav/caldav.py                       | 1284 -----------
 .../cache.py => caldav/caldav_cache.py}       |    0
 addons/caldav/caldav_data.xml                 |  133 --
 .../dav_fs.py => caldav/caldav_fs.py}         |    2 +-
 .../caldav_node.py}                           |    0
 addons/caldav/caldav_view.xml                 |  250 ---
 .../caldav_wizard.xml}                        |    0
 addons/caldav/security/ir.model.access.csv    |    5 -
 .../webdav_server.py                          |    2 +-
 .../wizard/__init__.py                        |    0
 .../wizard/wizard_cal_edit_event.py           |    0
 .../wizard/wizard_cal_export.py               |    0
 .../wizard/wizard_cal_import.py               |    0
 .../wizard/wizard_cal_subscribe.py            |    0
 33 files changed, 1479 insertions(+), 2482 deletions(-)
 rename addons/{base_calendar => caldav}/DAV/BufferingHTTPServer.py (100%)
 rename addons/{base_calendar => caldav}/DAV/WebDAVServer.py (100%)
 rename addons/{base_calendar => caldav}/DAV/__init__.py (100%)
 rename addons/{base_calendar => caldav}/DAV/constants.py (100%)
 rename addons/{base_calendar => caldav}/DAV/davcmd.py (100%)
 rename addons/{base_calendar => caldav}/DAV/davcopy.py (100%)
 rename addons/{base_calendar => caldav}/DAV/davmove.py (100%)
 rename addons/{base_calendar => caldav}/DAV/delete.py (100%)
 rename addons/{base_calendar => caldav}/DAV/errors.py (100%)
 rename addons/{base_calendar => caldav}/DAV/iface.py (100%)
 rename addons/{base_calendar => caldav}/DAV/propfind.py (100%)
 rename addons/{base_calendar => caldav}/DAV/status.py (100%)
 rename addons/{base_calendar => caldav}/DAV/utils.py (100%)
 delete mode 100644 addons/caldav/caldav.py
 rename addons/{base_calendar/cache.py => caldav/caldav_cache.py} (100%)
 delete mode 100644 addons/caldav/caldav_data.xml
 rename addons/{base_calendar/dav_fs.py => caldav/caldav_fs.py} (99%)
 rename addons/{base_calendar/base_calendar_node.py => caldav/caldav_node.py} (100%)
 delete mode 100644 addons/caldav/caldav_view.xml
 rename addons/{base_calendar/base_calendar_wizard.xml => caldav/caldav_wizard.xml} (100%)
 delete mode 100644 addons/caldav/security/ir.model.access.csv
 rename addons/{base_calendar => caldav}/webdav_server.py (98%)
 rename addons/{base_calendar => caldav}/wizard/__init__.py (100%)
 rename addons/{base_calendar => caldav}/wizard/wizard_cal_edit_event.py (100%)
 rename addons/{base_calendar => caldav}/wizard/wizard_cal_export.py (100%)
 rename addons/{base_calendar => caldav}/wizard/wizard_cal_import.py (100%)
 rename addons/{base_calendar => caldav}/wizard/wizard_cal_subscribe.py (100%)

diff --git a/addons/base_calendar/__init__.py b/addons/base_calendar/__init__.py
index 017a1748449..f2664029c43 100644
--- a/addons/base_calendar/__init__.py
+++ b/addons/base_calendar/__init__.py
@@ -20,7 +20,5 @@
 ##############################################################################
 
 import base_calendar
-import wizard
-import base_calendar_node
-import webdav_server
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_calendar/__terp__.py b/addons/base_calendar/__terp__.py
index 51097c2b13c..f5876a02df7 100644
--- a/addons/base_calendar/__terp__.py
+++ b/addons/base_calendar/__terp__.py
@@ -24,25 +24,23 @@
     "name" : "Basic Calendar Functionality", 
     "version" : "1.0", 
     "depends" : [
-                    "base", 
+                    "caldav", 
                 ], 
      'description': """
- Contains basic functionality for caldav system like:
-  - Maintenance of basic objects needed for caldav calendar
-      * Event(Meeting)
-      * Todo(Task)
-      * Reminder
-      * Attendee
-  - Availabilities of synchronisation using WebDAV
+ Full featured calendar system that support:
+  - Alerts (create requests)
+  - Recurring events (*)
+  - Invitations to others people
 """, 
     "author" : "Tiny", 
     'category': 'Generic Modules/Others', 
     'website': 'http://www.openerp.com', 
-    "init_xml" : ["base_calendar_data.xml"], 
+    "init_xml" : [
+                   'base_calendar_data.xml'
+                   ], 
     "demo_xml" : [], 
     "update_xml" : [
                     'security/ir.model.access.csv', 
-                    'base_calendar_wizard.xml', 
                     'base_calendar_view.xml'
                     ], 
     "installable" : True, 
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 689d2d08459..9909f435517 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -19,789 +19,1266 @@
 #
 ##############################################################################
 
+from caldav import caldav
+from datetime import datetime, timedelta
 from datetime import datetime, timedelta
 from dateutil import parser
-from dateutil.rrule import *
-from osv import osv, fields
+from osv import fields, osv
+from service import web_services
 from tools.translate import _
 import base64
-import math
 import pooler
 import pytz
 import re
-import tools
 import time
+import tools
+
+months = {
+        1:"January", 2:"February", 3:"March", 4:"April", \
+        5:"May", 6:"June", 7:"July", 8:"August", 9:"September", \
+        10:"October", 11:"November", 12:"December"}
+
+def base_calendar_id2real_id(base_calendar_id=None, with_date=False):
+    if base_calendar_id and isinstance(base_calendar_id, (str, unicode)):
+        res = base_calendar_id.split('-')
+        if len(res) >= 2:
+            real_id = res[0]
+            if with_date:
+                real_date = time.strftime("%Y-%m-%d %H:%M:%S", \
+                                 time.strptime(res[1], "%Y%m%d%H%M%S"))
+                start = datetime.strptime(real_date, "%Y-%m-%d %H:%M:%S")
+                end = start + timedelta(hours=with_date)
+                return (int(real_id), real_date, end.strftime("%Y-%m-%d %H:%M:%S"))
+            return int(real_id)
+    return base_calendar_id and int(base_calendar_id) or base_calendar_id
+
+def real_id2base_calendar_id(real_id, recurrent_date):
+    if real_id and recurrent_date:
+        recurrent_date = time.strftime("%Y%m%d%H%M%S", \
+                         time.strptime(recurrent_date, "%Y-%m-%d %H:%M:%S"))
+        return '%d-%s' % (real_id, recurrent_date)
+    return real_id
 
 
-try:
-    import vobject
-except ImportError:
-    raise osv.except_osv('vobject Import Error!','Please install python-vobject from http://vobject.skyhouseconsulting.com/')
- 
-# O-1  Optional and can come only once
-# O-n  Optional and can come more than once
-# R-1  Required and can come only once
-# R-n  Required and can come more than once
+def _links_get(self, cr, uid, context={}):
+    obj = self.pool.get('res.request.link')
+    ids = obj.search(cr, uid, [])
+    res = obj.read(cr, uid, ids, ['object', 'name'], context)
+    return [(r['object'], r['name']) for r in res]
 
-def uid2openobjectid(cr, uidval, oomodel, rdate):
-    __rege = re.compile(r'OpenObject-([\w|\.]+)_([0-9]+)@(\w+)$')
-    wematch = __rege.match(uidval.encode('utf8'))
-    if not wematch:
-        return (False, None)
-    else:
-        model, id, dbname = wematch.groups()
-        model_obj = pooler.get_pool(cr.dbname).get(model)
-        if (not model == oomodel) or (not dbname == cr.dbname):
-            return (False, None)
-        qry = 'select distinct(id) from %s' % model_obj._table
-        if rdate:
-            qry += " where recurrent_id='%s'" % (rdate)
-            cr.execute(qry)
-            r_id = cr.fetchone()
-            if r_id:
-                return (id, r_id[0])
-        cr.execute(qry)        
-        ids = map(lambda x: str(x[0]), cr.fetchall())
-        if id in ids:
-            return (id, None)
-        return (False, None)
+html_invitation = """
+<html>
+<head>
+<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+<title>%(name)s</title>
+</head>
+<body>
+<table border="0" cellspacing="10" cellpadding="0" width="100%%"
+    style="font-family: Arial, Sans-serif; font-size: 14">
+    <tr>
+        <td width="100%%">Hello,</td>
+    </tr>
+    <tr>
+        <td width="100%%">You are invited for <i>%(company)s</i> Event.</td>
+    </tr>
+    <tr>
+        <td width="100%%">Below are the details of event:</td>
+    </tr>
+</table>
 
-def openobjectid2uid(cr, uidval, oomodel):
-    value = 'OpenObject-%s_%s@%s' % (oomodel, uidval, cr.dbname)
-    return value
+<table cellspacing="0" cellpadding="5" border="0" summary=""
+    style="width: 90%%; font-family: Arial, Sans-serif; border: 1px Solid #ccc; background-color: #f6f6f6">
+    <tr valign="center" align="center">
+        <td bgcolor="DFDFDF">
+        <h3>%(name)s</h3>
+        </td>
+    </tr>
+    <tr>
+        <td>
+        <table cellpadding="8" cellspacing="0" border="0"
+            style="font-size: 14" summary="Eventdetails" bgcolor="f6f6f6"
+            width="90%%">
+            <tr>
+                <td width="21%%">
+                <div><b>Start Date</b></div>
+                </td>
+                <td><b>:</b></td>
+                <td>%(start_date)s</td>
+                <td width="15%%">
+                <div><b>End Date</b></div>
+                </td>
+                <td><b>:</b></td>
+                <td width="25%%">%(end_date)s</td>
+            </tr>
+            <tr valign="top">
+                <td><b>Description</b></td>
+                <td><b>:</b></td>
+                <td colspan="3">%(description)s</td>
+            </tr>
+            <tr valign="top">
+                <td>
+                <div><b>Location</b></div>
+                </td>
+                <td><b>:</b></td>
+                <td colspan="3">%(location)s</td>
+            </tr>
+            <tr valign="top">
+                <td>
+                <div><b>Event Attendees</b></div>
+                </td>
+                <td><b>:</b></td>
+                <td colspan="3">
+                <div>
+                <div>%(attendees)s</div>
+                </div>
+                </td>
+            </tr>
+            <tr valign="top">
+                <td><b>Are you coming?</b></td>
+                <td><b>:</b></td>
+                <td colspan="3">
+                <UL>
+                    <LI>YES</LI>
+                    <LI>NO</LI>
+                    <LI>MAYBE</LI>
+                </UL>
+                </td>
+            </tr>
+        </table>
+        </td>
+    </tr>
+</table>
+<table border="0" cellspacing="10" cellpadding="0" width="100%%"
+    style="font-family: Arial, Sans-serif; font-size: 14">
+    <tr>
+        <td width="100%%"><b>Note:</b> If you are interested please reply this
+        mail and keep only your response from options <i>YES, NO</i>
+        and <i>MAYBE</i>.</td>
+    </tr>
+    <tr>
+        <td width="100%%">From:</td>
+    </tr>
+    <tr>
+        <td width="100%%">%(user)s</td>
+    </tr>
+    <tr valign="top">
+        <td width="100%%">-<font color="a7a7a7">-------------------------</font></td>
+    </tr>
+    <tr>
+        <td width="100%%"> <font color="a7a7a7">%(sign)s</font></td>
+    </tr>
+</table>
+</body>
+</html>
+"""
 
-def get_attribute_mapping(cr, uid, calname, context={}):
-    if not context:
-        context = {}
-    pool = pooler.get_pool(cr.dbname)
-    field_obj = pool.get('basic.calendar.fields')
-    type_obj = pool.get('basic.calendar.lines')
-    domain = [('object_id.model', '=', context.get('model'))]
-    if context.get('calendar_id'):
-        domain.append(('calendar_id', '=', context.get('calendar_id')))
-    type_id = type_obj.search(cr, uid, domain)
-    fids = field_obj.search(cr, uid, [('type_id', '=', type_id[0])])
-    res = {}
-    for field in field_obj.browse(cr, uid, fids):
-        attr = field.name.name
-        res[attr] = {}
-        res[attr]['field'] = field.field_id.name
-        res[attr]['type'] = field.field_id.ttype
-        if field.fn == 'hours':
-            res[attr]['type'] = "timedelta"
-        if res[attr]['type'] in ('one2many', 'many2many', 'many2one'):
-            res[attr]['object'] = field.field_id.relation
-        elif res[attr]['type'] in ('selection') and field.mapping:
-            res[attr]['mapping'] = eval(field.mapping)
-    if not res.get('uid', None):
-        res['uid'] = {}
-        res['uid']['field'] = 'id'
-        res['uid']['type'] = "integer"
-    return res
+class invite_attendee_wizard(osv.osv_memory):
+    _name = "base_calendar.invite.attendee"
+    _description = "Invite Attendees"
 
-def map_data(cr, uid, obj):
-    vals = {}
-    for map_dict in obj.__attribute__:
-        map_val = obj.ical_get(map_dict, 'value')
-        field = obj.ical_get(map_dict, 'field')
-        field_type = obj.ical_get(map_dict, 'type')
-        if field:
-            if field_type == 'selection':
-                if not map_val:
-                    continue
-                mapping = obj.__attribute__[map_dict].get('mapping', False)
-                if mapping:
-                    map_val = mapping[map_val.lower()]
-                else:
-                    map_val = map_val.lower()
-            if field_type == 'many2many':
-                ids = []
-                if not map_val:
-                    vals[field] = ids
-                    continue
-                model = obj.__attribute__[map_dict].get('object', False)
-                modobj = obj.pool.get(model)
-                for map_vall in map_val:
-                    id = modobj.create(cr, uid, map_vall)
-                    ids.append(id)
-                vals[field] = [(6, 0, ids)]
-                continue
-            if field_type == 'many2one':
-                id = None
-                if not map_val or not isinstance(map_val, dict):
-                    vals[field] = id
-                    continue
-                model = obj.__attribute__[map_dict].get('object', False)
-                modobj = obj.pool.get(model)
-                id = modobj.create(cr, uid, map_val)
-                vals[field] = id
-                continue
-            if field_type == 'timedelta':
-                if map_val:
-                    vals[field] = (map_val.seconds/float(86400) + map_val.days)
-            if map_val:
-                vals[field] = map_val
-    return vals
+    _columns = {
+        'type': fields.selection([('internal', 'Internal User'), \
+              ('external', 'External Email'), \
+              ('partner', 'Partner Contacts')], 'Type', required=True), 
+        'user_ids': fields.many2many('res.users', 'invite_user_rel', 
+                                  'invite_id', 'user_id', 'Users'), 
+        'partner_id': fields.many2one('res.partner', 'Partner'), 
+        'email': fields.char('Email', size=124), 
+        'contact_ids': fields.many2many('res.partner.address', 'invite_contact_rel', 
+                                  'invite_id', 'contact_id', 'Contacts'), 
+        'send_mail': fields.boolean('Send mail?', help='Check this if you want\
+ to send an Email to Invited Person')
+              }
+
+    def do_invite(self, cr, uid, ids, context={}):
+        datas = self.read(cr, uid, ids)[0]
+        model = False
+        model_field = False
+        if not context or not context.get('model'):
+            return {}
+        else:
+            model = context.get('model')
+        model_field = context.get('attendee_field', False)
+        obj = self.pool.get(model)
+        res_obj = obj.browse(cr, uid, context['active_id'])
+        type = datas.get('type')
+        att_obj = self.pool.get('calendar.attendee')
+        vals = {}
+        mail_to = []
+        if not model == 'calendar.attendee':
+            vals = {'ref': '%s,%s' % (model, base_calendar_id2real_id(context['active_id']))}
+
+        if type == 'internal':
+            user_obj = self.pool.get('res.users')
+            for user_id in datas.get('user_ids', []):
+                user = user_obj.browse(cr, uid, user_id)
+                if not user.address_id.email:
+                    raise osv.except_osv(_('Error!'), \
+                                    ("User does not have an email Address"))
+                vals.update({'user_id': user_id, 
+                                     'email': user.address_id.email})
+                mail_to.append(user.address_id.email)
+                
+        elif  type == 'external' and datas.get('email'):
+            vals.update({'email': datas['email']})
+            mail_to.append(datas['email'])
+        elif  type == 'partner':
+            add_obj = self.pool.get('res.partner.address')
+            for contact in  add_obj.browse(cr, uid, datas['contact_ids']):
+                if not contact.email:
+                    raise osv.except_osv(_('Error!'), \
+                                    ("Partner does not have an email Address"))
+                vals.update({
+                             'partner_address_id': contact.id, 
+                             'email': contact.email})
+                mail_to.append(contact.email)
+
+        if model == 'calendar.attendee':
+            att = att_obj.browse(cr, uid, context['active_id'])
+            vals.update({
+                'parent_ids' : [(4, att.id)],
+                'ref': att.ref
+            })
+        att_id = att_obj.create(cr, uid, vals)
+        if model_field:
+            obj.write(cr, uid, res_obj.id, {model_field: [(4, att_id)]})
+        
+        if datas.get('send_mail'):
+            att_obj._send_mail(cr, uid, [att_id], mail_to, \
+                   email_from=tools.config.get('email_from', False))
+                
+        return {}
+
+
+    def onchange_partner_id(self, cr, uid, ids, partner_id, *args, **argv):
+        if not partner_id:
+            return {'value': {'contact_ids': []}}
+        cr.execute('select id from res_partner_address \
+                         where partner_id=%s' % (partner_id))
+        contacts = map(lambda x: x[0], cr.fetchall())
+        if not contacts:
+            raise osv.except_osv(_('Error!'), \
+                                ("Partner does not have any Contacts"))
+
+        return {'value': {'contact_ids': contacts}}
+
+invite_attendee_wizard()
+
+class calendar_attendee(osv.osv):
+    _name = 'calendar.attendee'
+    _description = 'Attendee information'
+    _rec_name = 'cutype'
 
-class CalDAV(object):
     __attribute__ = {}
 
-    def get_recurrent_dates(self, rrulestring, exdate, startdate=None):
-        if not startdate:
-            startdate = datetime.now()
-        rset1 = rrulestr(rrulestring, dtstart=startdate, forceset=True)
+    def _get_address(self, name=None, email=None):
+        if name and email:
+            name += ':'
+        return (name or '') + (email and ('MAILTO:' + email) or '')
 
-        for date in exdate:
-            datetime_obj = todate(date)
-            rset1._exdate.append(datetime_obj)
-        re_dates = map(lambda x:x.strftime('%Y-%m-%d %H:%M:%S'), rset1._iter())
-        return re_dates
+    def _compute_data(self, cr, uid, ids, name, arg, context):
+        name = name[0]
+        result = {}
 
-    def ical_set(self, name, value, type):
-        if name in self.__attribute__ and self.__attribute__[name]:
-            self.__attribute__[name][type] = value
+        for attdata in self.browse(cr, uid, ids, context=context):
+            id = attdata.id
+            result[id] = {}
+            if name == 'sent_by':
+                if not attdata.sent_by_uid:
+                    result[id][name] = ''
+                    continue
+                else:
+                    result[id][name] =  self._get_address(attdata.sent_by_uid.name, \
+                                        attdata.sent_by_uid.address_id.email)
+            if name == 'cn':
+                if attdata.user_id:
+                    result[id][name] = self._get_address(attdata.user_id.name, attdata.email)
+                elif attdata.partner_address_id:
+                    result[id][name] = self._get_address(attdata.partner_id.name, attdata.email)
+                else:
+                    result[id][name] = self._get_address(None, attdata.email)
+            if name == 'delegated_to':
+                todata = []
+                for parent in attdata.parent_ids:
+                    todata.append('MAILTO:' + parent.email)
+                result[id][name] = ', '.join(todata)
+            if name == 'delegated_from':
+                fromdata = []
+                for child in attdata.child_ids:
+                    fromdata.append('MAILTO:' + child.email)
+                result[id][name] = ', '.join(fromdata)
+            if name == 'event_date':
+                if attdata.ref:
+                    model, res_id = tuple(attdata.ref.split(','))
+                    model_obj = self.pool.get(model)
+                    obj = model_obj.read(cr, uid, res_id, ['date'])[0]
+                    result[id][name] = obj.get('date')
+                else:
+                    result[id][name] = False
+            if name == 'event_end_date':
+                if attdata.ref:
+                    model, res_id = tuple(attdata.ref.split(','))
+                    model_obj = self.pool.get(model)
+                    obj = model_obj.read(cr, uid, res_id, ['date_deadline'])[0]
+                    result[id][name] = obj.get('date_deadline')
+                else:
+                    result[id][name] = False
+            if name == 'sent_by_uid':
+                if attdata.ref:
+                    model, res_id = tuple(attdata.ref.split(','))
+                    model_obj = self.pool.get(model)
+                    obj = model_obj.read(cr, uid, res_id, ['user_id'])[0]
+                    result[id][name] = obj.get('user_id')
+                else:
+                    result[id][name] = uid
+            if name == 'language':
+                user_obj = self.pool.get('res.users')
+                lang = user_obj.read(cr, uid, uid, ['context_lang'])['context_lang']
+                result[id][name] = lang.replace('_', '-')
+        return result
+
+    def _links_get(self, cr, uid, context={}):
+        obj = self.pool.get('res.request.link')
+        ids = obj.search(cr, uid, [])
+        res = obj.read(cr, uid, ids, ['object', 'name'], context)
+        return [(r['object'], r['name']) for r in res]
+
+    def _lang_get(self, cr, uid, context={}):
+        obj = self.pool.get('res.lang')
+        ids = obj.search(cr, uid, [])
+        res = obj.read(cr, uid, ids, ['code', 'name'], context)
+        res = [((r['code']).replace('_', '-'), r['name']) for r in res]
+        return res
+
+    _columns = {
+        'cutype': fields.selection([('individual', 'Individual'), \
+                    ('group', 'Group'), ('resource', 'Resource'), \
+                    ('room', 'Room'), ('unknown', '') ], \
+                    'Invite Type', help="Specify the type of Invitation"), 
+        'member': fields.char('Member', size=124, 
+                    help="Indicate the groups that the attendee belongs to"), 
+        'role': fields.selection([('req-participant', 'Participation required'), \
+                    ('chair', 'Chair Person'), \
+                    ('opt-participant', 'Optional Participation'), \
+                    ('non-participant', 'For information Purpose')], 'Role', \
+                    help='Participation role for the calendar user'), 
+        'state': fields.selection([('tentative', 'Tentative'), 
+                        ('needs-action', 'Needs Action'), 
+                        ('accepted', 'Accepted'), 
+                        ('declined', 'Declined'), 
+                        ('delegated', 'Delegated')], 'State', readonly=True, 
+                        help="Status of the attendee's participation"), 
+        'rsvp':  fields.boolean('Required Reply?', 
+                    help="Indicats whether the favor of a reply is requested"), 
+        'delegated_to': fields.function(_compute_data, method=True, \
+                string='Delegated To', type="char", size=124, store=True, \
+                multi='delegated_to', help="The users that the original \
+request was delegated to"),         
+        'delegated_from': fields.function(_compute_data, method=True, string=\
+            'Delegated From', type="char", store=True, size=124, multi='delegated_from'),        
+        'parent_ids': fields.many2many('calendar.attendee', 'calendar_attendee_parent_rel', 'attendee_id', 'parent_id', 'Delegrated From'),
+        'child_ids': fields.many2many('calendar.attendee', 'calendar_attendee_child_rel', 'attendee_id', 'child_id', 'Delegrated To'),  
+        'sent_by': fields.function(_compute_data, method=True, string='Sent By', type="char", multi='sent_by', store=True, size=124, help="Specify the user that is acting on behalf of the calendar user"), 
+        'sent_by_uid': fields.function(_compute_data, method=True, string='Sent By User', type="many2one", relation="res.users", multi='sent_by_uid'), 
+        'cn': fields.function(_compute_data, method=True, string='Common name', type="char", size=124, multi='cn', store=True), 
+        'dir': fields.char('URI Reference', size=124, help="Reference to the URI that points to the directory information corresponding to the attendee."), 
+        'language':  fields.function(_compute_data, method=True, string='Language', type="selection", selection=_lang_get, multi='language', store=True, help="To specify the language for text values in a property or property parameter."), 
+        'user_id': fields.many2one('res.users', 'User'), 
+        'partner_address_id': fields.many2one('res.partner.address', 'Contact'), 
+        'partner_id': fields.related('partner_address_id', 'partner_id', type='many2one', relation='res.partner', string='Partner'), 
+        'email': fields.char('Email', size=124, required=True, help="Email of Invited Person"), 
+        'event_date': fields.function(_compute_data, method=True, string='Event Date', type="datetime", multi='event_date'), 
+        'event_end_date': fields.function(_compute_data, method=True, string='Event End Date', type="datetime", multi='event_end_date'), 
+        'ref': fields.reference('Event Ref', selection=_links_get, size=128), 
+        'availability': fields.selection([('free', 'Free'), ('busy', 'Busy')], 'Free/Busy', readonly="True"), 
+     }
+    _defaults = {
+        'state':  lambda *x: 'needs-action', 
+    }
+    
+    response_re = response_re = re.compile("Are you coming\?.*\n*.*(YES|NO|MAYBE).*", re.UNICODE)
+    
+    def msg_new(self, cr, uid, msg):        
+        return False
+        
+    def msg_act_get(self, msg):
+        mailgate_obj = self.pool.get('mail.gateway')
+        body = mailgate_obj.msg_body_get(msg)
+        actions = {}
+        res = self.response_re.findall(body['body'])
+        if res:
+                actions['state'] = res[0]
+        return actions
+
+    def msg_update(self, cr, uid, ids, msg, data={}, default_act='None'):
+        msg_actions = self.msg_act_get(msg)
+        if msg_actions.get('state'):
+            if msg_actions['state'] in ['YES', 'NO', 'MAYBE']:
+                mapping = {'YES': 'accepted', 'NO': 'declined', 'MAYBE': 'tentative'}
+                status = mapping[msg_actions['state']]
+                print 'Got response for invitation id: %s as %s'  % (ids, status)
+                self.write(cr, uid, ids, {'state': status})
         return True
 
-    def ical_get(self, name, type):
-        if self.__attribute__.get(name):
-            val = self.__attribute__.get(name).get(type, None)
-            valtype =  self.__attribute__.get(name).get('type', None)
-            if type == 'value':
-                if valtype and valtype == 'datetime' and val:
-                    if isinstance(val, list):
-                        val = ','.join(map(lambda x: x.strftime('%Y-%m-%d %H:%M:%S'), val))
-                    else:
-                        val = val.strftime('%Y-%m-%d %H:%M:%S')
-            return  val
-        else:
-            return  self.__attribute__.get(name, None)
+    def _send_mail(self, cr, uid, ids, mail_to, email_from=tools.config.get('email_from', False), context={}):
+        company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.name
+        for att in self.browse(cr, uid, ids, context=context):
+            sign = att.sent_by_uid and att.sent_by_uid.signature or ''
+            sign = '<br>'.join(sign and sign.split('\n') or [])
+            model, res_id = tuple(att.ref.split(','))            
+            res_obj = self.pool.get(model).browse(cr, uid, res_id)
+            if res_obj and len(res_obj):
+                res_obj = res_obj[0]
+            sub = '[%s Invitation][%d] %s'  % (company, att.id, res_obj.name)
+            att_infos = []
+            other_invitaion_ids = self.search(cr, uid, [('ref','=',att.ref)])
+            for att2 in self.browse(cr, uid, other_invitaion_ids):
+                att_infos.append(((att2.user_id and att2.user_id.name) or \
+                             (att2.partner_id and att2.partner_id.name) or \
+                                att2.email) +  ' - Status: ' + att2.state.title())
+            body_vals = {'name': res_obj.name, 
+                        'start_date': res_obj.date, 
+                        'end_date': res_obj.date_deadline or False, 
+                        'description': res_obj.description or '-', 
+                        'location': res_obj.location or '-', 
+                        'attendees': '<br>'.join(att_infos), 
+                        'user': res_obj.user_id and res_obj.user_id.name or 'OpenERP User', 
+                        'sign': sign, 
+                        'company': company
+            }
+            body = html_invitation % body_vals
+            if mail_to and email_from:
+                tools.email_send(
+                        email_from, 
+                        mail_to, 
+                        sub, 
+                        body, 
+                        subtype='html', 
+                        reply_to=email_from
+                    ) 
+            return True
+    def onchange_user_id(self, cr, uid, ids, user_id, *args, **argv):
+        if not user_id:
+            return {'value': {'email': ''}}
+        usr_obj = self.pool.get('res.users')
+        user = usr_obj.browse(cr, uid, user_id, *args)
+        return {'value': {'email': user.address_id.email, 'availability':user.availability}}
 
-    def ical_reset(self, type):
-        for name in self.__attribute__:
-            if self.__attribute__[name]:
-                self.__attribute__[name][type] = None
+    def do_tentative(self, cr, uid, ids, context=None, *args):
+        self.write(cr, uid, ids, {'state': 'tentative'}, context)
+
+    def do_accept(self, cr, uid, ids, context=None, *args):
+        self.write(cr, uid, ids, {'state': 'accepted'}, context)
+
+    def do_decline(self, cr, uid, ids, context=None, *args):
+        self.write(cr, uid, ids, {'state': 'declined'}, context)
+
+    def create(self, cr, uid, vals, context={}):
+        if not vals.get("email") and vals.get("cn"):
+            cnval = vals.get("cn").split(':')
+            email =  filter(lambda x:x.__contains__('@'), cnval)
+            vals['email'] = email[0]
+            vals['cn'] = vals.get("cn")
+        res = super(calendar_attendee, self).create(cr, uid, vals, context)
+        return res
+    
+calendar_attendee()
+
+class res_alarm(osv.osv):
+    _name = 'res.alarm'
+    _description = 'Basic Alarm Information'
+    _columns = {
+        'name':fields.char('Name', size=256, required=True), 
+        'trigger_occurs': fields.selection([('before', 'Before'), ('after', 'After')], \
+                                        'Triggers', required=True), 
+        'trigger_interval': fields.selection([('minutes', 'Minutes'), ('hours', 'Hours'), \
+                ('days', 'Days')], 'Interval', required=True), 
+        'trigger_duration':  fields.integer('Duration', required=True), 
+        'trigger_related':  fields.selection([('start', 'The event starts'), ('end', \
+                                       'The event ends')], 'Related to', required=True), 
+        'duration': fields.integer('Duration', help="""Duration' and 'Repeat' \
+are both optional, but if one occurs, so MUST the other"""), 
+        'repeat': fields.integer('Repeat'), 
+        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the event alarm information without removing it."), 
+
+
+    }
+    _defaults = {
+        'trigger_interval':  lambda *x: 'minutes', 
+        'trigger_duration': lambda *x: 5, 
+        'trigger_occurs': lambda *x: 'before', 
+        'trigger_related': lambda *x: 'start', 
+        'active': lambda *x: 1, 
+    }
+
+    def do_alarm_create(self, cr, uid, ids, model, date, context={}):
+        alarm_obj = self.pool.get('calendar.alarm')
+        ir_obj = self.pool.get('ir.model')
+        model_id = ir_obj.search(cr, uid, [('model', '=', model)])[0]
+        
+        model_obj = self.pool.get(model)
+        for data in model_obj.browse(cr, uid, ids):
+            basic_alarm = data.alarm_id
+            if not context.get('alarm_id'):
+                self.do_alarm_unlink(cr, uid, [data.id], model)
+                return True
+            self.do_alarm_unlink(cr, uid, [data.id], model)
+            if basic_alarm:
+                vals = {
+                    'action': 'display', 
+                    'description': data.description, 
+                    'name': data.name, 
+                    'attendee_ids': [(6, 0, map(lambda x:x.id, data.attendee_ids))], 
+                    'trigger_related': basic_alarm.trigger_related, 
+                    'trigger_duration': basic_alarm.trigger_duration, 
+                    'trigger_occurs': basic_alarm.trigger_occurs, 
+                    'trigger_interval': basic_alarm.trigger_interval, 
+                    'duration': basic_alarm.duration, 
+                    'repeat': basic_alarm.repeat, 
+                    'state': 'run', 
+                    'event_date': data[date], 
+                    'res_id': data.id, 
+                    'model_id': model_id, 
+                    'user_id': uid
+                 }
+                alarm_id = alarm_obj.create(cr, uid, vals)
+                cr.execute('Update %s set base_calendar_alarm_id=%s, alarm_id=%s \
+                                        where id=%s' % (model_obj._table, \
+                                        alarm_id, basic_alarm.id, data.id))
+        cr.commit()
+        return True
+
+    def do_alarm_unlink(self, cr, uid, ids, model, context={}):
+        alarm_obj = self.pool.get('calendar.alarm')
+        ir_obj = self.pool.get('ir.model')
+        model_id = ir_obj.search(cr, uid, [('model', '=', model)])[0]
+        model_obj = self.pool.get(model)
+        for datas in model_obj.browse(cr, uid, ids):
+            alarm_ids = alarm_obj.search(cr, uid, [('model_id', '=', model_id), ('res_id', '=', datas.id)])
+            if alarm_ids:
+                alarm_obj.unlink(cr, uid, alarm_ids)
+                cr.execute('Update %s set base_calendar_alarm_id=NULL, alarm_id=NULL\
+                             where id=%s' % (model_obj._table, datas.id))
+        cr.commit()
+        return True
+
+res_alarm()
+
+class calendar_alarm(osv.osv):
+    _name = 'calendar.alarm'
+    _description = 'Event alarm information'
+    _inherit = 'res.alarm'
+    __attribute__ = {}
+
+    _columns = {
+            'alarm_id': fields.many2one('res.alarm', 'Basic Alarm', ondelete='cascade'), 
+            'name': fields.char('Summary', size=124, help="""Contains the text to be used as the message subject for email
+or contains the text to be used for display"""), 
+            'action': fields.selection([('audio', 'Audio'), ('display', 'Display'), \
+                    ('procedure', 'Procedure'), ('email', 'Email') ], 'Action', \
+                    required=True, help="Defines the action to be invoked when an alarm is triggered"), 
+            'description': fields.text('Description', help='Provides a more complete description of the calendar component, than that provided by the "SUMMARY" property'), 
+            'attendee_ids': fields.many2many('calendar.attendee', 'alarm_attendee_rel', \
+                                          'alarm_id', 'attendee_id', 'Attendees', readonly=True), 
+            'attach': fields.binary('Attachment', help="""* Points to a sound resource, which is rendered when the alarm is triggered for audio,
+* File which is intended to be sent as message attachments for email,
+* Points to a procedure resource, which is invoked when the alarm is triggered for procedure."""), 
+            'res_id': fields.integer('Resource ID'), 
+            'model_id': fields.many2one('ir.model', 'Model'), 
+            'user_id': fields.many2one('res.users', 'Owner'), 
+            'event_date': fields.datetime('Event Date'), 
+            'event_end_date': fields.datetime('Event End Date'), 
+            'trigger_date': fields.datetime('Trigger Date', readonly="True"), 
+            'state':fields.selection([
+                        ('draft', 'Draft'), 
+                        ('run', 'Run'), 
+                        ('stop', 'Stop'), 
+                        ('done', 'Done'), 
+                    ], 'State', select=True, readonly=True), 
+     }
+
+    _defaults = {
+        'action':  lambda *x: 'email', 
+        'state': lambda *x: 'run', 
+     }
+
+    def create(self, cr, uid, vals, context={}):
+        event_date = vals.get('event_date', False)
+        if event_date:
+            dtstart = datetime.strptime(vals['event_date'], "%Y-%m-%d %H:%M:%S")
+            if vals['trigger_interval'] == 'days':
+                delta = timedelta(days=vals['trigger_duration'])
+            if vals['trigger_interval'] == 'hours':
+                delta = timedelta(hours=vals['trigger_duration'])
+            if vals['trigger_interval'] == 'minutes':
+                delta = timedelta(minutes=vals['trigger_duration'])
+            trigger_date =  dtstart + (vals['trigger_occurs'] == 'after' and delta or -delta)
+            vals['trigger_date'] = trigger_date
+        res = super(calendar_alarm, self).create(cr, uid, vals, context)
+        return res
+
+    def do_run_scheduler(self, cr, uid, automatic=False, use_new_cursor=False,\
+                       context=None):
+        if not context:
+            context = {}
+        current_datetime = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
+        cr.execute("select alarm.id as id \
+                    from calendar_alarm alarm \
+                    where alarm.state = %s and alarm.trigger_date <= %s", ('run', current_datetime))
+        res = cr.dictfetchall()
+        alarm_ids = map(lambda x: x['id'], res)
+        attendee_obj = self.pool.get('calendar.attendee')
+        request_obj = self.pool.get('res.request')
+        mail_to = []
+        for alarm in self.browse(cr, uid, alarm_ids):
+            if alarm.action == 'display':
+                value = {
+                   'name': alarm.name, 
+                   'act_from': alarm.user_id.id, 
+                   'act_to': alarm.user_id.id, 
+                   'body': alarm.description, 
+                   'trigger_date': alarm.trigger_date, 
+                   'ref_doc1':  '%s,%s'  % (alarm.model_id.model, alarm.res_id)
+                }
+                request_id = request_obj.create(cr, uid, value)
+                request_ids = [request_id]
+                for attendee in alarm.attendee_ids:
+                    value['act_to'] = attendee.user_id.id
+                    request_id = request_obj.create(cr, uid, value)
+                    request_ids.append(request_id)
+                request_obj.request_send(cr, uid, request_ids)
+
+            if alarm.action == 'email':
+                sub = '[Openobject Remainder] %s'  % (alarm.name)
+                body = """
+                Name: %s
+                Date: %s
+                Description: %s
+
+                From:
+                      %s
+                      %s
+
+                """  % (alarm.name, alarm.trigger_date, alarm.description, \
+                    alarm.user_id.name, alarm.user_id.signature)
+                mail_to = [alarm.user_id.address_id.email]
+                for att in alarm.attendee_ids:
+                    mail_to.append(att.user_id.address_id.email)
+                if mail_to:
+                    tools.email_send(
+                        tools.config.get('email_from', False), 
+                        mail_to, 
+                        sub, 
+                        body
+                    )
+            self.write(cr, uid, [alarm.id], {'state':'done'})
+        return True
+
+calendar_alarm()
+
+
+class calendar_event(osv.osv):
+    _name = "calendar.event"
+    _description = "Calendar Event"
+    __attribute__ = {}
+    
+    def _tz_get(self, cr, uid, context={}):
+        return [(x.lower(), x) for x in pytz.all_timezones]
+
+    def onchange_rrule_type(self, cr, uid, ids, rtype, *args, **argv):
+        if rtype == 'none' or not rtype:
+            return {'value': {'rrule': ''}}
+        if rtype == 'custom':
+            return {}
+        rrule = self.pool.get('calendar.custom.rrule')
+        rrulestr = rrule.compute_rule_string(cr, uid, {'freq': rtype.upper(), \
+                                 'interval': 1})
+        return {'value': {'rrule': rrulestr}}
+    
+    def _get_duration(self, cr, uid, ids, name, arg, context):
+        res = {}
+        for event in self.browse(cr, uid, ids, context=context):
+            start = datetime.strptime(event.date, "%Y-%m-%d %H:%M:%S")
+            res[event.id] = 0
+            if event.date_deadline:
+                end = datetime.strptime(event.date_deadline[:19], "%Y-%m-%d %H:%M:%S")
+                diff = end - start
+                duration =  float(diff.days)* 24 + (float(diff.seconds) / 3600)
+                res[event.id] = round(duration, 2)
+        return res
+
+    def _set_duration(self, cr, uid, id, name, value, arg, context):
+        event = self.browse(cr, uid, id, context=context)
+        start = datetime.strptime(event.date, "%Y-%m-%d %H:%M:%S")
+        end = start + timedelta(hours=value)
+        cr.execute("UPDATE %s set date_deadline='%s' \
+                        where id=%s"% (self._table, end.strftime("%Y-%m-%d %H:%M:%S"), id))
         return True
     
-    def parse_ics(self, cr, uid, child, cal_children=None, context=None):
-        att_data = []
-        for cal_data in child.getChildren():
-            if cal_data.name.lower() == 'attendee':
-                ctx = context.copy()
-                if cal_children:
-                    ctx.update({'model': cal_children[cal_data.name.lower()]})
-                attendee = self.pool.get('basic.calendar.attendee')
-                att_data.append(attendee.import_cal(cr, uid, cal_data, context=ctx))
-                self.ical_set(cal_data.name.lower(), att_data, 'value')
-                continue
-            if cal_data.name.lower() == 'valarm':
-                alarm = self.pool.get('basic.calendar.alarm')
-                ctx = context.copy()
-                if cal_children:
-                    ctx.update({'model': cal_children[cal_data.name.lower()]})
-                vals = alarm.import_cal(cr, uid, cal_data, context=ctx)
-                self.ical_set(cal_data.name.lower(), vals, 'value')
-                continue
-            if cal_data.name.lower() in self.__attribute__:
-                if cal_data.params.get('X-VOBJ-ORIGINAL-TZID'):
-                    self.ical_set('vtimezone', cal_data.params.get('X-VOBJ-ORIGINAL-TZID'), 'value')
-                self.ical_set(cal_data.name.lower(), cal_data.value, 'value')
-        vals = map_data(cr, uid, self)
-        return vals
+    _columns = {
+        'id': fields.integer('ID'), 
+        'sequence': fields.integer('Sequence'), 
+        'name': fields.char('Description', size=64, required=True), 
+        'date': fields.datetime('Date'), 
+        'date_deadline': fields.datetime('Deadline'), 
+        'create_date': fields.datetime('Created', readonly=True), 
+        'duration': fields.function(_get_duration, method=True, \
+                                    fnct_inv=_set_duration, string='Duration'), 
+        'description': fields.text('Your action'), 
+        'class': fields.selection([('public', 'Public'), ('private', 'Private'), \
+                 ('confidential', 'Confidential')], 'Mark as'), 
+        'location': fields.char('Location', size=264, help="Location of Event"), 
+        'show_as': fields.selection([('free', 'Free'), \
+                                  ('busy', 'Busy')], 
+                                   'Show as'), 
+        'base_calendar_url': fields.char('Caldav URL', size=264), 
+        'exdate': fields.text('Exception Date/Times', help="This property \
+defines the list of date/time exceptions for arecurring calendar component."), 
+        'exrule': fields.char('Exception Rule', size=352, help="defines a \
+rule or repeating pattern for anexception to a recurrence set"), 
+        'rrule': fields.char('Recurrent Rule', size=124), 
+        'rrule_type': fields.selection([('none', ''), ('daily', 'Daily'), \
+                            ('weekly', 'Weekly'), ('monthly', 'Monthly'), \
+                            ('yearly', 'Yearly'), ('custom', 'Custom')], 'Recurrency'), 
+        'alarm_id': fields.many2one('res.alarm', 'Alarm'), 
+        'base_calendar_alarm_id': fields.many2one('calendar.alarm', 'Alarm'), 
+        'recurrent_uid': fields.integer('Recurrent ID'), 
+        'recurrent_id': fields.datetime('Recurrent ID date'), 
+        'vtimezone': fields.selection(_tz_get, 'Timezone', size=64), 
+        'user_id': fields.many2one('res.users', 'Responsible'),        
+    }
+    
+    _defaults = {
+         'class': lambda *a: 'public', 
+         'show_as': lambda *a: 'busy', 
+    }
+    
+    def onchange_user_id(self, cr, uid, ids, user_id, *args, **argv):
+        if not user_id:
+            return {'value': {'vtimezone': False}}
+        value = {'vtimezone': False}
+        cr.execute('select context_tz from res_users where id=%s' % (user_id))
+        timezone = cr.fetchone()[0]
+        if timezone:
+            value.update({'vtimezone': timezone.lower()})
+        return {'value': value}
 
-    def create_ics(self, cr, uid, datas, name, ical, context=None):
-        if not datas:
-            return
-        for data in datas:
-            tzval = None
-            vevent = ical.add(name)
-            for field in self.__attribute__.keys():
-                map_field = self.ical_get(field, 'field')
-                map_type = self.ical_get(field, 'type')
-                if map_field in data.keys():
-                    if field == 'uid':
-                        model = context.get('model', None)
-                        if not model:
-                            continue
-                        uidval = openobjectid2uid(cr, data[map_field], model)
-                        model_obj = self.pool.get(model)
-                        r_ids = []
-                        if model_obj._columns.get('recurrent_uid', None):
-                            cr.execute('select id from %s  where recurrent_uid=%s' 
-                                           % (model_obj._table, data[map_field]))
-                            r_ids = map(lambda x: x[0], cr.fetchall())
-                        if r_ids: 
-                            rdata = self.pool.get(model).read(cr, uid, r_ids)
-                            event_obj = self.pool.get('basic.calendar.event')
-                            rcal = event_obj.export_cal(cr, uid, rdata, context=context)
-                            for revents in rcal.contents['vevent']:
-                                ical.contents['vevent'].append(revents)
-                        if data.get('recurrent_uid', None):
-                            uidval = openobjectid2uid(cr, data['recurrent_uid'], model)
-                        vevent.add('uid').value = uidval
-                    elif field == 'attendee' and data[map_field]:
-                        model = self.__attribute__[field].get('object', False)
-                        attendee_obj = self.pool.get('basic.calendar.attendee')
-                        vevent = attendee_obj.export_cal(cr, uid, model, \
-                                     data[map_field], vevent, context=context)
-                    elif field == 'valarm' and data[map_field]:
-                        model = self.__attribute__[field].get('object', False)
-                        ctx = context.copy()
-                        ctx.update({'model': model})
-                        alarm_obj = self.pool.get('basic.calendar.alarm')
-                        vevent = alarm_obj.export_cal(cr, uid, model, \
-                                    data[map_field][0], vevent, context=ctx)
-                    elif field == 'vtimezone' and data[map_field]:
-                        tzval = data[map_field]
-                        tz_obj = self.pool.get('basic.calendar.timezone')
-                        ical = tz_obj.export_cal(cr, uid, None, \
-                                     data[map_field], ical, context=context)
-                    elif data[map_field]:
-                        if map_type in ("char", "text"):
-                            vevent.add(field).value = tools.ustr(data[map_field]) 
-                        elif map_type in ('datetime', 'date') and data[map_field]:
-                            if field in ('exdate'):
-                                vevent.add(field).value = [parser.parse(data[map_field])]
-                            else:
-                                dtfield = vevent.add(field)
-                                dtfield.value = parser.parse(data[map_field])
-                                if tzval:
-                                    dtfield.params['TZID'] = [tzval.title()]
-                        elif map_type == "timedelta":
-                            vevent.add(field).value = timedelta(hours=data[map_field])
-                        elif map_type == "many2one":
-                            vevent.add(field).value = tools.ustr(data.get(map_field)[1])
-                        elif map_type in ("float", "integer"):
-                            vevent.add(field).value = str(data.get(map_field))
-                        elif map_type == "selection":
-                            if not self.ical_get(field, 'mapping'):
-                                vevent.add(field).value = (tools.ustr(data[map_field])).upper()
-                            else:
-                                for key1, val1 in self.ical_get(field, 'mapping').items():
-                                    if val1 == data[map_field]:
-                                        vevent.add(field).value = key1
-        return vevent
+    def export_cal(self, cr, uid, ids, context={}):
+        ids = map(lambda x: base_calendar_id2real_id(x), ids)
+        event_data = self.read(cr, uid, ids)
+        event_obj = self.pool.get('basic.calendar.event')
+        ical = event_obj.export_cal(cr, uid, event_data, context={'model': self._name})
+        return ical.serialize()
+
+    def import_cal(self, cr, uid, data, data_id=None, context={}):
+        event_obj = self.pool.get('basic.calendar.event')
+        vals = event_obj.import_cal(cr, uid, data, context=context)
+        return self.check_import(cr, uid, vals, context=context)
     
     def check_import(self, cr, uid, vals, context={}):
         ids = []
-        model_obj = self.pool.get(context.get('model'))
-        try:
-            for val in vals:
-                exists, r_id = uid2openobjectid(cr, val['id'], context.get('model'), \
-                                                                 val.get('recurrent_id'))
-                if val.has_key('create_date'): val.pop('create_date')
-                val.pop('id')
-                if exists and r_id:
-                    val.update({'recurrent_uid': exists})
-                    model_obj.write(cr, uid, [r_id], val)
-                    ids.append(r_id)
-                elif exists:
-                    model_obj.write(cr, uid, [exists], val)
-                    ids.append(exists)
+        for val in vals:
+            exists, r_id = caldav.uid2openobjectid(cr, val['id'], \
+                                    self._name, val.get('recurrent_id'))
+            if val.has_key('create_date'): val.pop('create_date')
+            val['base_calendar_url'] = context.get('url') or ''
+            val.pop('id')
+            if exists and r_id:
+                val.update({'recurrent_uid': exists})
+                self.write(cr, uid, [r_id], val)
+                ids.append(r_id)
+            elif exists:
+                self.write(cr, uid, [exists], val)
+                ids.append(exists)
+            else:
+                event_id = self.create(cr, uid, val)
+                ids.append(event_id)
+        return ids
+        
+    def modify_this(self, cr, uid, ids, defaults, context=None, *args):
+        datas = self.read(cr, uid, ids[0], context=context)
+        date = datas.get('date')
+        defaults.update({
+               'recurrent_uid': base_calendar_id2real_id(datas['id']), 
+               'recurrent_id': defaults.get('date'), 
+               'rrule_type': 'none', 
+               'rrule': ''
+                    })
+        new_id = self.copy(cr, uid, ids[0], default=defaults, context=context)
+        return new_id
+
+    def get_recurrent_ids(self, cr, uid, select, base_start_date, base_until_date, limit=100):
+        if not limit:
+            limit = 100
+        if isinstance(select, (str, int, long)):
+            ids = [select]
+        else:
+            ids = select
+        result = []
+        if ids and (base_start_date or base_until_date):
+            cr.execute("select m.id, m.rrule, m.date, m.date_deadline, \
+                            m.exdate  from "  + self._table + \
+                            " m where m.id in ("\
+                            + ','.join(map(lambda x: str(x), ids))+")")
+
+            count = 0
+            for data in cr.dictfetchall():
+                start_date = base_start_date and datetime.strptime(base_start_date, "%Y-%m-%d") or False
+                until_date = base_until_date and datetime.strptime(base_until_date, "%Y-%m-%d") or False
+                if count > limit:
+                    break
+                event_date = datetime.strptime(data['date'], "%Y-%m-%d %H:%M:%S")
+                if start_date and start_date <= event_date:
+                    start_date = event_date
+                if not data['rrule']:
+                    if start_date and (event_date < start_date):
+                        continue
+                    if until_date and (event_date > until_date):
+                        continue
+                    idval = real_id2base_calendar_id(data['id'], data['date'])
+                    result.append(idval)
+                    count += 1
                 else:
-                    event_id = model_obj.create(cr, uid, val)
-                    ids.append(event_id)
-        except Exception, e:
-            raise osv.except_osv(('Error !'), (str(e)))
+                    exdate = data['exdate'] and data['exdate'].split(',') or []
+                    event_obj = self.pool.get('basic.calendar.event')
+                    rrule_str = data['rrule']
+                    new_rrule_str = []
+                    rrule_until_date = False
+                    is_until = False
+                    for rule in rrule_str.split(';'):
+                        name, value = rule.split('=')
+                        if name == "UNTIL":
+                            is_until = True
+                            value = parser.parse(value)
+                            rrule_until_date = parser.parse(value.strftime("%Y-%m-%d"))
+                            if until_date and until_date >= rrule_until_date:
+                                until_date = rrule_until_date
+                            if until_date:
+                                value = until_date.strftime("%Y%m%d%H%M%S")
+                        new_rule = '%s=%s' % (name, value)
+                        new_rrule_str.append(new_rule)
+                    if not is_until and until_date:
+                        value = until_date.strftime("%Y%m%d%H%M%S")
+                        name = "UNTIL"
+                        new_rule = '%s=%s' % (name, value)
+                        new_rrule_str.append(new_rule)
+                    new_rrule_str = ';'.join(new_rrule_str)
+                    start_date = datetime.strptime(data['date'], "%Y-%m-%d %H:%M:%S")
+                    rdates = event_obj.get_recurrent_dates(str(new_rrule_str), exdate, start_date)
+                    for rdate in rdates:
+                        r_date = datetime.strptime(rdate, "%Y-%m-%d %H:%M:%S")
+                        if start_date and r_date < start_date:
+                            continue
+                        if until_date and r_date > until_date:
+                            continue
+                        idval = real_id2base_calendar_id(data['id'], rdate)
+                        result.append(idval)
+                        count += 1
+        if result:
+            ids = result
+        if isinstance(select, (str, int, long)):
+            return ids and ids[0] or False
         return ids
 
-    def export_cal(self, cr, uid, datas, vobj=None, context={}):
-        try:
-            self.__attribute__ = get_attribute_mapping(cr, uid, self._calname, context)
-            ical = vobject.iCalendar()
-            self.create_ics(cr, uid, datas, vobj, ical, context=context)
-            return ical
-        except Exception, e:
-            raise osv.except_osv(('Error !'), (str(e)))
-
-    def import_cal(self, cr, uid, content, data_id=None, context=None):
-        ical_data = base64.decodestring(content)
-        self.__attribute__ = get_attribute_mapping(cr, uid, self._calname, context)
-        parsedCal = vobject.readOne(ical_data)
-        res = []
-        vals = {}
-        for child in parsedCal.getChildren():
-            if child.name.lower() in ('vevent', 'vtodo'):
-                vals = self.parse_ics(cr, uid, child, context=context)
+    def search(self, cr, uid, args, offset=0, limit=100, order=None, 
+            context=None, count=False):
+        args_without_date = []
+        start_date = False
+        until_date = False
+        for arg in args:
+            if arg[0] not in ('date', unicode('date')):
+                args_without_date.append(arg)
             else:
-                vals = {}
-                continue
-            if vals: res.append(vals)
-            self.ical_reset('value')
-        return res
+                if arg[1] in ('>', '>='):
+                    start_date = arg[2]
+                elif arg[1] in ('<', '<='):
+                    until_date = arg[2]
+        res = super(calendar_event, self).search(cr, uid, args_without_date, \
+                                 offset, limit, order, context, count)
+        return self.get_recurrent_ids(cr, uid, res, start_date, until_date, limit)
 
-class Calendar(CalDAV, osv.osv):
-    _name = 'basic.calendar'
-    _description = 'Calendar'
-    _calname = 'calendar'
 
-    __attribute__ = {
-        'prodid': None, # Use: R-1, Type: TEXT, Specifies the identifier for the product that created the iCalendar object.
-        'version': None, # Use: R-1, Type: TEXT, Specifies the identifier corresponding to the highest version number
-                           #             or the minimum and maximum range of the iCalendar specification
-                           #             that is required in order to interpret the iCalendar object.
-        'calscale': None, # Use: O-1, Type: TEXT, Defines the calendar scale used for the calendar information specified in the iCalendar object.
-        'method': None, # Use: O-1, Type: TEXT, Defines the iCalendar object method associated with the calendar object.
-        'vevent': None, # Use: O-n, Type: Collection of Event class
-        'vtodo': None, # Use: O-n, Type: Collection of ToDo class
-        'vjournal': None, # Use: O-n, Type: Collection of Journal class
-        'vfreebusy': None, # Use: O-n, Type: Collection of FreeBusy class
-        'vtimezone': None, # Use: O-n, Type: Collection of Timezone class
-    }
-    _columns = {
-            'name': fields.char("Name", size=64), 
-            'line_ids': fields.one2many('basic.calendar.lines', 'calendar_id', 'Calendar Lines'), 
-            'active': fields.boolean('Active'), 
-            'create_date': fields.datetime('Created Date'), 
-            'write_date': fields.datetime('Modifided Date'), 
-    }
-
-    _defaults = {
-                'active': lambda *a: True, 
-                 }
-
-    def export_cal(self, cr, uid, ids, vobj='vevent', context={}):
-        cal = self.browse(cr, uid, ids[0])
-        ical = vobject.iCalendar()        
-        for line in cal.line_ids:
-            if line.name in ('valarm', 'attendee'):
-                continue
-            mod_obj = self.pool.get(line.object_id.model)
-            data_ids = mod_obj.search(cr, uid, eval(line.domain), context=context)
-            datas = mod_obj.read(cr, uid, data_ids, context=context)
-            context.update({'model': line.object_id.model, 
-                                    'calendar_id': cal.id
-                                    })
-            self.__attribute__ = get_attribute_mapping(cr, uid, line.name, context)
-            self.create_ics(cr, uid, datas, line.name, ical, context=context)
-        return ical.serialize()
-
-    def import_cal(self, cr, uid, content, data_id=None, context=None):
+    def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
         if not context:
             context = {}
-        ical_data = base64.decodestring(content)
-        parsedCal = vobject.readOne(ical_data)
-        if not data_id:
-            data_id = self.search(cr, uid, [])[0]
-        cal = self.browse(cr, uid, data_id)
-        cal_children = {}
-        count = 0
-        for line in cal.line_ids:
-            cal_children[line.name] = line.object_id.model
-        for child in parsedCal.getChildren():
-            if child.name.lower() in cal_children:
-                context.update({'model': cal_children[child.name.lower()], 
-                                'calendar_id': cal.id
-                                })
-                self.__attribute__ = get_attribute_mapping(cr, uid, child.name.lower(), context=context)
-                val = self.parse_ics(cr, uid, child, cal_children=cal_children, context=context)
-                obj = self.pool.get(cal_children[child.name.lower()])
-                if hasattr(obj, 'check_import'):
-                    obj.check_import(cr, uid, [val], context=context)
-                else:
-                    self.check_import(cr, uid, [val], context=context)
-        return {}
-Calendar()
-    
-class basic_calendar_line(osv.osv):
-    _name = 'basic.calendar.lines'
-    _description = 'Calendar Lines'
-    _columns = {
-            'name': fields.selection([('vevent', 'Event'), ('vtodo', 'TODO'), \
-                                    ('valarm', 'Alarm'), \
-                                    ('attendee', 'Attendee')], \
-                                    string="Type", size=64), 
-            'object_id': fields.many2one('ir.model', 'Object'), 
-            'calendar_id': fields.many2one('basic.calendar', 'Calendar', \
-                                       required=True, ondelete='cascade'), 
-            'domain': fields.char('Domain', size=124), 
-            'mapping_ids': fields.one2many('basic.calendar.fields', 'type_id', 'Fields Mapping')
-    }   
+        if isinstance(ids, (str, int, long)):
+            select = [ids]
+        else:
+            select = ids
+        new_ids = []
+        for id in select:
+            id = base_calendar_id2real_id(id)
+            if not id in new_ids:
+                new_ids.append(id)
+        res = super(calendar_event, self).write(cr, uid, new_ids, vals, context=context)
+        if vals.has_key('alarm_id') or vals.has_key('base_calendar_alarm_id'):
+            alarm_obj = self.pool.get('res.alarm')
+            context.update({'alarm_id': vals.get('alarm_id')})
+            alarm_obj.do_alarm_create(cr, uid, new_ids, self._name, 'date', context=context)
+        return res
 
-    _defaults = {
-        'domain': lambda *a: '[]', 
-    }
-    
-    def create(self, cr, uid, vals, context={}):
-        cr.execute("Select count(id) from basic_calendar_lines \
-                                where name='%s' and calendar_id=%s" % (vals.get('name'), vals.get('calendar_id')))
-        res = cr.fetchone()
-        if res:
-            if res[0] > 0:
-                raise osv.except_osv(_('Warning !'), _('Can not create \
-line "%s" more than once' % (vals.get('name'))))
-        return super(basic_calendar_line, self).create(cr, uid, vals, context=context)
+    def browse(self, cr, uid, ids, context=None, list_class=None, fields_process={}):
+        if isinstance(ids, (str, int, long)):
+            select = [ids]
+        else:
+            select = ids
+        select = map(lambda x: base_calendar_id2real_id(x), select)
+        res = super(calendar_event, self).browse(cr, uid, select, context, list_class, fields_process)
+        if isinstance(ids, (str, int, long)):
+            return res and res[0] or False
+        return res
 
-basic_calendar_line()
+    def read(self, cr, uid, ids, fields=None, context={}, load='_classic_read'):
+        if isinstance(ids, (str, int, long)):
+            select = [ids]
+        else:
+            select = ids
+        select = map(lambda x: (x, base_calendar_id2real_id(x)), select)
+        result = []
+        if fields and 'date' not in fields:
+            fields.append('date')
+        for base_calendar_id, real_id in select:
+            res = super(calendar_event, self).read(cr, uid, real_id, fields=fields, context=context, \
+                                              load=load)
+            ls = base_calendar_id2real_id(base_calendar_id, with_date=res.get('duration', 0))
+            if not isinstance(ls, (str, int, long)) and len(ls) >= 2:
+                res['date'] = ls[1]
+                res['date_deadline'] = ls[2]
+            res['id'] = base_calendar_id
 
-class basic_calendar_attribute(osv.osv):
-    _name = 'basic.calendar.attributes'
-    _description = 'Calendar attributes'
-    _columns = {        
-        'name': fields.char("Name", size=64, required=True), 
-        'type': fields.selection([('vevent', 'Event'), ('vtodo', 'TODO'), \
-                                    ('alarm', 'Alarm'), \
-                                    ('attendee', 'Attendee')], \
-                                    string="Type", size=64, required=True), 
-    }
+            result.append(res)
+        if isinstance(ids, (str, int, long)):
+            return result and result[0] or False
+        return result
 
-basic_calendar_attribute()
+    def copy(self, cr, uid, id, default=None, context={}):
+        res = super(calendar_event, self).copy(cr, uid, base_calendar_id2real_id(id), default, context)
+        alarm_obj = self.pool.get('res.alarm')
+        alarm_obj.do_alarm_create(cr, uid, [res], self._name, 'date')
+        return res
 
-class basic_calendar_fields(osv.osv):
-    _name = 'basic.calendar.fields'
-    _description = 'Calendar fields'
-
-    _columns = {
-        'field_id': fields.many2one('ir.model.fields', 'OpenObject Field'), 
-        'name': fields.many2one('basic.calendar.attributes', 'Name', required=True), 
-        'type_id': fields.many2one('basic.calendar.lines', 'Type', \
-                                   required=True, ondelete='cascade'), 
-        'expr': fields.char("Expression", size=64), 
-        'fn': fields.selection([('field', 'Use the field'), 
-                        ('const', 'Expression as constant'), 
-                        ('hours', 'Interval in hours'), 
-                        ], 'Function'), 
-        'mapping': fields.text('Mapping'), 
-    }
-
-    _defaults = {
-        'fn': lambda *a: 'field', 
-    }
-   
-    def check_line(self, cr, uid, vals, name, context=None):
-        f_obj = self.pool.get('ir.model.fields')
-        field = f_obj.browse(cr, uid, vals['field_id'], context=context)
-        relation = field.relation
-        line_obj = self.pool.get('basic.calendar.lines')
-        l_id = line_obj.search(cr, uid, [('name', '=', name)])
-        if l_id:
-            line = line_obj.browse(cr, uid, l_id, context=context)[0]
-            line_rel = line.object_id.model
-            if (relation != 'NULL') and (not relation == line_rel):
-                raise osv.except_osv(_('Warning !'), _('Please provide proper configuration of "%s" in Calendar Lines' % (name)))
-        return True
-    
-    def create(self, cr, uid, vals, context={}):
-        cr.execute('select name from basic_calendar_attributes \
-                            where id=%s' % (vals.get('name')))
-        name = cr.fetchone()
-        name = name[0]
-        if name in ('valarm', 'attendee'):
-            self.check_line(cr, uid, vals, name, context=context)
-        cr.execute("Select count(id) from basic_calendar_fields \
-                                where name=%s and type_id=%s" % (vals.get('name'), vals.get('type_id')))
-        res = cr.fetchone()
-        if res:
-            if res[0] > 0:
-                raise osv.except_osv(_('Warning !'), _('Can not map the field more than once'))
-        return super(basic_calendar_fields, self).create(cr, uid, vals, context=context)
-    
-    def write(self, cr, uid, ids, vals, context=None):
-        if not vals:
-            return
+    def unlink(self, cr, uid, ids, context=None):
+        res = False
         for id in ids:
-            field = self.browse(cr, uid, id, context=context)
-            name = field.name.name
-            if name in ('valarm', 'attendee'):
-                self.check_line(cr, uid, vals, name, context=context)
-            qry = "Select count(id) from basic_calendar_fields \
-                                where name=%s and type_id=%s" % (field.name.id, field.type_id.id)
-            cr.execute(qry)
-            res = cr.fetchone()
-            if res:
-                if res[0] > 1:
-                    raise osv.except_osv(_('Warning !'), _('Can not map same field more than once'))
-        return super(basic_calendar_fields, self).write(cr, uid, ids, vals, context)
-
-basic_calendar_fields()
-
-class Event(CalDAV, osv.osv_memory):
-    _name = 'basic.calendar.event'
-    _calname = 'vevent'
-    __attribute__ = {
-        'class': None, # Use: O-1, Type: TEXT, Defines the access classification for a calendar  component like "PUBLIC" / "PRIVATE" / "CONFIDENTIAL"
-        'created': None, # Use: O-1, Type: DATE-TIME, Specifies the date and time that the calendar information  was created by the calendar user agent in the calendar store.
-        'description': None, # Use: O-1, Type: TEXT, Provides a more complete description of the calendar component, than that provided by the "SUMMARY" property.
-        'dtstart': None, # Use: O-1, Type: DATE-TIME, Specifies when the calendar component begins.
-        'geo': None, # Use: O-1, Type: FLOAT, Specifies information related to the global position for the activity specified by a calendar component.
-        'last-mod': None, # Use: O-1, Type: DATE-TIME        Specifies the date and time that the information associated with the calendar component was last revised in the calendar store.
-        'location': None, # Use: O-1, Type: TEXT            Defines the intended venue for the activity defined by a calendar component.
-        'organizer': None, # Use: O-1, Type: CAL-ADDRESS, Defines the organizer for a calendar component.
-        'priority': None, # Use: O-1, Type: INTEGER, Defines the relative priority for a calendar component.
-        'dtstamp': None, # Use: O-1, Type: DATE-TIME, Indicates the date/time that the instance of the iCalendar object was created.
-        'seq': None, # Use: O-1, Type: INTEGER, Defines the revision sequence number of the calendar component within a sequence of revision.
-        'status': None, # Use: O-1, Type: TEXT, Defines the overall status or confirmation for the calendar component.
-        'summary': None, # Use: O-1, Type: TEXT, Defines a short summary or subject for the calendar component.
-        'transp': None, # Use: O-1, Type: TEXT, Defines whether an event is transparent or not to busy time searches.
-        'uid': None, # Use: O-1, Type: TEXT, Defines the persistent, globally unique identifier for the calendar component.
-        'url': None, # Use: O-1, Type: URL, Defines a Uniform Resource Locator (URL) associated with the iCalendar object.
-        'recurid': None, 
-        'attach': None, # Use: O-n, Type: BINARY, Provides the capability to associate a document object with a calendar component.
-        'attendee': None, # Use: O-n, Type: CAL-ADDRESS, Defines an "Attendee" within a calendar component.
-        'categories': None, # Use: O-n, Type: TEXT, Defines the categories for a calendar component.
-        'comment': None, # Use: O-n, Type: TEXT, Specifies non-processing information intended to provide a comment to the calendar user.
-        'contact': None, # Use: O-n, Type: TEXT, Used to represent contact information or alternately a  reference to contact information associated with the calendar component.
-        'exdate': None, # Use: O-n, Type: DATE-TIME, Defines the list of date/time exceptions for a recurring calendar component.
-        'exrule': None, # Use: O-n, Type: RECUR, Defines a rule or repeating pattern for an exception to a recurrence set.
-        'rstatus': None, 
-        'related': None, # Use: O-n, Specify the relationship of the alarm trigger with respect to the start or end of the calendar component.
-                                #  like A trigger set 5 minutes after the end of the event or to-do.---> TRIGGER;related=END:PT5M
-        'resources': None, # Use: O-n, Type: TEXT, Defines the equipment or resources anticipated for an activity specified by a calendar entity like RESOURCES:EASEL,PROJECTOR,VCR, LANGUAGE=fr:1 raton-laveur
-        'rdate': None, # Use: O-n, Type: DATE-TIME, Defines the list of date/times for a recurrence set.
-        'rrule': None, # Use: O-n, Type: RECUR, Defines a rule or repeating pattern for recurring events, to-dos, or time zone definitions.
-        'x-prop': None, 
-        'duration': None, # Use: O-1, Type: DURATION, Specifies a positive duration of time.
-        'dtend': None, # Use: O-1, Type: DATE-TIME, Specifies the date and time that a calendar component ends.
-    }
-    def export_cal(self, cr, uid, datas, vobj='vevent', context={}):
-        return super(Event, self).export_cal(cr, uid, datas, 'vevent', context=context)
-
-Event()
-
-class ToDo(CalDAV, osv.osv_memory):
-    _name = 'basic.calendar.todo'
-    _calname = 'vtodo'
-
-    __attribute__ = {
-                'class': None, 
-                'completed': None, 
-                'created': None, 
-                'description': None, 
-                'dtstamp': None, 
-                'dtstart': None, 
-                'duration': None, 
-                'due': None, 
-                'geo': None, 
-                'last-mod ': None, 
-                'location': None, 
-                'organizer': None, 
-                'percent': None, 
-                'priority': None, 
-                'recurid': None, 
-                'seq': None, 
-                'status': None, 
-                'summary': None, 
-                'uid': None, 
-                'url': None, 
-                'attach': None, 
-                'attendee': None, 
-                'categories': None, 
-                'comment': None, 
-                'contact': None, 
-                'exdate': None, 
-                'exrule': None, 
-                'rstatus': None, 
-                'related': None, 
-                'resources': None, 
-                'rdate': None, 
-                'rrule': None, 
-            }
-
-    def export_cal(self, cr, uid, datas, vobj='vevent', context={}):
-        return super(ToDo, self).export_cal(cr, uid, datas, 'vtodo', context=context)
-
-ToDo()
-
-class Journal(CalDAV):
-    __attribute__ = {
-    }
-
-class FreeBusy(CalDAV):
-    __attribute__ = {
-    'contact': None, # Use: O-1, Type: Text, Represent contact information or alternately a  reference to contact information associated with the calendar component.
-    'dtstart': None, # Use: O-1, Type: DATE-TIME, Specifies when the calendar component begins.
-    'dtend': None, # Use: O-1, Type: DATE-TIME, Specifies the date and time that a calendar component ends.
-    'duration': None, # Use: O-1, Type: DURATION, Specifies a positive duration of time.
-    'dtstamp': None, # Use: O-1, Type: DATE-TIME, Indicates the date/time that the instance of the iCalendar object was created.
-    'organizer': None, # Use: O-1, Type: CAL-ADDRESS, Defines the organizer for a calendar component.
-    'uid': None, # Use: O-1, Type: Text, Defines the persistent, globally unique identifier for the calendar component.
-    'url': None, # Use: O-1, Type: URL, Defines a Uniform Resource Locator (URL) associated with the iCalendar object.
-    'attendee': None, # Use: O-n, Type: CAL-ADDRESS, Defines an "Attendee" within a calendar component.
-    'comment': None, # Use: O-n, Type: TEXT, Specifies non-processing information intended to provide a comment to the calendar user.
-    'freebusy': None, # Use: O-n, Type: PERIOD, Defines one or more free or busy time intervals.
-    'rstatus': None, 
-    'X-prop': None, 
-    }
-
-
-class Timezone(CalDAV, osv.osv_memory):
-    _name = 'basic.calendar.timezone'
-    _calname = 'vtimezone'
-    
-    __attribute__ = {
-    'tzid': {'field': 'tzid'}, # Use: R-1, Type: Text, Specifies the text value that uniquely identifies the "VTIMEZONE" calendar component.
-    'last-mod': None, # Use: O-1, Type: DATE-TIME, Specifies the date and time that the information associated with the calendar component was last revised in the calendar store.
-    'tzurl': None, # Use: O-1, Type: URI, Provides a means for a VTIMEZONE component to point to a network location that can be used to retrieve an up-to-date version of itself.
-    'standardc': {'tzprop': None}, # Use: R-1,
-    'daylightc': {'tzprop': None}, # Use: R-1,
-    'x-prop': None, # Use: O-n, Type: Text,
-    }
-    
-    def get_name_offset(self, cr, uid, tzid, context={}):
-        mytz = pytz.timezone(tzid.title())
-        mydt = datetime.now(tz=mytz)
-        offset = mydt.utcoffset()
-        val = offset.days * 24 + float(offset.seconds) / 3600
-        realoffset = '%02d%02d' % (math.floor(abs(val)), \
-                                 round(abs(val) % 1 + 0.01, 2) * 60)
-        realoffset = (val < 0 and ('-' + realoffset) or ('+' + realoffset))
-        return (mydt.tzname(), realoffset)
-
-    def export_cal(self, cr, uid, model, tzid, ical, context={}):
-        ctx = context.copy()
-        ctx.update({'model': model})
-        cal_tz = ical.add('vtimezone')
-        cal_tz.add('TZID').value = tzid.title()
-        tz_std = cal_tz.add('STANDARD')
-        tzname, offset = self.get_name_offset(cr, uid, tzid)
-        tz_std.add("TZOFFSETFROM").value = offset
-        tz_std.add("TZOFFSETTO").value = offset
-        tz_std.add("DTSTART").value = datetime.now() # TODO
-        tz_std.add("TZNAME").value = tzname
-        return ical
-    
-    def import_cal(self, cr, uid, ical_data, context=None):
-        for child in ical_data.getChildren():
-            if child.name.lower() == 'tzid':
-                tzname = child.value
-                self.ical_set(child.name.lower(), tzname, 'value')
-        vals = map_data(cr, uid, self)
-        return vals
-
-Timezone()   
-
-
-class Alarm(CalDAV, osv.osv_memory):
-    _name = 'basic.calendar.alarm'
-    _calname = 'alarm'
-
-    __attribute__ = {
-    'action': None, # Use: R-1, Type: Text, defines the action to be invoked when an alarm is triggered LIKE "AUDIO" / "DISPLAY" / "EMAIL" / "PROCEDURE"
-    'description': None, #      Type: Text, Provides a more complete description of the calendar component, than that provided by the "SUMMARY" property. Use:- R-1 for DISPLAY,Use:- R-1 for EMAIL,Use:- R-1 for PROCEDURE
-    'summary': None, # Use: R-1, Type: Text        Which contains the text to be used as the message subject. Use for EMAIL
-    'attendee': None, # Use: R-n, Type: CAL-ADDRESS, Contain the email address of attendees to receive the message. It can also include one or more. Use for EMAIL
-    'trigger': None, # Use: R-1, Type: DURATION, The "TRIGGER" property specifies a duration prior to the start of an event or a to-do. The "TRIGGER" edge may be explicitly set to be relative to the "START" or "END" of the event or to-do with the "related" parameter of the "TRIGGER" property. The "TRIGGER" property value type can alternatively be set to an absolute calendar date and time of day value. Use for all action like AUDIO, DISPLAY, EMAIL and PROCEDURE
-    'duration': None, #           Type: DURATION, Duration' and 'repeat' are both optional, and MUST NOT occur more than once each, but if one occurs, so MUST the other. Use:- 0-1 for AUDIO, EMAIL and PROCEDURE, Use:- 0-n for DISPLAY
-    'repeat': None, #           Type: INTEGER, Duration' and 'repeat' are both optional, and MUST NOT occur more than once each, but if one occurs, so MUST the other. Use:- 0-1 for AUDIO, EMAIL and PROCEDURE, Use:- 0-n for DISPLAY
-    'attach': None, # Use:- O-n: which MUST point to a sound resource, which is rendered when the alarm is triggered for AUDIO, Use:- O-n: which are intended to be sent as message attachments for EMAIL, Use:- R-1:which MUST point to a procedure resource, which is invoked when the alarm is triggered for PROCEDURE.
-    'x-prop': None, 
-    }
-
-    def export_cal(self, cr, uid, model, alarm_id, vevent, context={}):
-        valarm = vevent.add('valarm')
-        alarm_object = self.pool.get(model)
-        alarm_data = alarm_object.read(cr, uid, alarm_id, [])
-
-        # Compute trigger data
-        interval = alarm_data['trigger_interval']
-        occurs = alarm_data['trigger_occurs']
-        duration = (occurs == 'after' and alarm_data['trigger_duration']) \
-                                        or -(alarm_data['trigger_duration'])
-        related = alarm_data['trigger_related']
-        trigger = valarm.add('TRIGGER')
-        trigger.params['related'] = [related.upper()]
-        if interval == 'days':
-            delta = timedelta(days=duration)
-        if interval == 'hours':
-            delta = timedelta(hours=duration)
-        if interval == 'minutes':
-            delta = timedelta(minutes=duration)
-        trigger.value = delta
-
-        # Compute other details
-        valarm.add('DESCRIPTION').value = alarm_data['name'] or 'OpenERP'
-        valarm.add('ACTION').value = alarm_data['action']
-        return vevent
-
-    def import_cal(self, cr, uid, ical_data, context=None):
-        ctx = context.copy()
-        ctx.update({'model': context.get('model', None)})
-        self.__attribute__ = get_attribute_mapping(cr, uid, self._calname, ctx)
-        for child in ical_data.getChildren():
-            if child.name.lower() == 'trigger':
-                seconds = child.value.seconds
-                days = child.value.days
-                diff = (days * 86400) +  seconds
-                interval = 'days'
-                related = 'before'
-                if not seconds:
-                    duration = abs(days)
-                    related = days > 0 and 'after' or 'before'
-                elif (abs(diff) / 3600) == 0:
-                    duration = abs(diff / 60)
-                    interval = 'minutes'
-                    related = days >= 0 and 'after' or 'before'
-                else:
-                    duration = abs(diff / 3600)
-                    interval = 'hours'
-                    related = days >= 0 and 'after' or 'before'
-                self.ical_set('trigger_interval', interval, 'value')
-                self.ical_set('trigger_duration', duration, 'value')
-                self.ical_set('trigger_occurs', related.lower(), 'value')
-                if child.params:
-                    if child.params.get('related'):
-                        self.ical_set('trigger_related', child.params.get('related')[0].lower(), 'value')
+            ls = base_calendar_id2real_id(id)
+            if not isinstance(ls, (str, int, long)) and len(ls) >= 2:
+                date_new = ls[1]
+                for record in self.read(cr, uid, [base_calendar_id2real_id(id)], \
+                                            ['date', 'rrule', 'exdate']):
+                    if record['rrule']:
+                        exdate = (record['exdate'] and (record['exdate'] + ',')  or '') + ''.join((re.compile('\d')).findall(date_new)) + 'Z'
+                        if record['date'] == date_new:
+                            res = self.write(cr, uid, [base_calendar_id2real_id(id)], {'exdate': exdate})
+                    else:
+                        ids = map(lambda x: base_calendar_id2real_id(x), ids)
+                        res = super(calendar_event, self).unlink(cr, uid, base_calendar_id2real_id(ids))
+                        alarm_obj = self.pool.get('res.alarm')
+                        alarm_obj.do_alarm_unlink(cr, uid, ids, self._name)
             else:
-                self.ical_set(child.name.lower(), child.value.lower(), 'value')
-        vals = map_data(cr, uid, self)
-        return vals
+                ids = map(lambda x: base_calendar_id2real_id(x), ids)
+                res = super(calendar_event, self).unlink(cr, uid, ids)
+                alarm_obj = self.pool.get('res.alarm')
+                alarm_obj.do_alarm_unlink(cr, uid, ids, self._name)
+        return res
 
-Alarm()
+    def create(self, cr, uid, vals, context={}):
+        res = super(calendar_event, self).create(cr, uid, vals, context)
+        alarm_obj = self.pool.get('res.alarm')
+        alarm_obj.do_alarm_create(cr, uid, [res], self._name, 'date')
+        return res
 
-class Attendee(CalDAV, osv.osv_memory):
-    _name = 'basic.calendar.attendee'
-    _calname = 'attendee'
+calendar_event()
 
-    __attribute__ = {
-    'cutype': None, # Use: 0-1    Specify the type of calendar user specified by the property like "INDIVIDUAL"/"GROUP"/"RESOURCE"/"ROOM"/"UNKNOWN".
-    'member': None, # Use: 0-1    Specify the group or list membership of the calendar user specified by the property.
-    'role': None, # Use: 0-1    Specify the participation role for the calendar user specified by the property like "CHAIR"/"REQ-PARTICIPANT"/"OPT-PARTICIPANT"/"NON-PARTICIPANT"
-    'partstat': None, # Use: 0-1    Specify the participation status for the calendar user specified by the property. like use for VEVENT:- "NEEDS-ACTION"/"ACCEPTED"/"DECLINED"/"TENTATIVE"/"DELEGATED", use for VTODO:-"NEEDS-ACTION"/"ACCEPTED"/"DECLINED"/"TENTATIVE"/"DELEGATED"/"COMPLETED"/"IN-PROCESS" and use for VJOURNAL:- "NEEDS-ACTION"/"ACCEPTED"/"DECLINED".
-    'rsvp': None, # Use: 0-1    Specify whether there is an expectation of a favor of a reply from the calendar user specified by the property value like TRUE / FALSE.
-    'delegated-to': None, # Use: 0-1    Specify the calendar users to whom the calendar user specified by the property has delegated participation.
-    'delegated-from': None, # Use: 0-1    Specify the calendar users that have delegated their participation to the calendar user specified by the property.
-    'sent-by': None, # Use: 0-1    Specify the calendar user that is acting on behalf of the calendar user specified by the property.
-    'cn': None, # Use: 0-1    Specify the common name to be associated with the calendar user specified by the property.
-    'dir': None, # Use: 0-1    Specify reference to a directory entry associated with the calendar user specified by the property.
-    'language': None, # Use: 0-1    Specify the language for text values in a property or property parameter.
+class calendar_todo(osv.osv):
+    _name = "calendar.todo"
+    _inherit = "calendar.event"
+    _description = "Calendar Task"
+
+    def _get_date(self, cr, uid, ids, name, arg, context):
+        res = {}
+        for event in self.browse(cr, uid, ids, context=context):
+            res[event.id] = event.date_start
+        return res
+
+    def _set_date(self, cr, uid, id, name, value, arg, context):
+        event = self.browse(cr, uid, id, context=context)
+        cr.execute("UPDATE %s set date_start='%s' where id=%s"  \
+                           % (self._table, value, id))
+        return True
+
+    _columns = {
+        'date': fields.function(_get_date, method=True, fnct_inv=_set_date, \
+                                        string='Duration', store=True, type='datetime'), 
+        'duration': fields.integer('Duration'), 
+    }
+    
+    __attribute__ = {}
+    
+    def import_cal(self, cr, uid, data, data_id=None, context={}):
+        todo_obj = self.pool.get('basic.calendar.todo')
+        vals = todo_obj.import_cal(cr, uid, data, context=context)
+        return self.check_import(cr, uid, vals, context=context)
+    
+    def check_import(self, cr, uid, vals, context={}):
+        ids = []
+        for val in vals:
+            obj_tm = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.project_time_mode_id
+            if not val.has_key('planned_hours'):
+                # 'Computes duration' in days
+                plan = 0.0
+                if val.get('date') and  val.get('date_deadline'):
+                    start = datetime.strptime(val['date'], '%Y-%m-%d %H:%M:%S')
+                    end = datetime.strptime(val['date_deadline'], '%Y-%m-%d %H:%M:%S')
+                    diff = end - start
+                    plan = (diff.seconds/float(86400) + diff.days) * obj_tm.factor
+                val['planned_hours'] = plan
+            else:
+                # Converts timedelta into hours
+                hours = (val['planned_hours'].seconds / float(3600)) + \
+                                        (val['planned_hours'].days * 24)
+                val['planned_hours'] = hours
+            exists, r_id = caldav.uid2openobjectid(cr, val['id'], self._name, val.get('recurrent_id'))
+            val.pop('id')
+            if exists:
+                self.write(cr, uid, [exists], val)
+                ids.append(exists)
+            else:
+                task_id = self.create(cr, uid, val)
+                ids.append(task_id)
+        return ids
+        
+    def export_cal(self, cr, uid, ids, context={}):
+        task_datas = self.read(cr, uid, ids, [], context ={'read': True})
+        tasks = []
+        for task in task_datas:
+            if task.get('planned_hours', None) and task.get('date_deadline', None):
+                task.pop('planned_hours')
+            tasks.append(task)
+        todo_obj = self.pool.get('basic.calendar.todo')
+        ical = todo_obj.export_cal(cr, uid, tasks, context={'model': self._name})
+        calendar_val = ical.serialize()
+        calendar_val = calendar_val.replace('"', '').strip()
+        return calendar_val
+
+calendar_todo()
+ 
+class ir_attachment(osv.osv):
+    _name = 'ir.attachment'
+    _inherit = 'ir.attachment'
+
+    def search_count(self, cr, user, args, context=None):
+        args1 = []
+        for arg in args:
+            args1.append(map(lambda x:str(x).split('-')[0], arg))
+        return super(ir_attachment, self).search_count(cr, user, args1, context)
+
+    def search(self, cr, uid, args, offset=0, limit=None, order=None, 
+            context=None, count=False):
+        new_args = args
+        for i, arg in enumerate(new_args):
+            if arg[0] == 'res_id':
+                new_args[i] = (arg[0], arg[1], base_calendar_id2real_id(arg[2]))
+        return super(ir_attachment, self).search(cr, uid, new_args, offset=offset, 
+                            limit=limit, order=order, 
+                            context=context, count=False)
+ir_attachment()
+
+class ir_values(osv.osv):
+    _inherit = 'ir.values'
+
+    def set(self, cr, uid, key, key2, name, models, value, replace=True, \
+            isobject=False, meta=False, preserve_user=False, company=False):
+        new_model = []
+        for data in models:
+            if type(data) in (list, tuple):
+                new_model.append((data[0], base_calendar_id2real_id(data[1])))
+            else:
+                new_model.append(data)
+        return super(ir_values, self).set(cr, uid, key, key2, name, new_model,\
+                    value, replace, isobject, meta, preserve_user, company)
+
+    def get(self, cr, uid, key, key2, models, meta=False, context={}, \
+             res_id_req=False, without_user=True, key2_req=True):
+        new_model = []
+        for data in models:
+            if type(data) in (list, tuple):
+                new_model.append((data[0], base_calendar_id2real_id(data[1])))
+            else:
+                new_model.append(data)
+        return super(ir_values, self).get(cr, uid, key, key2, new_model, \
+                         meta, context, res_id_req, without_user, key2_req)
+
+ir_values()
+
+class ir_model(osv.osv):
+
+    _inherit = 'ir.model'
+
+    def read(self, cr, uid, ids, fields=None, context={}, 
+            load='_classic_read'):
+        data = super(ir_model, self).read(cr, uid, ids, fields=fields, \
+                        context=context, load=load)
+        if data:
+            for val in data:
+                val['id'] = base_calendar_id2real_id(val['id'])
+        return data
+
+ir_model()
+
+class virtual_report_spool(web_services.report_spool):
+
+    def exp_report(self, db, uid, object, ids, datas=None, context=None):
+        if object == 'printscreen.list':
+            return super(virtual_report_spool, self).exp_report(db, uid, \
+                            object, ids, datas, context)
+        new_ids = []
+        for id in ids:
+            new_ids.append(base_calendar_id2real_id(id))
+        datas['id'] = base_calendar_id2real_id(datas['id'])        
+        return super(virtual_report_spool, self).exp_report(db, uid, object, new_ids, datas, context)
+
+virtual_report_spool()
+
+class calendar_custom_rrule(osv.osv):
+    _name = "calendar.custom.rrule"
+    _description = "Custom Recurrency Rule"
+
+    _columns = {
+        'freq': fields.selection([('None', 'No Repeat'), \
+                            ('secondly', 'Secondly'), \
+                            ('minutely', 'Minutely'), \
+                            ('hourly', 'Hourly'), \
+                            ('daily', 'Daily'), \
+                            ('weekly', 'Weekly'), \
+                            ('monthly', 'Monthly'), \
+                            ('yearly', 'Yearly')], 'Frequency', required=True), 
+        'interval': fields.integer('Interval'), 
+        'count': fields.integer('Count'), 
+        'mo': fields.boolean('Mon'), 
+        'tu': fields.boolean('Tue'), 
+        'we': fields.boolean('Wed'), 
+        'th': fields.boolean('Thu'), 
+        'fr': fields.boolean('Fri'), 
+        'sa': fields.boolean('Sat'), 
+        'su': fields.boolean('Sun'), 
+        'select1': fields.selection([('date', 'Date of month'), \
+                            ('day', 'Day of month')], 'Option'), 
+        'day': fields.integer('Date of month'), 
+        'week_list': fields.selection([('MO', 'Monday'), ('TU', 'Tuesday'), \
+                                   ('WE', 'Wednesday'), ('TH', 'Thursday'), \
+                                   ('FR', 'Friday'), ('SA', 'Saturday'), \
+                                   ('SU', 'Sunday')], 'Weekday'), 
+        'byday': fields.selection([('1', 'First'), ('2', 'Second'), \
+                                   ('3', 'Third'), ('4', 'Fourth'), \
+                                   ('5', 'Fifth'), ('-1', 'Last')], 'By day'), 
+        'month_list': fields.selection(months.items(), 'Month'), 
+        'end_date': fields.date('Repeat Until')
     }
 
-    def import_cal(self, cr, uid, ical_data, context=None):
-        ctx = context.copy()
-        ctx.update({'model': context.get('model', None)})
-        self.__attribute__ = get_attribute_mapping(cr, uid, self._calname, ctx)
-        for para in ical_data.params:
-            if para.lower() == 'cn':
-                self.ical_set(para.lower(), ical_data.params[para][0]+':'+ \
-                        ical_data.value, 'value')
-            else:
-                self.ical_set(para.lower(), ical_data.params[para][0].lower(), 'value')
-        if not ical_data.params.get('CN'):
-            self.ical_set('cn', ical_data.value, 'value')
-        vals = map_data(cr, uid, self)
-        return vals
+    _defaults = {
+                 'freq':  lambda *x: 'daily', 
+                 'select1':  lambda *x: 'date', 
+                 'interval':  lambda *x: 1, 
+                 }
 
-    def export_cal(self, cr, uid, model, attendee_ids, vevent, context={}):
-        attendee_object = self.pool.get(model)
-        ctx = context.copy()
-        ctx.update({'model': model})
-        self.__attribute__ = get_attribute_mapping(cr, uid, self._calname, ctx)
-        for attendee in attendee_object.read(cr, uid, attendee_ids, []):
-            attendee_add = vevent.add('attendee')
-            cn_val = ''
-            for a_key, a_val in self.__attribute__.items():
-                if attendee[a_val['field']] and a_val['field'] != 'cn':
-                    if a_val['type'] in ('text', 'char', 'selection'):
-                        attendee_add.params[a_key] = [str(attendee[a_val['field']])]
-                    elif a_val['type'] == 'boolean':
-                        attendee_add.params[a_key] = [str(attendee[a_val['field']])]
-                if a_val['field'] == 'cn' and attendee[a_val['field']]:
-                    cn_val = [str(attendee[a_val['field']])]
-                    if cn_val:
-                        attendee_add.params['CN'] = cn_val
-            attendee_add.value = 'MAILTO:' + attendee['email']
-        return vevent
+    def compute_rule_string(self, cr, uid, datas, context=None, *args):
+        weekdays = ['mo', 'tu', 'we', 'th', 'fr', 'sa', 'su']
+        weekstring = ''
+        monthstring = ''
+        yearstring = ''
 
-Attendee()
+#    logic for computing rrule string
+
+        freq = datas.get('freq')
+        if freq == 'None':
+            obj.write(cr, uid, [res_obj.id], {'rrule': ''})
+            return {}
+
+        if freq == 'weekly':
+            byday = map(lambda x: x.upper(), filter(lambda x: datas.get(x) and x in weekdays, datas))
+            if byday:
+                weekstring = ';BYDAY=' + ','.join(byday)
+
+        elif freq == 'monthly':
+            if datas.get('select1')=='date' and (datas.get('day') < 1 or datas.get('day') > 31):
+                raise osv.except_osv(_('Error!'), ("Please select proper Day of month"))
+            if datas.get('select1')=='day':
+                monthstring = ';BYDAY=' + datas.get('byday') + datas.get('week_list')
+            elif datas.get('select1')=='date':
+                monthstring = ';BYMONTHDAY=' + str(datas.get('day'))
+
+        elif freq == 'yearly':
+            if datas.get('select1')=='date'  and (datas.get('day') < 1 or datas.get('day') > 31):
+                raise osv.except_osv(_('Error!'), ("Please select proper Day of month"))
+            bymonth = ';BYMONTH=' + str(datas.get('month_list'))
+            if datas.get('select1')=='day':
+                bystring = ';BYDAY=' + datas.get('byday') + datas.get('week_list')
+            elif datas.get('select1')=='date':
+                bystring = ';BYMONTHDAY=' + str(datas.get('day'))
+            yearstring = bymonth + bystring
+
+        if datas.get('end_date'):
+            datas['end_date'] = ''.join((re.compile('\d')).findall(datas.get('end_date'))) + '235959Z'
+        enddate = (datas.get('count') and (';COUNT=' +  str(datas.get('count'))) or '') +\
+                             ((datas.get('end_date') and (';UNTIL=' + datas.get('end_date'))) or '')
+
+        rrule_string = 'FREQ=' + freq.upper() +  weekstring + ';INTERVAL=' + \
+                str(datas.get('interval')) + enddate + monthstring + yearstring
+
+#        End logic
+        return rrule_string
+
+    def do_add(self, cr, uid, ids, context={}):
+        datas = self.read(cr, uid, ids)[0]
+        if datas.get('interval') <= 0:
+            raise osv.except_osv(_('Error!'), ("Please select proper Interval"))
 
 
+        if not context or not context.get('model'):
+            return {}
+        else:
+            model = context.get('model')
+        obj = self.pool.get(model)
+        res_obj = obj.browse(cr, uid, context['active_id'])
+
+        rrule_string = self.compute_rule_string(cr, uid, datas)
+        obj.write(cr, uid, [res_obj.id], {'rrule': rrule_string})
+        return {}
+
+calendar_custom_rrule()
+
+class res_users(osv.osv):
+    _inherit = 'res.users'
+
+    def _get_user_avail(self, cr, uid, ids, context=None):
+        current_datetime = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
+        res = {}
+        attendee_obj = self.pool.get('calendar.attendee')
+        attendee_ids = attendee_obj.search(cr, uid, [
+                    ('event_date', '<=', current_datetime), ('event_end_date', '<=', current_datetime), 
+                    ('state', '=', 'accepted'), ('user_id', 'in', ids)
+                    ])
+
+        result = cr.dictfetchall()
+        for attendee_data in attendee_obj.read(cr, uid, attendee_ids, ['user_id']):
+            user_id = attendee_data['user_id']
+            status = 'busy'
+            res.update({user_id:status})
+
+        #TOCHECK: Delegrated Event        
+        for user_id in ids:
+            if user_id not in res:
+                res[user_id] = 'free'
+
+        return res
+
+    def _get_user_avail_fun(self, cr, uid, ids, name, args, context=None):
+        return self._get_user_avail(cr, uid, ids, context=context)
+
+    _columns = {
+            'availability': fields.function(_get_user_avail_fun, type='selection', \
+                    selection=[('free', 'Free'), ('busy', 'Busy')], \
+                    string='Free/Busy', method=True), 
+    }
+res_users()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index f5b4a274a95..053624a78bc 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -1,61 +1,250 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-	<data>
+    <data>
+    
+<!--    Attendee invite wizard-->
 
-		<record id="view_calendar_form" model="ir.ui.view">
-			<field name="name">Basic Calendar</field>
-			<field name="model">basic.calendar</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Basic Calendar">
-					<field name="name" required="1" select="1" />
-					<field name="active" select="1" />
-                    <field name="line_ids" mode="form,tree" colspan="4" nolabel="1">
-					    <form string="Calendar Lines">
-					        <field name="name" required="1" select="1" />
-					        <field name="object_id" required="1" select="1" />
-					        <field name="domain" select="1" />
-					        <field name="mapping_ids" select="1" colspan="4" nolabel="1">
-						        <tree string="Attributes Mapping" editable="bottom">
-							        <field name="name" required="1" domain="[('type', '=', parent.name)]"/>
-							        <field name="fn" select="1" />
-							        <field name="field_id" select="1" required="1" domain="[('model_id', '=', parent.object_id)]" />
-							        <field name="expr" />
-						        </tree>
-						        <form string="Attributes Mapping">
-							        <field name="name" select="1" required="1" domain="[('type', '=', parent.name)]"/>
-							        <field name="field_id" select="1" domain="[('model_id', '=', parent.object_id)]"
-								        required="1" />
-							        <field name="fn" select="1" required="1" />
-							        <field name="expr" />
-							        <separator string="Value Mapping" colspan="4" />
-							        <field name="mapping" select="1" colspan="4" nolabel="1" />
-						        </form>
-					        </field>
-				        </form>
-                        <tree string="Attributes Mapping" editable="bottom">
-					        <field name="name" select="1" />
-					        <field name="object_id" select="1" />
-				        </tree>
-                    </field>
-				</form>
-			</field>
-		</record>
-
-		<record id="action_view_calendar" model="ir.actions.act_window">
-            <field name="name">Calendar</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">basic.calendar</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+		<record id="view_calendar_invite_attendee_wizard" model="ir.ui.view">
+            <field name="name">Invite Attendees</field>
+            <field name="model">base_calendar.invite.attendee</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Invite People">
+                	<field name="type" />
+                	<field name="send_mail" />
+                	<newline/>
+                	<group col="1" colspan="4"
+                		attrs="{'invisible': [('type', '!=', 'external')]}">
+                		<field name="email" colspan="4"
+                			attrs="{'required': [('type', '=', 'external')]}" />
+                	</group>
+                	<group col="1" colspan="4"
+                		attrs="{'invisible': [('type', '!=', 'internal')]}">
+                		<separator string="Users" colspan="4" />
+                		<field name="user_ids" select="1" colspan="4"
+                			nolabel="1" />
+                		<newline />
+                	</group>
+                	<group col="2" colspan="4"
+                		attrs="{'invisible': [('type', '!=', 'partner')]}">
+                		<field name="partner_id" colspan="2"
+                			on_change="onchange_partner_id(partner_id)"
+                			attrs="{'required': [('type', '=', 'partner')]}" />
+                		<newline />
+                		<separator string="Partner Contacts"
+                			colspan="4" />
+                		<field name="contact_ids" select="1" colspan="4"
+                			nolabel="1" domain="[('partner_id', '=', partner_id)]"
+                			attrs="{'readonly': [('type', '!=', 'partner')]}" />
+                	</group>
+                	<newline/>
+                	<separator string="" colspan="6" />
+                	<label string="" colspan="2" />
+                	<button icon='gtk-cancel' special="cancel"
+                		string="Cancel" />
+                	<button name="do_invite" string="Invite"
+                		type="object" icon="gtk-ok" />
+                </form>
+            </field>
         </record>
 
-		<menuitem id="menu_calendar_configuration" name="Calendar"
-			parent="base.menu_base_config" sequence="10" />
+        <record id="action_view_calendar_invite_attendee_wizard" model="ir.actions.act_window">
+            <field name="name">Invite Attendees</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">base_calendar.invite.attendee</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
 
-		<menuitem id="menu_calendar"
-			name="Calendar" parent="menu_calendar_configuration"
-			sequence="5" action="action_view_calendar" />
+        <record id="base_calendar_attendee_form_view" model="ir.ui.view">
+            <field name="name">calendar.attendee.form</field>
+            <field name="model">calendar.attendee</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            	<form string="Invitation details">
+            		<field name="email" string="Invitation To"/> 
+                    <field name="sent_by_uid" string="Invitation From"/>
+            		<notebook colspan="4">
+            			<page string="Invitation">
+                            <separator string="Invitation Detail" colspan="4" />
+                            <group colspan="4" col="4">
+                                <field name="user_id" string="Invited User"/>
+                                <newline/>
+                                <field name="partner_id" string="Partner"/>
+                                <field name="partner_address_id" string="Contact"/>
+                                <field name="role" string="Role" />
+                                <field name="cutype" string="Invitation type" />
+                                <field name="rsvp" /> 
+                            </group>
+                            <separator string="Event Detail" colspan="4" />
+                            <group colspan="4" col="4">
+                                <field name="event_date" />
+                                <field name="event_end_date" />
+                                <field name="language"/>
+                                <field name="ref" colspan="4"/>
+                            </group>
+            			</page>
+            			<page string="Delegation Info">
+            				<separator string="Delegated From" colspan="4" />
+            				<field name="parent_ids" nolabel="1"
+            					colspan="4" readonly="1" />
+            				<separator string="Delegated To" colspan="4" />
+            				<field name="child_ids" nolabel="1"
+            					colspan="4" readonly="1" />
+            			</page>
+            		</notebook>
+            		<group col="6" colspan="4">
+	                        <field name="state" select="2" />
+	                        <button name="do_tentative" states="needs-action,declined,accepted"
+	                        	string="Uncertain" type="object"
+	                        	icon="terp-crm" />
+	                        <button name="do_accept" string="Accept" states="needs-action,tentative,declined"
+	                        	type="object" icon="gtk-apply" />
+	                        <button name="do_decline" string="Decline"  states="needs-action,tentative,accepted"
+	                        	type="object" icon="gtk-cancel" />
+	                        <button
+	                        	name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
+	                        	string="Delegate" type="action"
+	                        	icon="gtk-sort-descending" states="needs-action,tentative,declined,accepted"
+	                        	context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
+            		</group>
+            	</form>
+            </field>
+        </record>
 
-	</data>
+	    <record id="base_calendar_attendee_tree_view" model="ir.ui.view">
+            <field name="name">calendar.attendee.tree</field>
+            <field name="model">calendar.attendee</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+            	<tree string="Invitation details">
+            		<field name="email" string="Invitation To"/>
+                    <field name="partner_id" string="Partner" />
+                    <field name="partner_address_id" string="Contact" />
+            		<field name="role" />            		
+            		<field name="state" />
+            	</tree>
+            </field>
+        </record>	 
+
+	 
+	 
+        <record id="res_alarm_form_view" model="ir.ui.view">
+            <field name="name">res.alarm.form</field>
+            <field name="model">res.alarm</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            	<form string="Reminder details">
+                    <field name="name" />
+                    <field name="active" />
+                    <separator string="Reminder Details" colspan="4" />
+                    <field name="trigger_duration" select="1" />
+                    <field name="trigger_interval" select="1" />
+                    <field name="trigger_occurs" select="1" />
+                    <field name="trigger_related" select="1" />
+                    <separator string="" colspan="4" />
+                    <field name="duration" />
+                    <field name="repeat" />
+            	</form>
+            </field>
+        </record>
+
+         <record id="res_alarm_tree_view" model="ir.ui.view">
+                <field name="name">res.alarm.tree</field>
+                <field name="model">res.alarm</field>
+                <field name="type">tree</field>
+                <field name="arch" type="xml">                    
+                	<tree string="Reminder details">
+			            <field name="name" select="1"/>                        			    
+			            <field name="trigger_interval" select="1"/>
+			            <field name="trigger_duration" select="1"/>
+			            <field name="trigger_related" select="1"/>
+			            <field name="trigger_occurs" select="1"/>			            
+		            </tree>
+                </field>
+            </record>
+
+         <record id="action_res_alarm_view" model="ir.actions.act_window">
+         	<field name="name">Available Alarms</field>
+         	<field name="type">ir.actions.act_window</field>
+         	<field name="res_model">res.alarm</field>
+         	<field name="view_type">form</field>
+         	<field name="view_mode">tree,form</field>
+         </record>
+
+         <record id="view_custom_rule_form" model="ir.ui.view">
+            <field name="name">Custom Rule</field>
+            <field name="model">calendar.custom.rrule</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            	<form string="Custom Rule">
+            		<separator string="Select data for Custom Rule" colspan="4"/>
+                    <field name="freq" />
+                    <field name="interval" />
+                    <newline />
+                    <field name="count"
+                    	attrs="{'required' : [('end_date','=',False)]}"/>
+                    <field name="end_date"
+                    	attrs="{'required' : [('count','&lt;=',0), ('freq', '!=', 'None')]}"/>
+                    <group col="7" colspan="4" name="Select weekdays"
+                    		attrs="{'invisible' : [('freq','!=','weekly')]}">
+                    	<separator string="" colspan="6" />
+                    	<newline />
+                    	<field name="mo" colspan="1" />
+                    	<field name="tu" colspan="1" />
+                    	<field name="we" colspan="1" />
+                    	<field name="th" colspan="1" />
+                    	<field name="fr" colspan="1" />
+                    	<field name="sa" colspan="1" />
+                    	<field name="su" colspan="1" />
+                    	<newline />
+                    </group>
+                    <group col="4" colspan="4" attrs="{'invisible' : [('freq','!=','monthly'), ('freq','!=','yearly')]}">
+                    	<separator string="" colspan="6"/>
+                    	<group col="2" colspan="4">
+                    		<field name="select1"/>
+                    	</group>
+                    	<group col="3" colspan="4" attrs="{'invisible' : [('select1','=','day')]}">
+                    		<field name="day" attrs="{'required' : [('select1','=','date')]}"/>
+                   		</group>
+                   		<newline />
+                    	<group col="3" colspan="4" attrs="{'invisible' : [('select1','=','date')]}">
+                    		<field name="byday"  string="The"
+                    					attrs="{'required' : [('select1','=','day')]}"/>
+                    		<field name="week_list" nolabel="1"
+                    					attrs="{'required' : [('select1','=','day')]}"/>
+                    	</group>
+                    	<group col="2" colspan="4" attrs="{'invisible' : [('freq','!=','yearly')]}">
+                    		<field name="month_list" string="of" colspan="1"
+                    				attrs="{'required' : [('freq','=','yearly')]}"/>
+                 		</group>
+                    </group>
+                    <separator string="" colspan="6" />
+                    <label string="" colspan="2"/>
+                    <button icon='gtk-cancel' special="cancel" string="Cancel"/>
+                    <button name="do_add" string="Ok" type="object" icon="gtk-ok"/>
+                </form>
+            </field>
+        </record>
+	
+    	<record id="action_calendar_custom_rrule_wizard" model="ir.actions.act_window">
+            <field name="name">Custom Rule</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">calendar.custom.rrule</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+        
+        
+        
+        <!--	Available alarms-->
+
+	<menuitem name="Available alarms" id="menu_crm_meeting_avail_alarm"
+		action="base_calendar.action_res_alarm_view"
+		parent="caldav.menu_calendar_configuration" />
+		
+		
+    </data>
 </openerp>
diff --git a/addons/base_calendar/DAV/BufferingHTTPServer.py b/addons/caldav/DAV/BufferingHTTPServer.py
similarity index 100%
rename from addons/base_calendar/DAV/BufferingHTTPServer.py
rename to addons/caldav/DAV/BufferingHTTPServer.py
diff --git a/addons/base_calendar/DAV/WebDAVServer.py b/addons/caldav/DAV/WebDAVServer.py
similarity index 100%
rename from addons/base_calendar/DAV/WebDAVServer.py
rename to addons/caldav/DAV/WebDAVServer.py
diff --git a/addons/base_calendar/DAV/__init__.py b/addons/caldav/DAV/__init__.py
similarity index 100%
rename from addons/base_calendar/DAV/__init__.py
rename to addons/caldav/DAV/__init__.py
diff --git a/addons/base_calendar/DAV/constants.py b/addons/caldav/DAV/constants.py
similarity index 100%
rename from addons/base_calendar/DAV/constants.py
rename to addons/caldav/DAV/constants.py
diff --git a/addons/base_calendar/DAV/davcmd.py b/addons/caldav/DAV/davcmd.py
similarity index 100%
rename from addons/base_calendar/DAV/davcmd.py
rename to addons/caldav/DAV/davcmd.py
diff --git a/addons/base_calendar/DAV/davcopy.py b/addons/caldav/DAV/davcopy.py
similarity index 100%
rename from addons/base_calendar/DAV/davcopy.py
rename to addons/caldav/DAV/davcopy.py
diff --git a/addons/base_calendar/DAV/davmove.py b/addons/caldav/DAV/davmove.py
similarity index 100%
rename from addons/base_calendar/DAV/davmove.py
rename to addons/caldav/DAV/davmove.py
diff --git a/addons/base_calendar/DAV/delete.py b/addons/caldav/DAV/delete.py
similarity index 100%
rename from addons/base_calendar/DAV/delete.py
rename to addons/caldav/DAV/delete.py
diff --git a/addons/base_calendar/DAV/errors.py b/addons/caldav/DAV/errors.py
similarity index 100%
rename from addons/base_calendar/DAV/errors.py
rename to addons/caldav/DAV/errors.py
diff --git a/addons/base_calendar/DAV/iface.py b/addons/caldav/DAV/iface.py
similarity index 100%
rename from addons/base_calendar/DAV/iface.py
rename to addons/caldav/DAV/iface.py
diff --git a/addons/base_calendar/DAV/propfind.py b/addons/caldav/DAV/propfind.py
similarity index 100%
rename from addons/base_calendar/DAV/propfind.py
rename to addons/caldav/DAV/propfind.py
diff --git a/addons/base_calendar/DAV/status.py b/addons/caldav/DAV/status.py
similarity index 100%
rename from addons/base_calendar/DAV/status.py
rename to addons/caldav/DAV/status.py
diff --git a/addons/base_calendar/DAV/utils.py b/addons/caldav/DAV/utils.py
similarity index 100%
rename from addons/base_calendar/DAV/utils.py
rename to addons/caldav/DAV/utils.py
diff --git a/addons/caldav/__init__.py b/addons/caldav/__init__.py
index 7197809ab2c..19f11301420 100644
--- a/addons/caldav/__init__.py
+++ b/addons/caldav/__init__.py
@@ -20,5 +20,10 @@
 ##############################################################################
 
 import caldav
+import caldav_cache
+import caldav_fs
+import caldav_node
+import webdav_server
+import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/__terp__.py b/addons/caldav/__terp__.py
index 7360019a638..fef6f80f2f0 100644
--- a/addons/caldav/__terp__.py
+++ b/addons/caldav/__terp__.py
@@ -21,26 +21,28 @@
 
 
 {
-    "name" : "CalDAV", 
+    "name" : "Basic Calendar Functionality", 
     "version" : "1.0", 
     "depends" : [
-                    "base_calendar", 
+                    "base", 
                 ], 
      'description': """
- Full featured caldav system that support:
-  - alerts (create requests)
-  - recurring events (*)
-  - invitations to others people (exactly like sunbird)
+ Contains basic functionality for caldav system like:
+  - Maintenance of basic objects needed for caldav calendar
+      * Event(Meeting)
+      * Todo(Task)
+      * Reminder
+      * Attendee
+  - Availabilities of synchronisation using WebDAV
 """, 
     "author" : "Tiny", 
     'category': 'Generic Modules/Others', 
     'website': 'http://www.openerp.com', 
-    "init_xml" : [
-                   'caldav_data.xml'
-                   ], 
+    "init_xml" : ["caldav_data.xml"], 
     "demo_xml" : [], 
     "update_xml" : [
                     'security/ir.model.access.csv', 
+                    'caldav_wizard.xml', 
                     'caldav_view.xml'
                     ], 
     "installable" : True, 
diff --git a/addons/caldav/caldav.py b/addons/caldav/caldav.py
deleted file mode 100644
index 0efd4665f0d..00000000000
--- a/addons/caldav/caldav.py
+++ /dev/null
@@ -1,1284 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-from base_calendar import base_calendar
-from datetime import datetime, timedelta
-from datetime import datetime, timedelta
-from dateutil import parser
-from osv import fields, osv
-from service import web_services
-from tools.translate import _
-import base64
-import pooler
-import pytz
-import re
-import time
-import tools
-
-months = {
-        1:"January", 2:"February", 3:"March", 4:"April", \
-        5:"May", 6:"June", 7:"July", 8:"August", 9:"September", \
-        10:"October", 11:"November", 12:"December"}
-
-def caldav_id2real_id(caldav_id=None, with_date=False):
-    if caldav_id and isinstance(caldav_id, (str, unicode)):
-        res = caldav_id.split('-')
-        if len(res) >= 2:
-            real_id = res[0]
-            if with_date:
-                real_date = time.strftime("%Y-%m-%d %H:%M:%S", \
-                                 time.strptime(res[1], "%Y%m%d%H%M%S"))
-                start = datetime.strptime(real_date, "%Y-%m-%d %H:%M:%S")
-                end = start + timedelta(hours=with_date)
-                return (int(real_id), real_date, end.strftime("%Y-%m-%d %H:%M:%S"))
-            return int(real_id)
-    return caldav_id and int(caldav_id) or caldav_id
-
-def real_id2caldav_id(real_id, recurrent_date):
-    if real_id and recurrent_date:
-        recurrent_date = time.strftime("%Y%m%d%H%M%S", \
-                         time.strptime(recurrent_date, "%Y-%m-%d %H:%M:%S"))
-        return '%d-%s' % (real_id, recurrent_date)
-    return real_id
-
-
-def _links_get(self, cr, uid, context={}):
-    obj = self.pool.get('res.request.link')
-    ids = obj.search(cr, uid, [])
-    res = obj.read(cr, uid, ids, ['object', 'name'], context)
-    return [(r['object'], r['name']) for r in res]
-
-html_invitation = """
-<html>
-<head>
-<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-<title>%(name)s</title>
-</head>
-<body>
-<table border="0" cellspacing="10" cellpadding="0" width="100%%"
-    style="font-family: Arial, Sans-serif; font-size: 14">
-    <tr>
-        <td width="100%%">Hello,</td>
-    </tr>
-    <tr>
-        <td width="100%%">You are invited for <i>%(company)s</i> Event.</td>
-    </tr>
-    <tr>
-        <td width="100%%">Below are the details of event:</td>
-    </tr>
-</table>
-
-<table cellspacing="0" cellpadding="5" border="0" summary=""
-    style="width: 90%%; font-family: Arial, Sans-serif; border: 1px Solid #ccc; background-color: #f6f6f6">
-    <tr valign="center" align="center">
-        <td bgcolor="DFDFDF">
-        <h3>%(name)s</h3>
-        </td>
-    </tr>
-    <tr>
-        <td>
-        <table cellpadding="8" cellspacing="0" border="0"
-            style="font-size: 14" summary="Eventdetails" bgcolor="f6f6f6"
-            width="90%%">
-            <tr>
-                <td width="21%%">
-                <div><b>Start Date</b></div>
-                </td>
-                <td><b>:</b></td>
-                <td>%(start_date)s</td>
-                <td width="15%%">
-                <div><b>End Date</b></div>
-                </td>
-                <td><b>:</b></td>
-                <td width="25%%">%(end_date)s</td>
-            </tr>
-            <tr valign="top">
-                <td><b>Description</b></td>
-                <td><b>:</b></td>
-                <td colspan="3">%(description)s</td>
-            </tr>
-            <tr valign="top">
-                <td>
-                <div><b>Location</b></div>
-                </td>
-                <td><b>:</b></td>
-                <td colspan="3">%(location)s</td>
-            </tr>
-            <tr valign="top">
-                <td>
-                <div><b>Event Attendees</b></div>
-                </td>
-                <td><b>:</b></td>
-                <td colspan="3">
-                <div>
-                <div>%(attendees)s</div>
-                </div>
-                </td>
-            </tr>
-            <tr valign="top">
-                <td><b>Are you coming?</b></td>
-                <td><b>:</b></td>
-                <td colspan="3">
-                <UL>
-                    <LI>YES</LI>
-                    <LI>NO</LI>
-                    <LI>MAYBE</LI>
-                </UL>
-                </td>
-            </tr>
-        </table>
-        </td>
-    </tr>
-</table>
-<table border="0" cellspacing="10" cellpadding="0" width="100%%"
-    style="font-family: Arial, Sans-serif; font-size: 14">
-    <tr>
-        <td width="100%%"><b>Note:</b> If you are interested please reply this
-        mail and keep only your response from options <i>YES, NO</i>
-        and <i>MAYBE</i>.</td>
-    </tr>
-    <tr>
-        <td width="100%%">From:</td>
-    </tr>
-    <tr>
-        <td width="100%%">%(user)s</td>
-    </tr>
-    <tr valign="top">
-        <td width="100%%">-<font color="a7a7a7">-------------------------</font></td>
-    </tr>
-    <tr>
-        <td width="100%%"> <font color="a7a7a7">%(sign)s</font></td>
-    </tr>
-</table>
-</body>
-</html>
-"""
-
-class invite_attendee_wizard(osv.osv_memory):
-    _name = "caldav.invite.attendee"
-    _description = "Invite Attendees"
-
-    _columns = {
-        'type': fields.selection([('internal', 'Internal User'), \
-              ('external', 'External Email'), \
-              ('partner', 'Partner Contacts')], 'Type', required=True), 
-        'user_ids': fields.many2many('res.users', 'invite_user_rel', 
-                                  'invite_id', 'user_id', 'Users'), 
-        'partner_id': fields.many2one('res.partner', 'Partner'), 
-        'email': fields.char('Email', size=124), 
-        'contact_ids': fields.many2many('res.partner.address', 'invite_contact_rel', 
-                                  'invite_id', 'contact_id', 'Contacts'), 
-        'send_mail': fields.boolean('Send mail?', help='Check this if you want\
- to send an Email to Invited Person')
-              }
-
-    def do_invite(self, cr, uid, ids, context={}):
-        datas = self.read(cr, uid, ids)[0]
-        model = False
-        model_field = False
-        if not context or not context.get('model'):
-            return {}
-        else:
-            model = context.get('model')
-        model_field = context.get('attendee_field', False)
-        obj = self.pool.get(model)
-        res_obj = obj.browse(cr, uid, context['active_id'])
-        type = datas.get('type')
-        att_obj = self.pool.get('calendar.attendee')
-        vals = {}
-        mail_to = []
-        if not model == 'calendar.attendee':
-            vals = {'ref': '%s,%s' % (model, caldav_id2real_id(context['active_id']))}
-
-        if type == 'internal':
-            user_obj = self.pool.get('res.users')
-            for user_id in datas.get('user_ids', []):
-                user = user_obj.browse(cr, uid, user_id)
-                if not user.address_id.email:
-                    raise osv.except_osv(_('Error!'), \
-                                    ("User does not have an email Address"))
-                vals.update({'user_id': user_id, 
-                                     'email': user.address_id.email})
-                mail_to.append(user.address_id.email)
-                
-        elif  type == 'external' and datas.get('email'):
-            vals.update({'email': datas['email']})
-            mail_to.append(datas['email'])
-        elif  type == 'partner':
-            add_obj = self.pool.get('res.partner.address')
-            for contact in  add_obj.browse(cr, uid, datas['contact_ids']):
-                if not contact.email:
-                    raise osv.except_osv(_('Error!'), \
-                                    ("Partner does not have an email Address"))
-                vals.update({
-                             'partner_address_id': contact.id, 
-                             'email': contact.email})
-                mail_to.append(contact.email)
-
-        if model == 'calendar.attendee':
-            att = att_obj.browse(cr, uid, context['active_id'])
-            vals.update({
-                'parent_ids' : [(4, att.id)],
-                'ref': att.ref
-            })
-        att_id = att_obj.create(cr, uid, vals)
-        if model_field:
-            obj.write(cr, uid, res_obj.id, {model_field: [(4, att_id)]})
-        
-        if datas.get('send_mail'):
-            att_obj._send_mail(cr, uid, [att_id], mail_to, \
-                   email_from=tools.config.get('email_from', False))
-                
-        return {}
-
-
-    def onchange_partner_id(self, cr, uid, ids, partner_id, *args, **argv):
-        if not partner_id:
-            return {'value': {'contact_ids': []}}
-        cr.execute('select id from res_partner_address \
-                         where partner_id=%s' % (partner_id))
-        contacts = map(lambda x: x[0], cr.fetchall())
-        if not contacts:
-            raise osv.except_osv(_('Error!'), \
-                                ("Partner does not have any Contacts"))
-
-        return {'value': {'contact_ids': contacts}}
-
-invite_attendee_wizard()
-
-class calendar_attendee(osv.osv):
-    _name = 'calendar.attendee'
-    _description = 'Attendee information'
-    _rec_name = 'cutype'
-
-    __attribute__ = {}
-
-    def _get_address(self, name=None, email=None):
-        if name and email:
-            name += ':'
-        return (name or '') + (email and ('MAILTO:' + email) or '')
-
-    def _compute_data(self, cr, uid, ids, name, arg, context):
-        name = name[0]
-        result = {}
-
-        for attdata in self.browse(cr, uid, ids, context=context):
-            id = attdata.id
-            result[id] = {}
-            if name == 'sent_by':
-                if not attdata.sent_by_uid:
-                    result[id][name] = ''
-                    continue
-                else:
-                    result[id][name] =  self._get_address(attdata.sent_by_uid.name, \
-                                        attdata.sent_by_uid.address_id.email)
-            if name == 'cn':
-                if attdata.user_id:
-                    result[id][name] = self._get_address(attdata.user_id.name, attdata.email)
-                elif attdata.partner_address_id:
-                    result[id][name] = self._get_address(attdata.partner_id.name, attdata.email)
-                else:
-                    result[id][name] = self._get_address(None, attdata.email)
-            if name == 'delegated_to':
-                todata = []
-                for parent in attdata.parent_ids:
-                    todata.append('MAILTO:' + parent.email)
-                result[id][name] = ', '.join(todata)
-            if name == 'delegated_from':
-                fromdata = []
-                for child in attdata.child_ids:
-                    fromdata.append('MAILTO:' + child.email)
-                result[id][name] = ', '.join(fromdata)
-            if name == 'event_date':
-                if attdata.ref:
-                    model, res_id = tuple(attdata.ref.split(','))
-                    model_obj = self.pool.get(model)
-                    obj = model_obj.read(cr, uid, res_id, ['date'])[0]
-                    result[id][name] = obj.get('date')
-                else:
-                    result[id][name] = False
-            if name == 'event_end_date':
-                if attdata.ref:
-                    model, res_id = tuple(attdata.ref.split(','))
-                    model_obj = self.pool.get(model)
-                    obj = model_obj.read(cr, uid, res_id, ['date_deadline'])[0]
-                    result[id][name] = obj.get('date_deadline')
-                else:
-                    result[id][name] = False
-            if name == 'sent_by_uid':
-                if attdata.ref:
-                    model, res_id = tuple(attdata.ref.split(','))
-                    model_obj = self.pool.get(model)
-                    obj = model_obj.read(cr, uid, res_id, ['user_id'])[0]
-                    result[id][name] = obj.get('user_id')
-                else:
-                    result[id][name] = uid
-            if name == 'language':
-                user_obj = self.pool.get('res.users')
-                lang = user_obj.read(cr, uid, uid, ['context_lang'])['context_lang']
-                result[id][name] = lang.replace('_', '-')
-        return result
-
-    def _links_get(self, cr, uid, context={}):
-        obj = self.pool.get('res.request.link')
-        ids = obj.search(cr, uid, [])
-        res = obj.read(cr, uid, ids, ['object', 'name'], context)
-        return [(r['object'], r['name']) for r in res]
-
-    def _lang_get(self, cr, uid, context={}):
-        obj = self.pool.get('res.lang')
-        ids = obj.search(cr, uid, [])
-        res = obj.read(cr, uid, ids, ['code', 'name'], context)
-        res = [((r['code']).replace('_', '-'), r['name']) for r in res]
-        return res
-
-    _columns = {
-        'cutype': fields.selection([('individual', 'Individual'), \
-                    ('group', 'Group'), ('resource', 'Resource'), \
-                    ('room', 'Room'), ('unknown', '') ], \
-                    'Invite Type', help="Specify the type of Invitation"), 
-        'member': fields.char('Member', size=124, 
-                    help="Indicate the groups that the attendee belongs to"), 
-        'role': fields.selection([('req-participant', 'Participation required'), \
-                    ('chair', 'Chair Person'), \
-                    ('opt-participant', 'Optional Participation'), \
-                    ('non-participant', 'For information Purpose')], 'Role', \
-                    help='Participation role for the calendar user'), 
-        'state': fields.selection([('tentative', 'Tentative'), 
-                        ('needs-action', 'Needs Action'), 
-                        ('accepted', 'Accepted'), 
-                        ('declined', 'Declined'), 
-                        ('delegated', 'Delegated')], 'State', readonly=True, 
-                        help="Status of the attendee's participation"), 
-        'rsvp':  fields.boolean('Required Reply?', 
-                    help="Indicats whether the favor of a reply is requested"), 
-        'delegated_to': fields.function(_compute_data, method=True, \
-                string='Delegated To', type="char", size=124, store=True, \
-                multi='delegated_to', help="The users that the original \
-request was delegated to"),         
-        'delegated_from': fields.function(_compute_data, method=True, string=\
-            'Delegated From', type="char", store=True, size=124, multi='delegated_from'),        
-        'parent_ids': fields.many2many('calendar.attendee', 'calendar_attendee_parent_rel', 'attendee_id', 'parent_id', 'Delegrated From'),
-        'child_ids': fields.many2many('calendar.attendee', 'calendar_attendee_child_rel', 'attendee_id', 'child_id', 'Delegrated To'),  
-        'sent_by': fields.function(_compute_data, method=True, string='Sent By', type="char", multi='sent_by', store=True, size=124, help="Specify the user that is acting on behalf of the calendar user"), 
-        'sent_by_uid': fields.function(_compute_data, method=True, string='Sent By User', type="many2one", relation="res.users", multi='sent_by_uid'), 
-        'cn': fields.function(_compute_data, method=True, string='Common name', type="char", size=124, multi='cn', store=True), 
-        'dir': fields.char('URI Reference', size=124, help="Reference to the URI that points to the directory information corresponding to the attendee."), 
-        'language':  fields.function(_compute_data, method=True, string='Language', type="selection", selection=_lang_get, multi='language', store=True, help="To specify the language for text values in a property or property parameter."), 
-        'user_id': fields.many2one('res.users', 'User'), 
-        'partner_address_id': fields.many2one('res.partner.address', 'Contact'), 
-        'partner_id': fields.related('partner_address_id', 'partner_id', type='many2one', relation='res.partner', string='Partner'), 
-        'email': fields.char('Email', size=124, required=True, help="Email of Invited Person"), 
-        'event_date': fields.function(_compute_data, method=True, string='Event Date', type="datetime", multi='event_date'), 
-        'event_end_date': fields.function(_compute_data, method=True, string='Event End Date', type="datetime", multi='event_end_date'), 
-        'ref': fields.reference('Event Ref', selection=_links_get, size=128), 
-        'availability': fields.selection([('free', 'Free'), ('busy', 'Busy')], 'Free/Busy', readonly="True"), 
-     }
-    _defaults = {
-        'state':  lambda *x: 'needs-action', 
-    }
-    
-    response_re = response_re = re.compile("Are you coming\?.*\n*.*(YES|NO|MAYBE).*", re.UNICODE)
-    
-    def msg_new(self, cr, uid, msg):        
-        return False
-        
-    def msg_act_get(self, msg):
-        mailgate_obj = self.pool.get('mail.gateway')
-        body = mailgate_obj.msg_body_get(msg)
-        actions = {}
-        res = self.response_re.findall(body['body'])
-        if res:
-                actions['state'] = res[0]
-        return actions
-
-    def msg_update(self, cr, uid, ids, msg, data={}, default_act='None'):
-        msg_actions = self.msg_act_get(msg)
-        if msg_actions.get('state'):
-            if msg_actions['state'] in ['YES', 'NO', 'MAYBE']:
-                mapping = {'YES': 'accepted', 'NO': 'declined', 'MAYBE': 'tentative'}
-                status = mapping[msg_actions['state']]
-                print 'Got response for invitation id: %s as %s'  % (ids, status)
-                self.write(cr, uid, ids, {'state': status})
-        return True
-
-    def _send_mail(self, cr, uid, ids, mail_to, email_from=tools.config.get('email_from', False), context={}):
-        company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.name
-        for att in self.browse(cr, uid, ids, context=context):
-            sign = att.sent_by_uid and att.sent_by_uid.signature or ''
-            sign = '<br>'.join(sign and sign.split('\n') or [])
-            model, res_id = tuple(att.ref.split(','))            
-            res_obj = self.pool.get(model).browse(cr, uid, res_id)
-            if res_obj and len(res_obj):
-                res_obj = res_obj[0]
-            sub = '[%s Invitation][%d] %s'  % (company, att.id, res_obj.name)
-            att_infos = []
-            other_invitaion_ids = self.search(cr, uid, [('ref','=',att.ref)])
-            for att2 in self.browse(cr, uid, other_invitaion_ids):
-                att_infos.append(((att2.user_id and att2.user_id.name) or \
-                             (att2.partner_id and att2.partner_id.name) or \
-                                att2.email) +  ' - Status: ' + att2.state.title())
-            body_vals = {'name': res_obj.name, 
-                        'start_date': res_obj.date, 
-                        'end_date': res_obj.date_deadline or False, 
-                        'description': res_obj.description or '-', 
-                        'location': res_obj.location or '-', 
-                        'attendees': '<br>'.join(att_infos), 
-                        'user': res_obj.user_id and res_obj.user_id.name or 'OpenERP User', 
-                        'sign': sign, 
-                        'company': company
-            }
-            body = html_invitation % body_vals
-            if mail_to and email_from:
-                tools.email_send(
-                        email_from, 
-                        mail_to, 
-                        sub, 
-                        body, 
-                        subtype='html', 
-                        reply_to=email_from
-                    ) 
-            return True
-    def onchange_user_id(self, cr, uid, ids, user_id, *args, **argv):
-        if not user_id:
-            return {'value': {'email': ''}}
-        usr_obj = self.pool.get('res.users')
-        user = usr_obj.browse(cr, uid, user_id, *args)
-        return {'value': {'email': user.address_id.email, 'availability':user.availability}}
-
-    def do_tentative(self, cr, uid, ids, context=None, *args):
-        self.write(cr, uid, ids, {'state': 'tentative'}, context)
-
-    def do_accept(self, cr, uid, ids, context=None, *args):
-        self.write(cr, uid, ids, {'state': 'accepted'}, context)
-
-    def do_decline(self, cr, uid, ids, context=None, *args):
-        self.write(cr, uid, ids, {'state': 'declined'}, context)
-
-    def create(self, cr, uid, vals, context={}):
-        if not vals.get("email") and vals.get("cn"):
-            cnval = vals.get("cn").split(':')
-            email =  filter(lambda x:x.__contains__('@'), cnval)
-            vals['email'] = email[0]
-            vals['cn'] = vals.get("cn")
-        res = super(calendar_attendee, self).create(cr, uid, vals, context)
-        return res
-    
-calendar_attendee()
-
-class res_alarm(osv.osv):
-    _name = 'res.alarm'
-    _description = 'Basic Alarm Information'
-    _columns = {
-        'name':fields.char('Name', size=256, required=True), 
-        'trigger_occurs': fields.selection([('before', 'Before'), ('after', 'After')], \
-                                        'Triggers', required=True), 
-        'trigger_interval': fields.selection([('minutes', 'Minutes'), ('hours', 'Hours'), \
-                ('days', 'Days')], 'Interval', required=True), 
-        'trigger_duration':  fields.integer('Duration', required=True), 
-        'trigger_related':  fields.selection([('start', 'The event starts'), ('end', \
-                                       'The event ends')], 'Related to', required=True), 
-        'duration': fields.integer('Duration', help="""Duration' and 'Repeat' \
-are both optional, but if one occurs, so MUST the other"""), 
-        'repeat': fields.integer('Repeat'), 
-        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the event alarm information without removing it."), 
-
-
-    }
-    _defaults = {
-        'trigger_interval':  lambda *x: 'minutes', 
-        'trigger_duration': lambda *x: 5, 
-        'trigger_occurs': lambda *x: 'before', 
-        'trigger_related': lambda *x: 'start', 
-        'active': lambda *x: 1, 
-    }
-
-    def do_alarm_create(self, cr, uid, ids, model, date, context={}):
-        alarm_obj = self.pool.get('calendar.alarm')
-        ir_obj = self.pool.get('ir.model')
-        model_id = ir_obj.search(cr, uid, [('model', '=', model)])[0]
-        
-        model_obj = self.pool.get(model)
-        for data in model_obj.browse(cr, uid, ids):
-            basic_alarm = data.alarm_id
-            if not context.get('alarm_id'):
-                self.do_alarm_unlink(cr, uid, [data.id], model)
-                return True
-            self.do_alarm_unlink(cr, uid, [data.id], model)
-            if basic_alarm:
-                vals = {
-                    'action': 'display', 
-                    'description': data.description, 
-                    'name': data.name, 
-                    'attendee_ids': [(6, 0, map(lambda x:x.id, data.attendee_ids))], 
-                    'trigger_related': basic_alarm.trigger_related, 
-                    'trigger_duration': basic_alarm.trigger_duration, 
-                    'trigger_occurs': basic_alarm.trigger_occurs, 
-                    'trigger_interval': basic_alarm.trigger_interval, 
-                    'duration': basic_alarm.duration, 
-                    'repeat': basic_alarm.repeat, 
-                    'state': 'run', 
-                    'event_date': data[date], 
-                    'res_id': data.id, 
-                    'model_id': model_id, 
-                    'user_id': uid
-                 }
-                alarm_id = alarm_obj.create(cr, uid, vals)
-                cr.execute('Update %s set caldav_alarm_id=%s, alarm_id=%s \
-                                        where id=%s' % (model_obj._table, \
-                                        alarm_id, basic_alarm.id, data.id))
-        cr.commit()
-        return True
-
-    def do_alarm_unlink(self, cr, uid, ids, model, context={}):
-        alarm_obj = self.pool.get('calendar.alarm')
-        ir_obj = self.pool.get('ir.model')
-        model_id = ir_obj.search(cr, uid, [('model', '=', model)])[0]
-        model_obj = self.pool.get(model)
-        for datas in model_obj.browse(cr, uid, ids):
-            alarm_ids = alarm_obj.search(cr, uid, [('model_id', '=', model_id), ('res_id', '=', datas.id)])
-            if alarm_ids:
-                alarm_obj.unlink(cr, uid, alarm_ids)
-                cr.execute('Update %s set caldav_alarm_id=NULL, alarm_id=NULL\
-                             where id=%s' % (model_obj._table, datas.id))
-        cr.commit()
-        return True
-
-res_alarm()
-
-class calendar_alarm(osv.osv):
-    _name = 'calendar.alarm'
-    _description = 'Event alarm information'
-    _inherit = 'res.alarm'
-    __attribute__ = {}
-
-    _columns = {
-            'alarm_id': fields.many2one('res.alarm', 'Basic Alarm', ondelete='cascade'), 
-            'name': fields.char('Summary', size=124, help="""Contains the text to be used as the message subject for email
-or contains the text to be used for display"""), 
-            'action': fields.selection([('audio', 'Audio'), ('display', 'Display'), \
-                    ('procedure', 'Procedure'), ('email', 'Email') ], 'Action', \
-                    required=True, help="Defines the action to be invoked when an alarm is triggered"), 
-            'description': fields.text('Description', help='Provides a more complete description of the calendar component, than that provided by the "SUMMARY" property'), 
-            'attendee_ids': fields.many2many('calendar.attendee', 'alarm_attendee_rel', \
-                                          'alarm_id', 'attendee_id', 'Attendees', readonly=True), 
-            'attach': fields.binary('Attachment', help="""* Points to a sound resource, which is rendered when the alarm is triggered for audio,
-* File which is intended to be sent as message attachments for email,
-* Points to a procedure resource, which is invoked when the alarm is triggered for procedure."""), 
-            'res_id': fields.integer('Resource ID'), 
-            'model_id': fields.many2one('ir.model', 'Model'), 
-            'user_id': fields.many2one('res.users', 'Owner'), 
-            'event_date': fields.datetime('Event Date'), 
-            'event_end_date': fields.datetime('Event End Date'), 
-            'trigger_date': fields.datetime('Trigger Date', readonly="True"), 
-            'state':fields.selection([
-                        ('draft', 'Draft'), 
-                        ('run', 'Run'), 
-                        ('stop', 'Stop'), 
-                        ('done', 'Done'), 
-                    ], 'State', select=True, readonly=True), 
-     }
-
-    _defaults = {
-        'action':  lambda *x: 'email', 
-        'state': lambda *x: 'run', 
-     }
-
-    def create(self, cr, uid, vals, context={}):
-        event_date = vals.get('event_date', False)
-        if event_date:
-            dtstart = datetime.strptime(vals['event_date'], "%Y-%m-%d %H:%M:%S")
-            if vals['trigger_interval'] == 'days':
-                delta = timedelta(days=vals['trigger_duration'])
-            if vals['trigger_interval'] == 'hours':
-                delta = timedelta(hours=vals['trigger_duration'])
-            if vals['trigger_interval'] == 'minutes':
-                delta = timedelta(minutes=vals['trigger_duration'])
-            trigger_date =  dtstart + (vals['trigger_occurs'] == 'after' and delta or -delta)
-            vals['trigger_date'] = trigger_date
-        res = super(calendar_alarm, self).create(cr, uid, vals, context)
-        return res
-
-    def do_run_scheduler(self, cr, uid, automatic=False, use_new_cursor=False,\
-                       context=None):
-        if not context:
-            context = {}
-        current_datetime = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
-        cr.execute("select alarm.id as id \
-                    from calendar_alarm alarm \
-                    where alarm.state = %s and alarm.trigger_date <= %s", ('run', current_datetime))
-        res = cr.dictfetchall()
-        alarm_ids = map(lambda x: x['id'], res)
-        attendee_obj = self.pool.get('calendar.attendee')
-        request_obj = self.pool.get('res.request')
-        mail_to = []
-        for alarm in self.browse(cr, uid, alarm_ids):
-            if alarm.action == 'display':
-                value = {
-                   'name': alarm.name, 
-                   'act_from': alarm.user_id.id, 
-                   'act_to': alarm.user_id.id, 
-                   'body': alarm.description, 
-                   'trigger_date': alarm.trigger_date, 
-                   'ref_doc1':  '%s,%s'  % (alarm.model_id.model, alarm.res_id)
-                }
-                request_id = request_obj.create(cr, uid, value)
-                request_ids = [request_id]
-                for attendee in alarm.attendee_ids:
-                    value['act_to'] = attendee.user_id.id
-                    request_id = request_obj.create(cr, uid, value)
-                    request_ids.append(request_id)
-                request_obj.request_send(cr, uid, request_ids)
-
-            if alarm.action == 'email':
-                sub = '[Openobject Remainder] %s'  % (alarm.name)
-                body = """
-                Name: %s
-                Date: %s
-                Description: %s
-
-                From:
-                      %s
-                      %s
-
-                """  % (alarm.name, alarm.trigger_date, alarm.description, \
-                    alarm.user_id.name, alarm.user_id.signature)
-                mail_to = [alarm.user_id.address_id.email]
-                for att in alarm.attendee_ids:
-                    mail_to.append(att.user_id.address_id.email)
-                if mail_to:
-                    tools.email_send(
-                        tools.config.get('email_from', False), 
-                        mail_to, 
-                        sub, 
-                        body
-                    )
-            self.write(cr, uid, [alarm.id], {'state':'done'})
-        return True
-
-calendar_alarm()
-
-
-class calendar_event(osv.osv):
-    _name = "calendar.event"
-    _description = "Calendar Event"
-    __attribute__ = {}
-    
-    def _tz_get(self, cr, uid, context={}):
-        return [(x.lower(), x) for x in pytz.all_timezones]
-
-    def onchange_rrule_type(self, cr, uid, ids, rtype, *args, **argv):
-        if rtype == 'none' or not rtype:
-            return {'value': {'rrule': ''}}
-        if rtype == 'custom':
-            return {}
-        rrule = self.pool.get('calendar.custom.rrule')
-        rrulestr = rrule.compute_rule_string(cr, uid, {'freq': rtype.upper(), \
-                                 'interval': 1})
-        return {'value': {'rrule': rrulestr}}
-    
-    def _get_duration(self, cr, uid, ids, name, arg, context):
-        res = {}
-        for event in self.browse(cr, uid, ids, context=context):
-            start = datetime.strptime(event.date, "%Y-%m-%d %H:%M:%S")
-            res[event.id] = 0
-            if event.date_deadline:
-                end = datetime.strptime(event.date_deadline[:19], "%Y-%m-%d %H:%M:%S")
-                diff = end - start
-                duration =  float(diff.days)* 24 + (float(diff.seconds) / 3600)
-                res[event.id] = round(duration, 2)
-        return res
-
-    def _set_duration(self, cr, uid, id, name, value, arg, context):
-        event = self.browse(cr, uid, id, context=context)
-        start = datetime.strptime(event.date, "%Y-%m-%d %H:%M:%S")
-        end = start + timedelta(hours=value)
-        cr.execute("UPDATE %s set date_deadline='%s' \
-                        where id=%s"% (self._table, end.strftime("%Y-%m-%d %H:%M:%S"), id))
-        return True
-    
-    _columns = {
-        'id': fields.integer('ID'), 
-        'sequence': fields.integer('Sequence'), 
-        'name': fields.char('Description', size=64, required=True), 
-        'date': fields.datetime('Date'), 
-        'date_deadline': fields.datetime('Deadline'), 
-        'create_date': fields.datetime('Created', readonly=True), 
-        'duration': fields.function(_get_duration, method=True, \
-                                    fnct_inv=_set_duration, string='Duration'), 
-        'description': fields.text('Your action'), 
-        'class': fields.selection([('public', 'Public'), ('private', 'Private'), \
-                 ('confidential', 'Confidential')], 'Mark as'), 
-        'location': fields.char('Location', size=264, help="Location of Event"), 
-        'show_as': fields.selection([('free', 'Free'), \
-                                  ('busy', 'Busy')], 
-                                   'Show as'), 
-        'caldav_url': fields.char('Caldav URL', size=264), 
-        'exdate': fields.text('Exception Date/Times', help="This property \
-defines the list of date/time exceptions for arecurring calendar component."), 
-        'exrule': fields.char('Exception Rule', size=352, help="defines a \
-rule or repeating pattern for anexception to a recurrence set"), 
-        'rrule': fields.char('Recurrent Rule', size=124), 
-        'rrule_type': fields.selection([('none', ''), ('daily', 'Daily'), \
-                            ('weekly', 'Weekly'), ('monthly', 'Monthly'), \
-                            ('yearly', 'Yearly'), ('custom', 'Custom')], 'Recurrency'), 
-        'alarm_id': fields.many2one('res.alarm', 'Alarm'), 
-        'caldav_alarm_id': fields.many2one('calendar.alarm', 'Alarm'), 
-        'recurrent_uid': fields.integer('Recurrent ID'), 
-        'recurrent_id': fields.datetime('Recurrent ID date'), 
-        'vtimezone': fields.selection(_tz_get, 'Timezone', size=64), 
-        'user_id': fields.many2one('res.users', 'Responsible'),        
-    }
-    
-    _defaults = {
-         'class': lambda *a: 'public', 
-         'show_as': lambda *a: 'busy', 
-    }
-    
-    def onchange_user_id(self, cr, uid, ids, user_id, *args, **argv):
-        if not user_id:
-            return {'value': {'vtimezone': False}}
-        value = {'vtimezone': False}
-        cr.execute('select context_tz from res_users where id=%s' % (user_id))
-        timezone = cr.fetchone()[0]
-        if timezone:
-            value.update({'vtimezone': timezone.lower()})
-        return {'value': value}
-
-    def export_cal(self, cr, uid, ids, context={}):
-        ids = map(lambda x: caldav_id2real_id(x), ids)
-        event_data = self.read(cr, uid, ids)
-        event_obj = self.pool.get('basic.calendar.event')
-        ical = event_obj.export_cal(cr, uid, event_data, context={'model': self._name})
-        return ical.serialize()
-
-    def import_cal(self, cr, uid, data, data_id=None, context={}):
-        event_obj = self.pool.get('basic.calendar.event')
-        vals = event_obj.import_cal(cr, uid, data, context=context)
-        return self.check_import(cr, uid, vals, context=context)
-    
-    def check_import(self, cr, uid, vals, context={}):
-        ids = []
-        for val in vals:
-            exists, r_id = base_calendar.uid2openobjectid(cr, val['id'], \
-                                    self._name, val.get('recurrent_id'))
-            if val.has_key('create_date'): val.pop('create_date')
-            val['caldav_url'] = context.get('url') or ''
-            val.pop('id')
-            if exists and r_id:
-                val.update({'recurrent_uid': exists})
-                self.write(cr, uid, [r_id], val)
-                ids.append(r_id)
-            elif exists:
-                self.write(cr, uid, [exists], val)
-                ids.append(exists)
-            else:
-                event_id = self.create(cr, uid, val)
-                ids.append(event_id)
-        return ids
-        
-    def modify_this(self, cr, uid, ids, defaults, context=None, *args):
-        datas = self.read(cr, uid, ids[0], context=context)
-        date = datas.get('date')
-        defaults.update({
-               'recurrent_uid': caldav_id2real_id(datas['id']), 
-               'recurrent_id': defaults.get('date'), 
-               'rrule_type': 'none', 
-               'rrule': ''
-                    })
-        new_id = self.copy(cr, uid, ids[0], default=defaults, context=context)
-        return new_id
-
-    def get_recurrent_ids(self, cr, uid, select, base_start_date, base_until_date, limit=100):
-        if not limit:
-            limit = 100
-        if isinstance(select, (str, int, long)):
-            ids = [select]
-        else:
-            ids = select
-        result = []
-        if ids and (base_start_date or base_until_date):
-            cr.execute("select m.id, m.rrule, m.date, m.date_deadline, \
-                            m.exdate  from "  + self._table + \
-                            " m where m.id in ("\
-                            + ','.join(map(lambda x: str(x), ids))+")")
-
-            count = 0
-            for data in cr.dictfetchall():
-                start_date = base_start_date and datetime.strptime(base_start_date, "%Y-%m-%d") or False
-                until_date = base_until_date and datetime.strptime(base_until_date, "%Y-%m-%d") or False
-                if count > limit:
-                    break
-                event_date = datetime.strptime(data['date'], "%Y-%m-%d %H:%M:%S")
-                if start_date and start_date <= event_date:
-                    start_date = event_date
-                if not data['rrule']:
-                    if start_date and (event_date < start_date):
-                        continue
-                    if until_date and (event_date > until_date):
-                        continue
-                    idval = real_id2caldav_id(data['id'], data['date'])
-                    result.append(idval)
-                    count += 1
-                else:
-                    exdate = data['exdate'] and data['exdate'].split(',') or []
-                    event_obj = self.pool.get('basic.calendar.event')
-                    rrule_str = data['rrule']
-                    new_rrule_str = []
-                    rrule_until_date = False
-                    is_until = False
-                    for rule in rrule_str.split(';'):
-                        name, value = rule.split('=')
-                        if name == "UNTIL":
-                            is_until = True
-                            value = parser.parse(value)
-                            rrule_until_date = parser.parse(value.strftime("%Y-%m-%d"))
-                            if until_date and until_date >= rrule_until_date:
-                                until_date = rrule_until_date
-                            if until_date:
-                                value = until_date.strftime("%Y%m%d%H%M%S")
-                        new_rule = '%s=%s' % (name, value)
-                        new_rrule_str.append(new_rule)
-                    if not is_until and until_date:
-                        value = until_date.strftime("%Y%m%d%H%M%S")
-                        name = "UNTIL"
-                        new_rule = '%s=%s' % (name, value)
-                        new_rrule_str.append(new_rule)
-                    new_rrule_str = ';'.join(new_rrule_str)
-                    start_date = datetime.strptime(data['date'], "%Y-%m-%d %H:%M:%S")
-                    rdates = event_obj.get_recurrent_dates(str(new_rrule_str), exdate, start_date)
-                    for rdate in rdates:
-                        r_date = datetime.strptime(rdate, "%Y-%m-%d %H:%M:%S")
-                        if start_date and r_date < start_date:
-                            continue
-                        if until_date and r_date > until_date:
-                            continue
-                        idval = real_id2caldav_id(data['id'], rdate)
-                        result.append(idval)
-                        count += 1
-        if result:
-            ids = result
-        if isinstance(select, (str, int, long)):
-            return ids and ids[0] or False
-        return ids
-
-    def search(self, cr, uid, args, offset=0, limit=100, order=None, 
-            context=None, count=False):
-        args_without_date = []
-        start_date = False
-        until_date = False
-        for arg in args:
-            if arg[0] not in ('date', unicode('date')):
-                args_without_date.append(arg)
-            else:
-                if arg[1] in ('>', '>='):
-                    start_date = arg[2]
-                elif arg[1] in ('<', '<='):
-                    until_date = arg[2]
-        res = super(calendar_event, self).search(cr, uid, args_without_date, \
-                                 offset, limit, order, context, count)
-        return self.get_recurrent_ids(cr, uid, res, start_date, until_date, limit)
-
-
-    def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
-        if not context:
-            context = {}
-        if isinstance(ids, (str, int, long)):
-            select = [ids]
-        else:
-            select = ids
-        new_ids = []
-        for id in select:
-            id = caldav_id2real_id(id)
-            if not id in new_ids:
-                new_ids.append(id)
-        res = super(calendar_event, self).write(cr, uid, new_ids, vals, context=context)
-        if vals.has_key('alarm_id') or vals.has_key('caldav_alarm_id'):
-            alarm_obj = self.pool.get('res.alarm')
-            context.update({'alarm_id': vals.get('alarm_id')})
-            alarm_obj.do_alarm_create(cr, uid, new_ids, self._name, 'date', context=context)
-        return res
-
-    def browse(self, cr, uid, ids, context=None, list_class=None, fields_process={}):
-        if isinstance(ids, (str, int, long)):
-            select = [ids]
-        else:
-            select = ids
-        select = map(lambda x: caldav_id2real_id(x), select)
-        res = super(calendar_event, self).browse(cr, uid, select, context, list_class, fields_process)
-        if isinstance(ids, (str, int, long)):
-            return res and res[0] or False
-        return res
-
-    def read(self, cr, uid, ids, fields=None, context={}, load='_classic_read'):
-        if isinstance(ids, (str, int, long)):
-            select = [ids]
-        else:
-            select = ids
-        select = map(lambda x: (x, caldav_id2real_id(x)), select)
-        result = []
-        if fields and 'date' not in fields:
-            fields.append('date')
-        for caldav_id, real_id in select:
-            res = super(calendar_event, self).read(cr, uid, real_id, fields=fields, context=context, \
-                                              load=load)
-            ls = caldav_id2real_id(caldav_id, with_date=res.get('duration', 0))
-            if not isinstance(ls, (str, int, long)) and len(ls) >= 2:
-                res['date'] = ls[1]
-                res['date_deadline'] = ls[2]
-            res['id'] = caldav_id
-
-            result.append(res)
-        if isinstance(ids, (str, int, long)):
-            return result and result[0] or False
-        return result
-
-    def copy(self, cr, uid, id, default=None, context={}):
-        res = super(calendar_event, self).copy(cr, uid, caldav_id2real_id(id), default, context)
-        alarm_obj = self.pool.get('res.alarm')
-        alarm_obj.do_alarm_create(cr, uid, [res], self._name, 'date')
-        return res
-
-    def unlink(self, cr, uid, ids, context=None):
-        res = False
-        for id in ids:
-            ls = caldav_id2real_id(id)
-            if not isinstance(ls, (str, int, long)) and len(ls) >= 2:
-                date_new = ls[1]
-                for record in self.read(cr, uid, [caldav_id2real_id(id)], \
-                                            ['date', 'rrule', 'exdate']):
-                    if record['rrule']:
-                        exdate = (record['exdate'] and (record['exdate'] + ',')  or '') + ''.join((re.compile('\d')).findall(date_new)) + 'Z'
-                        if record['date'] == date_new:
-                            res = self.write(cr, uid, [caldav_id2real_id(id)], {'exdate': exdate})
-                    else:
-                        ids = map(lambda x: caldav_id2real_id(x), ids)
-                        res = super(calendar_event, self).unlink(cr, uid, caldav_id2real_id(ids))
-                        alarm_obj = self.pool.get('res.alarm')
-                        alarm_obj.do_alarm_unlink(cr, uid, ids, self._name)
-            else:
-                ids = map(lambda x: caldav_id2real_id(x), ids)
-                res = super(calendar_event, self).unlink(cr, uid, ids)
-                alarm_obj = self.pool.get('res.alarm')
-                alarm_obj.do_alarm_unlink(cr, uid, ids, self._name)
-        return res
-
-    def create(self, cr, uid, vals, context={}):
-        res = super(calendar_event, self).create(cr, uid, vals, context)
-        alarm_obj = self.pool.get('res.alarm')
-        alarm_obj.do_alarm_create(cr, uid, [res], self._name, 'date')
-        return res
-
-calendar_event()
-
-class calendar_todo(osv.osv):
-    _name = "calendar.todo"
-    _inherit = "calendar.event"
-    _description = "Calendar Task"
-
-    def _get_date(self, cr, uid, ids, name, arg, context):
-        res = {}
-        for event in self.browse(cr, uid, ids, context=context):
-            res[event.id] = event.date_start
-        return res
-
-    def _set_date(self, cr, uid, id, name, value, arg, context):
-        event = self.browse(cr, uid, id, context=context)
-        cr.execute("UPDATE %s set date_start='%s' where id=%s"  \
-                           % (self._table, value, id))
-        return True
-
-    _columns = {
-        'date': fields.function(_get_date, method=True, fnct_inv=_set_date, \
-                                        string='Duration', store=True, type='datetime'), 
-        'duration': fields.integer('Duration'), 
-    }
-    
-    __attribute__ = {}
-    
-    def import_cal(self, cr, uid, data, data_id=None, context={}):
-        todo_obj = self.pool.get('basic.calendar.todo')
-        vals = todo_obj.import_cal(cr, uid, data, context=context)
-        return self.check_import(cr, uid, vals, context=context)
-    
-    def check_import(self, cr, uid, vals, context={}):
-        ids = []
-        for val in vals:
-            obj_tm = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.project_time_mode_id
-            if not val.has_key('planned_hours'):
-                # 'Computes duration' in days
-                plan = 0.0
-                if val.get('date') and  val.get('date_deadline'):
-                    start = datetime.strptime(val['date'], '%Y-%m-%d %H:%M:%S')
-                    end = datetime.strptime(val['date_deadline'], '%Y-%m-%d %H:%M:%S')
-                    diff = end - start
-                    plan = (diff.seconds/float(86400) + diff.days) * obj_tm.factor
-                val['planned_hours'] = plan
-            else:
-                # Converts timedelta into hours
-                hours = (val['planned_hours'].seconds / float(3600)) + \
-                                        (val['planned_hours'].days * 24)
-                val['planned_hours'] = hours
-            exists, r_id = base_calendar.uid2openobjectid(cr, val['id'], self._name, val.get('recurrent_id'))
-            val.pop('id')
-            if exists:
-                self.write(cr, uid, [exists], val)
-                ids.append(exists)
-            else:
-                task_id = self.create(cr, uid, val)
-                ids.append(task_id)
-        return ids
-        
-    def export_cal(self, cr, uid, ids, context={}):
-        task_datas = self.read(cr, uid, ids, [], context ={'read': True})
-        tasks = []
-        for task in task_datas:
-            if task.get('planned_hours', None) and task.get('date_deadline', None):
-                task.pop('planned_hours')
-            tasks.append(task)
-        todo_obj = self.pool.get('basic.calendar.todo')
-        ical = todo_obj.export_cal(cr, uid, tasks, context={'model': self._name})
-        calendar_val = ical.serialize()
-        calendar_val = calendar_val.replace('"', '').strip()
-        return calendar_val
-
-calendar_todo()
- 
-class ir_attachment(osv.osv):
-    _name = 'ir.attachment'
-    _inherit = 'ir.attachment'
-
-    def search_count(self, cr, user, args, context=None):
-        args1 = []
-        for arg in args:
-            args1.append(map(lambda x:str(x).split('-')[0], arg))
-        return super(ir_attachment, self).search_count(cr, user, args1, context)
-
-    def search(self, cr, uid, args, offset=0, limit=None, order=None, 
-            context=None, count=False):
-        new_args = args
-        for i, arg in enumerate(new_args):
-            if arg[0] == 'res_id':
-                new_args[i] = (arg[0], arg[1], caldav_id2real_id(arg[2]))
-        return super(ir_attachment, self).search(cr, uid, new_args, offset=offset, 
-                            limit=limit, order=order, 
-                            context=context, count=False)
-ir_attachment()
-
-class ir_values(osv.osv):
-    _inherit = 'ir.values'
-
-    def set(self, cr, uid, key, key2, name, models, value, replace=True, \
-            isobject=False, meta=False, preserve_user=False, company=False):
-        new_model = []
-        for data in models:
-            if type(data) in (list, tuple):
-                new_model.append((data[0], caldav_id2real_id(data[1])))
-            else:
-                new_model.append(data)
-        return super(ir_values, self).set(cr, uid, key, key2, name, new_model,\
-                    value, replace, isobject, meta, preserve_user, company)
-
-    def get(self, cr, uid, key, key2, models, meta=False, context={}, \
-             res_id_req=False, without_user=True, key2_req=True):
-        new_model = []
-        for data in models:
-            if type(data) in (list, tuple):
-                new_model.append((data[0], caldav_id2real_id(data[1])))
-            else:
-                new_model.append(data)
-        return super(ir_values, self).get(cr, uid, key, key2, new_model, \
-                         meta, context, res_id_req, without_user, key2_req)
-
-ir_values()
-
-class ir_model(osv.osv):
-
-    _inherit = 'ir.model'
-
-    def read(self, cr, uid, ids, fields=None, context={}, 
-            load='_classic_read'):
-        data = super(ir_model, self).read(cr, uid, ids, fields=fields, \
-                        context=context, load=load)
-        if data:
-            for val in data:
-                val['id'] = caldav_id2real_id(val['id'])
-        return data
-
-ir_model()
-
-class virtual_report_spool(web_services.report_spool):
-
-    def exp_report(self, db, uid, object, ids, datas=None, context=None):
-        if object == 'printscreen.list':
-            return super(virtual_report_spool, self).exp_report(db, uid, \
-                            object, ids, datas, context)
-        new_ids = []
-        for id in ids:
-            new_ids.append(caldav_id2real_id(id))
-        datas['id'] = caldav_id2real_id(datas['id'])        
-        return super(virtual_report_spool, self).exp_report(db, uid, object, new_ids, datas, context)
-
-virtual_report_spool()
-
-class calendar_custom_rrule(osv.osv):
-    _name = "calendar.custom.rrule"
-    _description = "Custom Recurrency Rule"
-
-    _columns = {
-        'freq': fields.selection([('None', 'No Repeat'), \
-                            ('secondly', 'Secondly'), \
-                            ('minutely', 'Minutely'), \
-                            ('hourly', 'Hourly'), \
-                            ('daily', 'Daily'), \
-                            ('weekly', 'Weekly'), \
-                            ('monthly', 'Monthly'), \
-                            ('yearly', 'Yearly')], 'Frequency', required=True), 
-        'interval': fields.integer('Interval'), 
-        'count': fields.integer('Count'), 
-        'mo': fields.boolean('Mon'), 
-        'tu': fields.boolean('Tue'), 
-        'we': fields.boolean('Wed'), 
-        'th': fields.boolean('Thu'), 
-        'fr': fields.boolean('Fri'), 
-        'sa': fields.boolean('Sat'), 
-        'su': fields.boolean('Sun'), 
-        'select1': fields.selection([('date', 'Date of month'), \
-                            ('day', 'Day of month')], 'Option'), 
-        'day': fields.integer('Date of month'), 
-        'week_list': fields.selection([('MO', 'Monday'), ('TU', 'Tuesday'), \
-                                   ('WE', 'Wednesday'), ('TH', 'Thursday'), \
-                                   ('FR', 'Friday'), ('SA', 'Saturday'), \
-                                   ('SU', 'Sunday')], 'Weekday'), 
-        'byday': fields.selection([('1', 'First'), ('2', 'Second'), \
-                                   ('3', 'Third'), ('4', 'Fourth'), \
-                                   ('5', 'Fifth'), ('-1', 'Last')], 'By day'), 
-        'month_list': fields.selection(months.items(), 'Month'), 
-        'end_date': fields.date('Repeat Until')
-    }
-
-    _defaults = {
-                 'freq':  lambda *x: 'daily', 
-                 'select1':  lambda *x: 'date', 
-                 'interval':  lambda *x: 1, 
-                 }
-
-    def compute_rule_string(self, cr, uid, datas, context=None, *args):
-        weekdays = ['mo', 'tu', 'we', 'th', 'fr', 'sa', 'su']
-        weekstring = ''
-        monthstring = ''
-        yearstring = ''
-
-#    logic for computing rrule string
-
-        freq = datas.get('freq')
-        if freq == 'None':
-            obj.write(cr, uid, [res_obj.id], {'rrule': ''})
-            return {}
-
-        if freq == 'weekly':
-            byday = map(lambda x: x.upper(), filter(lambda x: datas.get(x) and x in weekdays, datas))
-            if byday:
-                weekstring = ';BYDAY=' + ','.join(byday)
-
-        elif freq == 'monthly':
-            if datas.get('select1')=='date' and (datas.get('day') < 1 or datas.get('day') > 31):
-                raise osv.except_osv(_('Error!'), ("Please select proper Day of month"))
-            if datas.get('select1')=='day':
-                monthstring = ';BYDAY=' + datas.get('byday') + datas.get('week_list')
-            elif datas.get('select1')=='date':
-                monthstring = ';BYMONTHDAY=' + str(datas.get('day'))
-
-        elif freq == 'yearly':
-            if datas.get('select1')=='date'  and (datas.get('day') < 1 or datas.get('day') > 31):
-                raise osv.except_osv(_('Error!'), ("Please select proper Day of month"))
-            bymonth = ';BYMONTH=' + str(datas.get('month_list'))
-            if datas.get('select1')=='day':
-                bystring = ';BYDAY=' + datas.get('byday') + datas.get('week_list')
-            elif datas.get('select1')=='date':
-                bystring = ';BYMONTHDAY=' + str(datas.get('day'))
-            yearstring = bymonth + bystring
-
-        if datas.get('end_date'):
-            datas['end_date'] = ''.join((re.compile('\d')).findall(datas.get('end_date'))) + '235959Z'
-        enddate = (datas.get('count') and (';COUNT=' +  str(datas.get('count'))) or '') +\
-                             ((datas.get('end_date') and (';UNTIL=' + datas.get('end_date'))) or '')
-
-        rrule_string = 'FREQ=' + freq.upper() +  weekstring + ';INTERVAL=' + \
-                str(datas.get('interval')) + enddate + monthstring + yearstring
-
-#        End logic
-        return rrule_string
-
-    def do_add(self, cr, uid, ids, context={}):
-        datas = self.read(cr, uid, ids)[0]
-        if datas.get('interval') <= 0:
-            raise osv.except_osv(_('Error!'), ("Please select proper Interval"))
-
-
-        if not context or not context.get('model'):
-            return {}
-        else:
-            model = context.get('model')
-        obj = self.pool.get(model)
-        res_obj = obj.browse(cr, uid, context['active_id'])
-
-        rrule_string = self.compute_rule_string(cr, uid, datas)
-        obj.write(cr, uid, [res_obj.id], {'rrule': rrule_string})
-        return {}
-
-calendar_custom_rrule()
-
-class res_users(osv.osv):
-    _inherit = 'res.users'
-
-    def _get_user_avail(self, cr, uid, ids, context=None):
-        current_datetime = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
-        res = {}
-        attendee_obj = self.pool.get('calendar.attendee')
-        attendee_ids = attendee_obj.search(cr, uid, [
-                    ('event_date', '<=', current_datetime), ('event_end_date', '<=', current_datetime), 
-                    ('state', '=', 'accepted'), ('user_id', 'in', ids)
-                    ])
-
-        result = cr.dictfetchall()
-        for attendee_data in attendee_obj.read(cr, uid, attendee_ids, ['user_id']):
-            user_id = attendee_data['user_id']
-            status = 'busy'
-            res.update({user_id:status})
-
-        #TOCHECK: Delegrated Event        
-        for user_id in ids:
-            if user_id not in res:
-                res[user_id] = 'free'
-
-        return res
-
-    def _get_user_avail_fun(self, cr, uid, ids, name, args, context=None):
-        return self._get_user_avail(cr, uid, ids, context=context)
-
-    _columns = {
-            'availability': fields.function(_get_user_avail_fun, type='selection', \
-                    selection=[('free', 'Free'), ('busy', 'Busy')], \
-                    string='Free/Busy', method=True), 
-    }
-res_users()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_calendar/cache.py b/addons/caldav/caldav_cache.py
similarity index 100%
rename from addons/base_calendar/cache.py
rename to addons/caldav/caldav_cache.py
diff --git a/addons/caldav/caldav_data.xml b/addons/caldav/caldav_data.xml
deleted file mode 100644
index c8b20ac134b..00000000000
--- a/addons/caldav/caldav_data.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-
-	<data noupdate="1">
-		<record model="res.alarm" id="alarm1">
-			<field name="name">1 minute before</field>
-			<field name="active" eval="1" />
-			<field name="trigger_duration" eval="1" />
-			<field name="trigger_interval">minutes</field>
-			<field name="trigger_occurs">before</field>
-			<field name="trigger_related">start</field>
-		</record>
-
-		<record model="res.alarm" id="alarm2">
-			<field name="name">5 minutes before</field>
-			<field name="active" eval="1" />
-			<field name="trigger_duration" eval="5" />
-			<field name="trigger_interval">minutes</field>
-			<field name="trigger_occurs">before</field>
-			<field name="trigger_related">start</field>
-		</record>
-
-		<record model="res.alarm" id="alarm3">
-			<field name="name">10 minutes before</field>
-			<field name="active" eval="1" />
-			<field name="trigger_duration" eval="10" />
-			<field name="trigger_interval">minutes</field>
-			<field name="trigger_occurs">before</field>
-			<field name="trigger_related">start</field>
-		</record>
-
-		<record model="res.alarm" id="alarm4">
-			<field name="name">15 minutes before</field>
-			<field name="active" eval="1" />
-			<field name="trigger_duration" eval="15" />
-			<field name="trigger_interval">minutes</field>
-			<field name="trigger_occurs">before</field>
-			<field name="trigger_related">start</field>
-		</record>
-
-		<record model="res.alarm" id="alarm5">
-			<field name="name">30 minutes before</field>
-			<field name="active" eval="1" />
-			<field name="trigger_duration" eval="30" />
-			<field name="trigger_interval">minutes</field>
-			<field name="trigger_occurs">before</field>
-			<field name="trigger_related">start</field>
-		</record>
-
-		<record model="res.alarm" id="alarm6">
-			<field name="name">45 minutes before</field>
-			<field name="active" eval="1" />
-			<field name="trigger_duration" eval="45" />
-			<field name="trigger_interval">minutes</field>
-			<field name="trigger_occurs">before</field>
-			<field name="trigger_related">start</field>
-		</record>
-
-		<record model="res.alarm" id="alarm7">
-			<field name="name">1 hour before</field>
-			<field name="active" eval="1" />
-			<field name="trigger_duration" eval="1" />
-			<field name="trigger_interval">hours</field>
-			<field name="trigger_occurs">before</field>
-			<field name="trigger_related">start</field>
-		</record>
-
-		<record model="res.alarm" id="alarm8">
-			<field name="name">2 hours before</field>
-			<field name="active" eval="1" />
-			<field name="trigger_duration" eval="2" />
-			<field name="trigger_interval">hours</field>
-			<field name="trigger_occurs">before</field>
-			<field name="trigger_related">start</field>
-		</record>
-
-		<record model="res.alarm" id="alarm9">
-			<field name="name">3 hours before</field>
-
-			<field name="active" eval="1" />
-			<field name="trigger_duration" eval="3" />
-			<field name="trigger_interval">hours</field>
-			<field name="trigger_occurs">before</field>
-			<field name="trigger_related">start</field>
-		</record>
-
-		<record model="res.alarm" id="alarm10">
-			<field name="name">4 hours before</field>
-
-			<field name="active" eval="1" />
-			<field name="trigger_duration" eval="4" />
-			<field name="trigger_interval">hours</field>
-			<field name="trigger_occurs">before</field>
-			<field name="trigger_related">start</field>
-		</record>
-
-		<record model="res.alarm" id="alarm11">
-			<field name="name">5 hours before</field>
-
-			<field name="active" eval="1" />
-			<field name="trigger_duration" eval="5" />
-			<field name="trigger_interval">hours</field>
-			<field name="trigger_occurs">before</field>
-			<field name="trigger_related">start</field>
-		</record>
-
-		<record model="res.alarm" id="alarm12">
-			<field name="name">18 hours before</field>
-
-			<field name="active" eval="1" />
-			<field name="trigger_duration" eval="18" />
-			<field name="trigger_interval">hours</field>
-			<field name="trigger_occurs">before</field>
-			<field name="trigger_related">start</field>
-		</record>
-
-
-		<!-- Scheduler for Event Alarm-->
-		<record forcecreate="True" id="ir_cron_scheduler_alarm"
-			model="ir.cron">
-			<field name="name">Run Event Reminder</field>
-			<field eval="True" name="active" />
-			<field name="user_id" ref="base.user_root" />
-			<field name="interval_number">1</field>
-			<field name="interval_type">minutes</field>
-			<field name="numbercall">-1</field>
-			<field eval="False" name="doall" />
-			<field eval="'calendar.alarm'" name="model" />
-			<field eval="'do_run_scheduler'" name="function" />
-			<field eval="'(False,)'" name="args" />
-		</record>
-	</data>
-</openerp>
diff --git a/addons/base_calendar/dav_fs.py b/addons/caldav/caldav_fs.py
similarity index 99%
rename from addons/base_calendar/dav_fs.py
rename to addons/caldav/caldav_fs.py
index e44a41a8e07..28424acedf8 100644
--- a/addons/base_calendar/dav_fs.py
+++ b/addons/caldav/caldav_fs.py
@@ -39,7 +39,7 @@ import urllib
 
 from DAV.davcmd import copyone, copytree, moveone, movetree, delone, deltree
 from document.nodes import node_res_dir, node_res_obj
-from cache import memoize
+from caldav_cache import memoize
 from tools import misc
 CACHE_SIZE=20000
 
diff --git a/addons/base_calendar/base_calendar_node.py b/addons/caldav/caldav_node.py
similarity index 100%
rename from addons/base_calendar/base_calendar_node.py
rename to addons/caldav/caldav_node.py
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
deleted file mode 100644
index 98648604b74..00000000000
--- a/addons/caldav/caldav_view.xml
+++ /dev/null
@@ -1,250 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-    
-<!--    Attendee invite wizard-->
-
-		<record id="view_calendar_invite_attendee_wizard" model="ir.ui.view">
-            <field name="name">Invite Attendees</field>
-            <field name="model">caldav.invite.attendee</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Invite People">
-                	<field name="type" />
-                	<field name="send_mail" />
-                	<newline/>
-                	<group col="1" colspan="4"
-                		attrs="{'invisible': [('type', '!=', 'external')]}">
-                		<field name="email" colspan="4"
-                			attrs="{'required': [('type', '=', 'external')]}" />
-                	</group>
-                	<group col="1" colspan="4"
-                		attrs="{'invisible': [('type', '!=', 'internal')]}">
-                		<separator string="Users" colspan="4" />
-                		<field name="user_ids" select="1" colspan="4"
-                			nolabel="1" />
-                		<newline />
-                	</group>
-                	<group col="2" colspan="4"
-                		attrs="{'invisible': [('type', '!=', 'partner')]}">
-                		<field name="partner_id" colspan="2"
-                			on_change="onchange_partner_id(partner_id)"
-                			attrs="{'required': [('type', '=', 'partner')]}" />
-                		<newline />
-                		<separator string="Partner Contacts"
-                			colspan="4" />
-                		<field name="contact_ids" select="1" colspan="4"
-                			nolabel="1" domain="[('partner_id', '=', partner_id)]"
-                			attrs="{'readonly': [('type', '!=', 'partner')]}" />
-                	</group>
-                	<newline/>
-                	<separator string="" colspan="6" />
-                	<label string="" colspan="2" />
-                	<button icon='gtk-cancel' special="cancel"
-                		string="Cancel" />
-                	<button name="do_invite" string="Invite"
-                		type="object" icon="gtk-ok" />
-                </form>
-            </field>
-        </record>
-
-        <record id="action_view_calendar_invite_attendee_wizard" model="ir.actions.act_window">
-            <field name="name">Invite Attendees</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">caldav.invite.attendee</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-
-        <record id="caldav_attendee_form_view" model="ir.ui.view">
-            <field name="name">calendar.attendee.form</field>
-            <field name="model">calendar.attendee</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-            	<form string="Invitation details">
-            		<field name="email" string="Invitation To"/> 
-                    <field name="sent_by_uid" string="Invitation From"/>
-            		<notebook colspan="4">
-            			<page string="Invitation">
-                            <separator string="Invitation Detail" colspan="4" />
-                            <group colspan="4" col="4">
-                                <field name="user_id" string="Invited User"/>
-                                <newline/>
-                                <field name="partner_id" string="Partner"/>
-                                <field name="partner_address_id" string="Contact"/>
-                                <field name="role" string="Role" />
-                                <field name="cutype" string="Invitation type" />
-                                <field name="rsvp" /> 
-                            </group>
-                            <separator string="Event Detail" colspan="4" />
-                            <group colspan="4" col="4">
-                                <field name="event_date" />
-                                <field name="event_end_date" />
-                                <field name="language"/>
-                                <field name="ref" colspan="4"/>
-                            </group>
-            			</page>
-            			<page string="Delegation Info">
-            				<separator string="Delegated From" colspan="4" />
-            				<field name="parent_ids" nolabel="1"
-            					colspan="4" readonly="1" />
-            				<separator string="Delegated To" colspan="4" />
-            				<field name="child_ids" nolabel="1"
-            					colspan="4" readonly="1" />
-            			</page>
-            		</notebook>
-            		<group col="6" colspan="4">
-	                        <field name="state" select="2" />
-	                        <button name="do_tentative" states="needs-action,declined,accepted"
-	                        	string="Uncertain" type="object"
-	                        	icon="terp-crm" />
-	                        <button name="do_accept" string="Accept" states="needs-action,tentative,declined"
-	                        	type="object" icon="gtk-apply" />
-	                        <button name="do_decline" string="Decline"  states="needs-action,tentative,accepted"
-	                        	type="object" icon="gtk-cancel" />
-	                        <button
-	                        	name="%(caldav.action_view_calendar_invite_attendee_wizard)d"
-	                        	string="Delegate" type="action"
-	                        	icon="gtk-sort-descending" states="needs-action,tentative,declined,accepted"
-	                        	context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
-            		</group>
-            	</form>
-            </field>
-        </record>
-
-	    <record id="caldav_attendee_tree_view" model="ir.ui.view">
-            <field name="name">calendar.attendee.tree</field>
-            <field name="model">calendar.attendee</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-            	<tree string="Invitation details">
-            		<field name="email" string="Invitation To"/>
-                    <field name="partner_id" string="Partner" />
-                    <field name="partner_address_id" string="Contact" />
-            		<field name="role" />            		
-            		<field name="state" />
-            	</tree>
-            </field>
-        </record>	 
-
-	 
-	 
-        <record id="res_alarm_form_view" model="ir.ui.view">
-            <field name="name">res.alarm.form</field>
-            <field name="model">res.alarm</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-            	<form string="Reminder details">
-                    <field name="name" />
-                    <field name="active" />
-                    <separator string="Reminder Details" colspan="4" />
-                    <field name="trigger_duration" select="1" />
-                    <field name="trigger_interval" select="1" />
-                    <field name="trigger_occurs" select="1" />
-                    <field name="trigger_related" select="1" />
-                    <separator string="" colspan="4" />
-                    <field name="duration" />
-                    <field name="repeat" />
-            	</form>
-            </field>
-        </record>
-
-         <record id="res_alarm_tree_view" model="ir.ui.view">
-                <field name="name">res.alarm.tree</field>
-                <field name="model">res.alarm</field>
-                <field name="type">tree</field>
-                <field name="arch" type="xml">                    
-                	<tree string="Reminder details">
-			            <field name="name" select="1"/>                        			    
-			            <field name="trigger_interval" select="1"/>
-			            <field name="trigger_duration" select="1"/>
-			            <field name="trigger_related" select="1"/>
-			            <field name="trigger_occurs" select="1"/>			            
-		            </tree>
-                </field>
-            </record>
-
-         <record id="action_res_alarm_view" model="ir.actions.act_window">
-         	<field name="name">Available Alarms</field>
-         	<field name="type">ir.actions.act_window</field>
-         	<field name="res_model">res.alarm</field>
-         	<field name="view_type">form</field>
-         	<field name="view_mode">tree,form</field>
-         </record>
-
-         <record id="view_custom_rule_form" model="ir.ui.view">
-            <field name="name">Custom Rule</field>
-            <field name="model">calendar.custom.rrule</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-            	<form string="Custom Rule">
-            		<separator string="Select data for Custom Rule" colspan="4"/>
-                    <field name="freq" />
-                    <field name="interval" />
-                    <newline />
-                    <field name="count"
-                    	attrs="{'required' : [('end_date','=',False)]}"/>
-                    <field name="end_date"
-                    	attrs="{'required' : [('count','&lt;=',0), ('freq', '!=', 'None')]}"/>
-                    <group col="7" colspan="4" name="Select weekdays"
-                    		attrs="{'invisible' : [('freq','!=','weekly')]}">
-                    	<separator string="" colspan="6" />
-                    	<newline />
-                    	<field name="mo" colspan="1" />
-                    	<field name="tu" colspan="1" />
-                    	<field name="we" colspan="1" />
-                    	<field name="th" colspan="1" />
-                    	<field name="fr" colspan="1" />
-                    	<field name="sa" colspan="1" />
-                    	<field name="su" colspan="1" />
-                    	<newline />
-                    </group>
-                    <group col="4" colspan="4" attrs="{'invisible' : [('freq','!=','monthly'), ('freq','!=','yearly')]}">
-                    	<separator string="" colspan="6"/>
-                    	<group col="2" colspan="4">
-                    		<field name="select1"/>
-                    	</group>
-                    	<group col="3" colspan="4" attrs="{'invisible' : [('select1','=','day')]}">
-                    		<field name="day" attrs="{'required' : [('select1','=','date')]}"/>
-                   		</group>
-                   		<newline />
-                    	<group col="3" colspan="4" attrs="{'invisible' : [('select1','=','date')]}">
-                    		<field name="byday"  string="The"
-                    					attrs="{'required' : [('select1','=','day')]}"/>
-                    		<field name="week_list" nolabel="1"
-                    					attrs="{'required' : [('select1','=','day')]}"/>
-                    	</group>
-                    	<group col="2" colspan="4" attrs="{'invisible' : [('freq','!=','yearly')]}">
-                    		<field name="month_list" string="of" colspan="1"
-                    				attrs="{'required' : [('freq','=','yearly')]}"/>
-                 		</group>
-                    </group>
-                    <separator string="" colspan="6" />
-                    <label string="" colspan="2"/>
-                    <button icon='gtk-cancel' special="cancel" string="Cancel"/>
-                    <button name="do_add" string="Ok" type="object" icon="gtk-ok"/>
-                </form>
-            </field>
-        </record>
-	
-    	<record id="action_calendar_custom_rrule_wizard" model="ir.actions.act_window">
-            <field name="name">Custom Rule</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">calendar.custom.rrule</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-        
-        
-        
-        <!--	Available alarms-->
-
-	<menuitem name="Available alarms" id="menu_crm_meeting_avail_alarm"
-		action="caldav.action_res_alarm_view"
-		parent="base_calendar.menu_calendar_configuration" />
-		
-		
-    </data>
-</openerp>
diff --git a/addons/base_calendar/base_calendar_wizard.xml b/addons/caldav/caldav_wizard.xml
similarity index 100%
rename from addons/base_calendar/base_calendar_wizard.xml
rename to addons/caldav/caldav_wizard.xml
diff --git a/addons/caldav/security/ir.model.access.csv b/addons/caldav/security/ir.model.access.csv
deleted file mode 100644
index 8a720533140..00000000000
--- a/addons/caldav/security/ir.model.access.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_calendar_attendee","calendar.attendee","model_calendar_attendee",,1,1,1,1
-"access_calendar_alarm","calendar.alarm","model_calendar_alarm",,1,1,1,1
-"access_res_alarm","res.alarm","model_res_alarm",,1,1,1,1
-"access_calendar_event_all","calendar.event","model_calendar_event",,1,1,1,1
diff --git a/addons/base_calendar/webdav_server.py b/addons/caldav/webdav_server.py
similarity index 98%
rename from addons/base_calendar/webdav_server.py
rename to addons/caldav/webdav_server.py
index 9fd6d8bf009..c62bb5fc405 100644
--- a/addons/base_calendar/webdav_server.py
+++ b/addons/caldav/webdav_server.py
@@ -28,7 +28,7 @@
 
 
 import netsvc
-from dav_fs import tinydav_handler
+from caldav_fs import tinydav_handler
 from tools.config import config
 from DAV.WebDAVServer import DAVRequestHandler
 from service.websrv_lib import HTTPDir,FixSendError
diff --git a/addons/base_calendar/wizard/__init__.py b/addons/caldav/wizard/__init__.py
similarity index 100%
rename from addons/base_calendar/wizard/__init__.py
rename to addons/caldav/wizard/__init__.py
diff --git a/addons/base_calendar/wizard/wizard_cal_edit_event.py b/addons/caldav/wizard/wizard_cal_edit_event.py
similarity index 100%
rename from addons/base_calendar/wizard/wizard_cal_edit_event.py
rename to addons/caldav/wizard/wizard_cal_edit_event.py
diff --git a/addons/base_calendar/wizard/wizard_cal_export.py b/addons/caldav/wizard/wizard_cal_export.py
similarity index 100%
rename from addons/base_calendar/wizard/wizard_cal_export.py
rename to addons/caldav/wizard/wizard_cal_export.py
diff --git a/addons/base_calendar/wizard/wizard_cal_import.py b/addons/caldav/wizard/wizard_cal_import.py
similarity index 100%
rename from addons/base_calendar/wizard/wizard_cal_import.py
rename to addons/caldav/wizard/wizard_cal_import.py
diff --git a/addons/base_calendar/wizard/wizard_cal_subscribe.py b/addons/caldav/wizard/wizard_cal_subscribe.py
similarity index 100%
rename from addons/base_calendar/wizard/wizard_cal_subscribe.py
rename to addons/caldav/wizard/wizard_cal_subscribe.py

From ec533327cb10b729932de59fe4f1176a46770f70 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Thu, 11 Feb 2010 18:28:55 +0530
Subject: [PATCH 28/28] [IMP]: crm_caldav: Changes according to names
 interchange of caldav and base_calendar

bzr revid: rpa@openerp.co.in-20100211125855-wvojg9r6uq8xkip1
---
 addons/crm_caldav/__init__.py                 |   2 +-
 addons/crm_caldav/__terp__.py                 |  14 +-
 .../{crm_meeting.py => crm_caldav.py}         |   0
 ...m_meeting_data.xml => crm_caldav_data.xml} | 182 +++++++++---------
 ...m_meeting_menu.xml => crm_caldav_menu.xml} |   2 +-
 ...m_meeting_view.xml => crm_caldav_view.xml} |  10 +-
 ...eting_wizard.xml => crm_caldav_wizard.xml} |   6 +-
 addons/project_calendar/__terp__.py           |   2 +-
 .../project_calendar_data.xml                 |  92 ++++-----
 .../project_calendar_view.xml                 |   4 +-
 .../project_calendar_wizard.xml               |   8 +-
 11 files changed, 160 insertions(+), 162 deletions(-)
 rename addons/crm_caldav/{crm_meeting.py => crm_caldav.py} (100%)
 rename addons/crm_caldav/{crm_meeting_data.xml => crm_caldav_data.xml} (61%)
 rename addons/crm_caldav/{crm_meeting_menu.xml => crm_caldav_menu.xml} (89%)
 rename addons/crm_caldav/{crm_meeting_view.xml => crm_caldav_view.xml} (92%)
 rename addons/crm_caldav/{crm_meeting_wizard.xml => crm_caldav_wizard.xml} (53%)

diff --git a/addons/crm_caldav/__init__.py b/addons/crm_caldav/__init__.py
index e0b36eaac3d..3c2ccf7917c 100644
--- a/addons/crm_caldav/__init__.py
+++ b/addons/crm_caldav/__init__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 
-import crm_meeting
+import crm_caldav
 
 
 
diff --git a/addons/crm_caldav/__terp__.py b/addons/crm_caldav/__terp__.py
index 19357a428be..4474506bcaa 100644
--- a/addons/crm_caldav/__terp__.py
+++ b/addons/crm_caldav/__terp__.py
@@ -33,19 +33,17 @@
 """, 
     'author': 'Tiny', 
     'website': 'http://www.openerp.com', 
-    'depends': ['base', 
-                        'caldav', 
-                        'crm', 
-                        'mail_gateway', 
+    'depends': ['base_calendar', 
+                        'crm'
                     ], 
     'init_xml': [ 
-                'crm_meeting_data.xml',                 
+                'crm_caldav_data.xml',                 
     ], 
 
     'update_xml': [        
-        'crm_meeting_wizard.xml', 
-        'crm_meeting_view.xml', 
-        'crm_meeting_menu.xml',         
+        'crm_caldav_wizard.xml', 
+        'crm_caldav_view.xml', 
+        'crm_caldav_menu.xml',         
     ],
     'demo_xml': [], 
     'installable': True, 
diff --git a/addons/crm_caldav/crm_meeting.py b/addons/crm_caldav/crm_caldav.py
similarity index 100%
rename from addons/crm_caldav/crm_meeting.py
rename to addons/crm_caldav/crm_caldav.py
diff --git a/addons/crm_caldav/crm_meeting_data.xml b/addons/crm_caldav/crm_caldav_data.xml
similarity index 61%
rename from addons/crm_caldav/crm_meeting_data.xml
rename to addons/crm_caldav/crm_caldav_data.xml
index ae7315da835..7b887e02092 100644
--- a/addons/crm_caldav/crm_meeting_data.xml
+++ b/addons/crm_caldav/crm_caldav_data.xml
@@ -9,81 +9,81 @@
 
 <!--		Event Attribute mapping for Calendar-->
 
-        <record model="basic.calendar" id="base_calendar.basic_calendar1">
+        <record model="basic.calendar" id="caldav.basic_calendar1">
 			<field name="name">Meetings</field>
 		</record>
 
-        <record model="basic.calendar.lines" id="caldav.calendar_lines_event">
+        <record model="basic.calendar.lines" id="base_calendar.calendar_lines_event">
 			<field name="name">vevent</field>
-			<field name="calendar_id" ref="base_calendar.basic_calendar1" />
+			<field name="calendar_id" ref="caldav.basic_calendar1" />
 			<field name="object_id" search="[('model','=','crm.meeting')]" />
             <field name="domain">[('user_id','=', uid)]</field>
 		</record>
 
-        <record model="basic.calendar.lines" id="caldav.calendar_lines_alarm">
+        <record model="basic.calendar.lines" id="base_calendar.calendar_lines_alarm">
 			<field name="name">valarm</field>
-			<field name="calendar_id" ref="base_calendar.basic_calendar1" />
+			<field name="calendar_id" ref="caldav.basic_calendar1" />
 			<field name="object_id" search="[('model','=','calendar.alarm')]" />
 		</record>
 		
-		<record model="basic.calendar.lines" id="caldav.calendar_lines_attendee">
+		<record model="basic.calendar.lines" id="base_calendar.calendar_lines_attendee">
 			<field name="name">attendee</field>
-			<field name="calendar_id" ref="base_calendar.basic_calendar1" />
+			<field name="calendar_id" ref="caldav.basic_calendar1" />
 			<field name="object_id" search="[('model','=','calendar.attendee')]" />
 		</record>
 		
         <record model="basic.calendar.fields" id="map_event_1">
-            <field name="name" ref="base_calendar.field_event_uid"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
+            <field name="name" ref="caldav.field_event_uid"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_event" />
 	        <field name="field_id" search="[('name','=','id'),('model_id.model','=','calendar.event')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_event_2">
-            <field name="name" ref="base_calendar.field_event_recurrence-id"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
+            <field name="name" ref="caldav.field_event_recurrence-id"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_event" />
 	        <field name="field_id" search="[('name','=','recurrent_id'),('model_id.model','=','calendar.event')]" />
             <field name="fn">field</field>
         </record>
         
         <record model="basic.calendar.fields" id="map_event_3">
-            <field name="name" ref="base_calendar.field_event_vtimezone"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
+            <field name="name" ref="caldav.field_event_vtimezone"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_event" />
 	        <field name="field_id" search="[('name','=','vtimezone'),('model_id.model','=','calendar.event')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_event_4">
-			<field name="name" ref="base_calendar.field_event_attendee" />
-			<field name="type_id" ref="caldav.calendar_lines_event" />
+			<field name="name" ref="caldav.field_event_attendee" />
+			<field name="type_id" ref="base_calendar.calendar_lines_event" />
 			<field name="field_id" search="[('name','=','attendee_ids'),('model_id.model','=','crm.meeting')]" />
 			<field name="fn">field</field>
 		</record>		
 
         <record model="basic.calendar.fields" id="map_event_5">
-            <field name="name" ref="base_calendar.field_event_rrule"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
+            <field name="name" ref="caldav.field_event_rrule"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_event" />
 	        <field name="field_id" search="[('name','=','rrule'),('model_id.model','=','calendar.event')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_event_6">
-            <field name="name" ref="base_calendar.field_event_dtend"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
+            <field name="name" ref="caldav.field_event_dtend"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_event" />
 	        <field name="field_id" search="[('name','=','date_deadline'),('model_id.model','=','calendar.event')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_event_7">
-            <field name="name" ref="base_calendar.field_event_valarm"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
-	        <field name="field_id" search="[('name','=','caldav_alarm_id'),('model_id.model','=','calendar.event')]" />
+            <field name="name" ref="caldav.field_event_valarm"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','base_calendar_alarm_id'),('model_id.model','=','calendar.event')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_event_8">
-			<field name="name" ref="base_calendar.field_event_priority"/>
-		    <field name="type_id" ref="caldav.calendar_lines_event" />
+			<field name="name" ref="caldav.field_event_priority"/>
+		    <field name="type_id" ref="base_calendar.calendar_lines_event" />
 			<field name="field_id" search="[('name','=','priority'),('model_id.model','=','crm.meeting')]" />
 		    <field name="fn">field</field>
 		    <field name="mapping">{'1': '1', '2': '2', '3': '2','4': '2', '5': '3', '6': '4', '7': '4', '8': '4', '9': '5'}</field>
@@ -91,79 +91,79 @@
 		
 
         <record model="basic.calendar.fields" id="map_event_9">
-            <field name="name" ref="base_calendar.field_event_location"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
+            <field name="name" ref="caldav.field_event_location"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_event" />
 	        <field name="field_id" search="[('name','=','location'),('model_id.model','=','calendar.event')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_event_10">
-            <field name="name" ref="base_calendar.field_event_exrule"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
+            <field name="name" ref="caldav.field_event_exrule"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_event" />
 	        <field name="field_id" search="[('name','=','exrule'),('model_id.model','=','calendar.event')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_event_11">
-			<field name="name" ref="base_calendar.field_event_status"/>
-		    <field name="type_id" ref="caldav.calendar_lines_event" />
+			<field name="name" ref="caldav.field_event_status"/>
+		    <field name="type_id" ref="base_calendar.calendar_lines_event" />
 			<field name="field_id" search="[('name','=','state'),('model_id.model','=','crm.meeting')]" />
 			<field name="mapping">{'tentative': 'draft', 'confirmed': 'open', 'cancelled': 'cancel'}</field>
 		    <field name="fn">field</field>
 		</record>
 
         <record model="basic.calendar.fields" id="map_event_12">
-            <field name="name" ref="base_calendar.field_event_exdate"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
+            <field name="name" ref="caldav.field_event_exdate"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_event" />
 	        <field name="field_id" search="[('name','=','exdate'),('model_id.model','=','calendar.event')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_event_13">
-            <field name="name" ref="base_calendar.field_event_dtstamp"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
+            <field name="name" ref="caldav.field_event_dtstamp"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_event" />
 	        <field name="field_id" search="[('name','=','date'),('model_id.model','=','calendar.event')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_event_14">
-            <field name="name" ref="base_calendar.field_event_description"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
+            <field name="name" ref="caldav.field_event_description"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_event" />
 	        <field name="field_id" search="[('name','=','description'),('model_id.model','=','calendar.event')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_event_15">
-            <field name="name" ref="base_calendar.field_event_dtstart"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
+            <field name="name" ref="caldav.field_event_dtstart"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_event" />
 	        <field name="field_id" search="[('name','=','date'),('model_id.model','=','calendar.event')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_event_16">
-            <field name="name" ref="base_calendar.field_event_class"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
+            <field name="name" ref="caldav.field_event_class"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_event" />
 	        <field name="field_id" search="[('name','=','class'),('model_id.model','=','calendar.event')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_event_18">
-            <field name="name" ref="base_calendar.field_event_created"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
+            <field name="name" ref="caldav.field_event_created"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_event" />
 	        <field name="field_id" search="[('name','=','create_date'),('model_id.model','=','calendar.event')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_event_19">
-            <field name="name" ref="base_calendar.field_event_url"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
-	        <field name="field_id" search="[('name','=','caldav_url'),('model_id.model','=','calendar.event')]" />
+            <field name="name" ref="caldav.field_event_url"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','base_calendar_url'),('model_id.model','=','calendar.event')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_event_20">
-            <field name="name" ref="base_calendar.field_event_summary"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
+            <field name="name" ref="caldav.field_event_summary"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_event" />
 	        <field name="field_id" search="[('name','=','name'),('model_id.model','=','calendar.event')]" />
             <field name="fn">field</field>
         </record>       
@@ -171,156 +171,156 @@
 
 
         <record model="basic.calendar.fields" id="map_alarm_1">
-            <field name="name" ref="base_calendar.field_alarm_attendee"/>
-            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+            <field name="name" ref="caldav.field_alarm_attendee"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_alarm" />
 	        <field name="field_id" search="[('name','=','attendee_ids'),('model_id.model','=','calendar.alarm')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_alarm_2">
-            <field name="name" ref="base_calendar.field_alarm_trigger_duration"/>
-            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+            <field name="name" ref="caldav.field_alarm_trigger_duration"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_alarm" />
 	        <field name="field_id" search="[('name','=','trigger_duration'),('model_id.model','=','res.alarm')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_alarm_3">
-            <field name="name" ref="base_calendar.field_alarm_description"/>
-            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+            <field name="name" ref="caldav.field_alarm_description"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_alarm" />
 	        <field name="field_id" search="[('name','=','description'),('model_id.model','=','calendar.alarm')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_alarm_4">
-            <field name="name" ref="base_calendar.field_alarm_attach"/>
-            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+            <field name="name" ref="caldav.field_alarm_attach"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_alarm" />
 	        <field name="field_id" search="[('name','=','attach'),('model_id.model','=','calendar.alarm')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_alarm_5">
-            <field name="name" ref="base_calendar.field_alarm_trigger_occurs"/>
-            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+            <field name="name" ref="caldav.field_alarm_trigger_occurs"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_alarm" />
 	        <field name="field_id" search="[('name','=','trigger_occurs'),('model_id.model','=','res.alarm')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_alarm_6">
-            <field name="name" ref="base_calendar.field_alarm_trigger_interval"/>
-            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+            <field name="name" ref="caldav.field_alarm_trigger_interval"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_alarm" />
 	        <field name="field_id" search="[('name','=','trigger_interval'),('model_id.model','=','res.alarm')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_alarm_7">
-            <field name="name" ref="base_calendar.field_alarm_summary"/>
-            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+            <field name="name" ref="caldav.field_alarm_summary"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_alarm" />
 	        <field name="field_id" search="[('name','=','name'),('model_id.model','=','calendar.alarm')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_alarm_8">
-            <field name="name" ref="base_calendar.field_alarm_duration"/>
-            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+            <field name="name" ref="caldav.field_alarm_duration"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_alarm" />
 	        <field name="field_id" search="[('name','=','duration'),('model_id.model','=','res.alarm')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_alarm_9">
-            <field name="name" ref="base_calendar.field_alarm_repeat"/>
-            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+            <field name="name" ref="caldav.field_alarm_repeat"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_alarm" />
 	        <field name="field_id" search="[('name','=','repeat'),('model_id.model','=','res.alarm')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_alarm_10">
-            <field name="name" ref="base_calendar.field_alarm_action"/>
-            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+            <field name="name" ref="caldav.field_alarm_action"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_alarm" />
 	        <field name="field_id" search="[('name','=','action'),('model_id.model','=','calendar.alarm')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_alarm_11">
-            <field name="name" ref="base_calendar.field_alarm_trigger_related"/>
-            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+            <field name="name" ref="caldav.field_alarm_trigger_related"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_alarm" />
 	        <field name="field_id" search="[('name','=','trigger_related'),('model_id.model','=','res.alarm')]" />
             <field name="fn">field</field>
         </record>
 
 
         <record model="basic.calendar.fields" id="map_attendee_1">
-            <field name="name" ref="base_calendar.field_attendee_cn"/>
-            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+            <field name="name" ref="caldav.field_attendee_cn"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_attendee" />
 	        <field name="field_id" search="[('name','=','cn'),('model_id.model','=','calendar.attendee')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_attendee_2">
-            <field name="name" ref="base_calendar.field_attendee_sent-by"/>
-            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+            <field name="name" ref="caldav.field_attendee_sent-by"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_attendee" />
 	        <field name="field_id" search="[('name','=','sent_by'),('model_id.model','=','calendar.attendee')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_attendee_3">
-            <field name="name" ref="base_calendar.field_attendee_language"/>
-            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+            <field name="name" ref="caldav.field_attendee_language"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_attendee" />
 	        <field name="field_id" search="[('name','=','language'),('model_id.model','=','calendar.attendee')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_attendee_4">
-            <field name="name" ref="base_calendar.field_attendee_delegated-from"/>
-            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+            <field name="name" ref="caldav.field_attendee_delegated-from"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_attendee" />
 	        <field name="field_id" search="[('name','=','delegated_from'),('model_id.model','=','calendar.attendee')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_attendee_5">
-            <field name="name" ref="base_calendar.field_attendee_member"/>
-            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+            <field name="name" ref="caldav.field_attendee_member"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_attendee" />
 	        <field name="field_id" search="[('name','=','member'),('model_id.model','=','calendar.attendee')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_attendee_6">
-            <field name="name" ref="base_calendar.field_attendee_cutype"/>
-            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+            <field name="name" ref="caldav.field_attendee_cutype"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_attendee" />
 	        <field name="field_id" search="[('name','=','cutype'),('model_id.model','=','calendar.attendee')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_attendee_7">
-            <field name="name" ref="base_calendar.field_attendee_role"/>
-            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+            <field name="name" ref="caldav.field_attendee_role"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_attendee" />
 	        <field name="field_id" search="[('name','=','role'),('model_id.model','=','calendar.attendee')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_attendee_8">
-            <field name="name" ref="base_calendar.field_attendee_partstat"/>
-            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+            <field name="name" ref="caldav.field_attendee_partstat"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_attendee" />
 	        <field name="field_id" search="[('name','=','state'),('model_id.model','=','calendar.attendee')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_attendee_9">
-            <field name="name" ref="base_calendar.field_attendee_delegated-to"/>
-            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+            <field name="name" ref="caldav.field_attendee_delegated-to"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_attendee" />
 	        <field name="field_id" search="[('name','=','delegated_to'),('model_id.model','=','calendar.attendee')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_attendee_10">
-            <field name="name" ref="base_calendar.field_attendee_dir"/>
-            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+            <field name="name" ref="caldav.field_attendee_dir"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_attendee" />
 	        <field name="field_id" search="[('name','=','dir'),('model_id.model','=','calendar.attendee')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_attendee_11">
-            <field name="name" ref="base_calendar.field_attendee_rsvp"/>
-            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+            <field name="name" ref="caldav.field_attendee_rsvp"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_attendee" />
 	        <field name="field_id" search="[('name','=','rsvp'),('model_id.model','=','calendar.attendee')]" />
             <field name="fn">field</field>
         </record>
diff --git a/addons/crm_caldav/crm_meeting_menu.xml b/addons/crm_caldav/crm_caldav_menu.xml
similarity index 89%
rename from addons/crm_caldav/crm_meeting_menu.xml
rename to addons/crm_caldav/crm_caldav_menu.xml
index 7c01fa3415d..afdf7241fbb 100644
--- a/addons/crm_caldav/crm_meeting_menu.xml
+++ b/addons/crm_caldav/crm_caldav_menu.xml
@@ -8,7 +8,7 @@
 	 	<field name="res_model">calendar.attendee</field>
 	 	<field name="view_type">form</field>
 	 	<field name="view_mode">tree,form</field>
-	 	<field name="view_id" ref="caldav.caldav_attendee_tree_view" />	 	
+	 	<field name="view_id" ref="base_calendar.base_calendar_attendee_tree_view" />	 	
         <field name="domain">[('ref','like','crm.meeting,')]</field>
 	 	<field name="context">{'default_sent_by_uid': uid}</field>
 	 </record>
diff --git a/addons/crm_caldav/crm_meeting_view.xml b/addons/crm_caldav/crm_caldav_view.xml
similarity index 92%
rename from addons/crm_caldav/crm_meeting_view.xml
rename to addons/crm_caldav/crm_caldav_view.xml
index 56eccd606cd..4cc55344534 100644
--- a/addons/crm_caldav/crm_meeting_view.xml
+++ b/addons/crm_caldav/crm_caldav_view.xml
@@ -14,12 +14,12 @@
                                 	on_change="onchange_rrule_type(rrule_type)"
                                 	colspan="1" attrs="{'readonly':[('recurrent_uid','!=',False)]}"/>
                                 <button string="Custom"
-                					name="%(caldav.action_calendar_custom_rrule_wizard)d"
+                					name="%(base_calendar.action_calendar_custom_rrule_wizard)d"
                 					icon="gtk-save-as" type="action" context="{'model' : 'crm.meeting'}"
                                     attrs="{'invisible': [('rrule_type','!=','custom')]}"
                                     />
                                 <button string="Edit" help="Edit only this Occurrency Meeting" attrs="{'invisible':[('rrule_type','in', ('none', False))]}"
-                    			name="%(base_calendar.wizard_edit_this_event)d" icon="gtk-save"
+                    			name="%(caldav.wizard_edit_this_event)d" icon="gtk-save"
                     			type="action" context="{'model' : 'crm.meeting', 'date': date, 'date_deadline': date_deadline}" />
                         </group>
                         <field name="alarm_id" string="Reminder" widget="selection" /> 
@@ -37,7 +37,7 @@
                     <xpath expr="/form/notebook/page[@string='Meeting']" position="after">
                         <page string="Invitation Detail">
                 			<button string="Invite People"
-                				name="%(caldav.action_view_calendar_invite_attendee_wizard)d"
+                				name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
                 				icon="terp-partner" type="action"
                 				context="{'model' : 'crm.meeting', 'attendee_field':'attendee_ids'}" colspan="2"/>
                 			<field name="attendee_ids" colspan="4"
@@ -106,7 +106,7 @@
                 <field name="name">calendar.attendee.form.inherit</field>
                 <field name="model">calendar.attendee</field>
                 <field name="type">form</field>
-                <field name="inherit_id" ref="caldav.caldav_attendee_form_view"/>                
+                <field name="inherit_id" ref="base_calendar.base_calendar_attendee_form_view"/>                
                 <field name="arch" type="xml">
                     <field name="language" position="after">
                         <field name="categ_id" string="Event Type"/>
@@ -118,7 +118,7 @@
                 <field name="name">calendar.attendee.tree.inherit</field>
                 <field name="model">calendar.attendee</field>
                 <field name="type">tree</field>
-                <field name="inherit_id" ref="caldav.caldav_attendee_tree_view"/>                
+                <field name="inherit_id" ref="base_calendar.base_calendar_attendee_tree_view"/>                
                 <field name="arch" type="xml">
                     <field name="role" position="after">
                         <field name="categ_id" string="Event Type"/>
diff --git a/addons/crm_caldav/crm_meeting_wizard.xml b/addons/crm_caldav/crm_caldav_wizard.xml
similarity index 53%
rename from addons/crm_caldav/crm_meeting_wizard.xml
rename to addons/crm_caldav/crm_caldav_wizard.xml
index a0f517766f5..47c8e2eb4b2 100644
--- a/addons/crm_caldav/crm_meeting_wizard.xml
+++ b/addons/crm_caldav/crm_caldav_wizard.xml
@@ -2,13 +2,13 @@
 <openerp>
 	<data>
 		<wizard string="Import .ics File" model="crm.meeting"
-			name="calendar.event.import" id="base_calendar.wizard_cal_event_import" />
+			name="calendar.event.import" id="caldav.wizard_cal_event_import" />
 
 		<wizard string="Export .ics File" model="crm.meeting"
-			name="calendar.event.export" id="base_calendar.wizard_cal_event_export" />
+			name="calendar.event.export" id="caldav.wizard_cal_event_export" />
 
 		<wizard string="Edit this event" model="crm.meeting"
-			name="calendar.event.edit.this" id="base_calendar.wizard_edit_this_event"
+			name="calendar.event.edit.this" id="caldav.wizard_edit_this_event"
 			menu="False" />
 	</data>
 </openerp>
diff --git a/addons/project_calendar/__terp__.py b/addons/project_calendar/__terp__.py
index dc091369928..ba56a4a17b7 100644
--- a/addons/project_calendar/__terp__.py
+++ b/addons/project_calendar/__terp__.py
@@ -25,7 +25,7 @@
     "author" : "Tiny", 
     "category" : "Generic Modules/Others", 
     "description": """ Synchronize between Project task and Caldav Vtodo.""", 
-    "depends" : ["project", "caldav"], 
+    "depends" : ["project", "base_calendar"], 
     "init_xml" : ["project_calendar_data.xml"], 
     "demo_xml" : [], 
     "update_xml" : ["project_calendar_view.xml", 
diff --git a/addons/project_calendar/project_calendar_data.xml b/addons/project_calendar/project_calendar_data.xml
index 3db1fc0b30a..30a200b0315 100644
--- a/addons/project_calendar/project_calendar_data.xml
+++ b/addons/project_calendar/project_calendar_data.xml
@@ -2,19 +2,19 @@
 <openerp>
 	<data noupdate="1">
 
-        <record model="basic.calendar" id="base_calendar.basic_calendar2">
+        <record model="basic.calendar" id="caldav.basic_calendar2">
 			<field name="name">Todo</field>
 		</record>
 		
         <record model="basic.calendar.lines" id="caldav.calendar_lines_todo">
 			<field name="name">vtodo</field>
-			<field name="calendar_id" ref="base_calendar.basic_calendar2" />
+			<field name="calendar_id" ref="caldav.basic_calendar2" />
 			<field name="object_id" search="[('model','=','project.task')]" />
             <field name="domain">[('user_id','=', uid)]</field>
 		</record>		
 		
 		<record model="basic.calendar.fields" id="map_todo_1">
-			<field name="name" ref="base_calendar.field_todo_status" />
+			<field name="name" ref="caldav.field_todo_status" />
 			<field name="type_id" ref="caldav.calendar_lines_todo" />
 			<field name="field_id" search="[('name','=','state'),('model_id.model','=','project.task')]" />
 			<field name="mapping">{'needs-action': 'draft', 'completed': 'done', 'in-process': 'open', 'cancelled': 'cancelled'}</field>
@@ -22,49 +22,49 @@
 		</record>
 
         <record model="basic.calendar.fields" id="map_todo_2">
-            <field name="name" ref="base_calendar.field_todo_exdate"/>
+            <field name="name" ref="caldav.field_todo_exdate"/>
             <field name="type_id" ref="caldav.calendar_lines_todo" />
 	        <field name="field_id" search="[('name','=','exdate'),('model_id.model','=','calendar.todo')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_todo_3">
-			<field name="name" ref="base_calendar.field_todo_attendee" />
+			<field name="name" ref="caldav.field_todo_attendee" />
 			<field name="type_id" ref="caldav.calendar_lines_todo" />
 			<field name="field_id" search="[('name','=','attendee_ids'),('model_id.model','=','project.task')]" />
 			<field name="fn">field</field>
 		</record>
 
         <record model="basic.calendar.fields" id="map_todo_4">
-            <field name="name" ref="base_calendar.field_todo_valarm"/>
+            <field name="name" ref="caldav.field_todo_valarm"/>
             <field name="type_id" ref="caldav.calendar_lines_todo" />
-	        <field name="field_id" search="[('name','=','caldav_alarm_id'),('model_id.model','=','calendar.todo')]" />
+	        <field name="field_id" search="[('name','=','base_calendar_alarm_id'),('model_id.model','=','calendar.todo')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_todo_5">
-            <field name="name" ref="base_calendar.field_todo_description"/>
+            <field name="name" ref="caldav.field_todo_description"/>
             <field name="type_id" ref="caldav.calendar_lines_todo" />
 	        <field name="field_id" search="[('name','=','description'),('model_id.model','=','calendar.todo')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_todo_6">
-            <field name="name" ref="base_calendar.field_todo_seq"/>
+            <field name="name" ref="caldav.field_todo_seq"/>
             <field name="type_id" ref="caldav.calendar_lines_todo" />
 	        <field name="field_id" search="[('name','=','sequence'),('model_id.model','=','calendar.todo')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_todo_7">
-            <field name="name" ref="base_calendar.field_todo_url"/>
+            <field name="name" ref="caldav.field_todo_url"/>
             <field name="type_id" ref="caldav.calendar_lines_todo" />
-	        <field name="field_id" search="[('name','=','caldav_url'),('model_id.model','=','calendar.todo')]" />
+	        <field name="field_id" search="[('name','=','base_calendar_url'),('model_id.model','=','calendar.todo')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_todo_9">
-		    <field name="name" ref="base_calendar.field_todo_percent"/>
+		    <field name="name" ref="caldav.field_todo_percent"/>
 		    <field name="type_id" ref="caldav.calendar_lines_todo" />
 			<field name="field_id" search="[('name','=','progress'),('model_id.model','=','project.task')]" />
 			<field name="fn">field</field>
@@ -72,21 +72,21 @@
 	
 	
 		<record model="basic.calendar.fields" id="map_todo_10">
-	            <field name="name" ref="base_calendar.field_todo_vtimezone"/>
+	            <field name="name" ref="caldav.field_todo_vtimezone"/>
 	            <field name="type_id" ref="caldav.calendar_lines_todo" />
 		        <field name="field_id" search="[('name','=','vtimezone'),('model_id.model','=','calendar.todo')]" />
 	            <field name="fn">field</field>
 	        </record>
 	
         <record model="basic.calendar.fields" id="map_todo_11">
-            <field name="name" ref="base_calendar.field_todo_summary"/>
+            <field name="name" ref="caldav.field_todo_summary"/>
             <field name="type_id" ref="caldav.calendar_lines_todo" />
 	        <field name="field_id" search="[('name','=','name'),('model_id.model','=','calendar.todo')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_todo_12">
-			<field name="name" ref="base_calendar.field_event_priority"/>
+			<field name="name" ref="caldav.field_event_priority"/>
 			<field name="type_id" ref="caldav.calendar_lines_todo" />
 			<field name="field_id" search="[('name','=','priority'),('model_id.model','=','project.task')]" />
 			<field name="fn">field</field>
@@ -94,49 +94,49 @@
 		</record>
 
         <record model="basic.calendar.fields" id="map_todo_13">
-            <field name="name" ref="base_calendar.field_todo_location"/>
+            <field name="name" ref="caldav.field_todo_location"/>
             <field name="type_id" ref="caldav.calendar_lines_todo" />
 	        <field name="field_id" search="[('name','=','location'),('model_id.model','=','calendar.todo')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_todo_14">
-            <field name="name" ref="base_calendar.field_todo_exrule"/>
+            <field name="name" ref="caldav.field_todo_exrule"/>
             <field name="type_id" ref="caldav.calendar_lines_todo" />
 	        <field name="field_id" search="[('name','=','exrule'),('model_id.model','=','calendar.todo')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_todo_15">
-		    <field name="name" ref="base_calendar.field_todo_duration"/>
+		    <field name="name" ref="caldav.field_todo_duration"/>
 		    <field name="type_id" ref="caldav.calendar_lines_todo" />
 			<field name="field_id" search="[('name','=','planned_hours'),('model_id.model','=','project.task')]" />
 			<field name="fn">hours</field>
 		</record>
 
         <record model="basic.calendar.fields" id="map_todo_16">
-            <field name="name" ref="base_calendar.field_todo_dtstart"/>
+            <field name="name" ref="caldav.field_todo_dtstart"/>
             <field name="type_id" ref="caldav.calendar_lines_todo" />
 	        <field name="field_id" search="[('name','=','date'),('model_id.model','=','calendar.todo')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_todo_17">
-            <field name="name" ref="base_calendar.field_todo_rrule"/>
+            <field name="name" ref="caldav.field_todo_rrule"/>
             <field name="type_id" ref="caldav.calendar_lines_todo" />
 	        <field name="field_id" search="[('name','=','rrule'),('model_id.model','=','calendar.todo')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_todo_18">
-            <field name="name" ref="base_calendar.field_todo_class"/>
+            <field name="name" ref="caldav.field_todo_class"/>
             <field name="type_id" ref="caldav.calendar_lines_todo" />
 	        <field name="field_id" search="[('name','=','class'),('model_id.model','=','calendar.todo')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_todo_19">
-            <field name="name" ref="base_calendar.field_todo_uid"/>
+            <field name="name" ref="caldav.field_todo_uid"/>
             <field name="type_id" ref="caldav.calendar_lines_todo" />
 	        <field name="field_id" search="[('name','=','id'),('model_id.model','=','calendar.todo')]" />
             <field name="fn">field</field>
@@ -144,89 +144,89 @@
 		
         <record model="basic.calendar.lines" id="caldav.calendar_lines_alarm2">
 			<field name="name">valarm</field>
-			<field name="calendar_id" ref="base_calendar.basic_calendar2" />
+			<field name="calendar_id" ref="caldav.basic_calendar2" />
 			<field name="object_id" search="[('model','=','calendar.alarm')]" />
 		</record>
 		
 		<record model="basic.calendar.lines" id="caldav.calendar_lines_attendee2">
 			<field name="name">attendee</field>
-			<field name="calendar_id" ref="base_calendar.basic_calendar2" />
+			<field name="calendar_id" ref="caldav.basic_calendar2" />
 			<field name="object_id" search="[('model','=','calendar.attendee')]" />
 		</record>
 		
 
         <record model="basic.calendar.fields" id="map_alarm_1">
-            <field name="name" ref="base_calendar.field_alarm_attendee"/>
+            <field name="name" ref="caldav.field_alarm_attendee"/>
             <field name="type_id" ref="caldav.calendar_lines_alarm2" />
 	        <field name="field_id" search="[('name','=','attendee_ids'),('model_id.model','=','calendar.alarm')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_alarm_2">
-            <field name="name" ref="base_calendar.field_alarm_trigger_duration"/>
+            <field name="name" ref="caldav.field_alarm_trigger_duration"/>
             <field name="type_id" ref="caldav.calendar_lines_alarm2" />
 	        <field name="field_id" search="[('name','=','trigger_duration'),('model_id.model','=','res.alarm')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_alarm_3">
-            <field name="name" ref="base_calendar.field_alarm_description"/>
+            <field name="name" ref="caldav.field_alarm_description"/>
             <field name="type_id" ref="caldav.calendar_lines_alarm2" />
 	        <field name="field_id" search="[('name','=','description'),('model_id.model','=','calendar.alarm')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_alarm_4">
-            <field name="name" ref="base_calendar.field_alarm_attach"/>
+            <field name="name" ref="caldav.field_alarm_attach"/>
             <field name="type_id" ref="caldav.calendar_lines_alarm2" />
 	        <field name="field_id" search="[('name','=','attach'),('model_id.model','=','calendar.alarm')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_alarm_5">
-            <field name="name" ref="base_calendar.field_alarm_trigger_occurs"/>
+            <field name="name" ref="caldav.field_alarm_trigger_occurs"/>
             <field name="type_id" ref="caldav.calendar_lines_alarm2" />
 	        <field name="field_id" search="[('name','=','trigger_occurs'),('model_id.model','=','res.alarm')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_alarm_6">
-            <field name="name" ref="base_calendar.field_alarm_trigger_interval"/>
+            <field name="name" ref="caldav.field_alarm_trigger_interval"/>
             <field name="type_id" ref="caldav.calendar_lines_alarm2" />
 	        <field name="field_id" search="[('name','=','trigger_interval'),('model_id.model','=','res.alarm')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_alarm_7">
-            <field name="name" ref="base_calendar.field_alarm_summary"/>
+            <field name="name" ref="caldav.field_alarm_summary"/>
             <field name="type_id" ref="caldav.calendar_lines_alarm2" />
 	        <field name="field_id" search="[('name','=','name'),('model_id.model','=','calendar.alarm')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_alarm_8">
-            <field name="name" ref="base_calendar.field_alarm_duration"/>
+            <field name="name" ref="caldav.field_alarm_duration"/>
             <field name="type_id" ref="caldav.calendar_lines_alarm2" />
 	        <field name="field_id" search="[('name','=','duration'),('model_id.model','=','res.alarm')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_alarm_9">
-            <field name="name" ref="base_calendar.field_alarm_repeat"/>
+            <field name="name" ref="caldav.field_alarm_repeat"/>
             <field name="type_id" ref="caldav.calendar_lines_alarm2" />
 	        <field name="field_id" search="[('name','=','repeat'),('model_id.model','=','res.alarm')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_alarm_10">
-            <field name="name" ref="base_calendar.field_alarm_action"/>
+            <field name="name" ref="caldav.field_alarm_action"/>
             <field name="type_id" ref="caldav.calendar_lines_alarm2" />
 	        <field name="field_id" search="[('name','=','action'),('model_id.model','=','calendar.alarm')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_alarm_11">
-            <field name="name" ref="base_calendar.field_alarm_trigger_related"/>
+            <field name="name" ref="caldav.field_alarm_trigger_related"/>
             <field name="type_id" ref="caldav.calendar_lines_alarm2" />
 	        <field name="field_id" search="[('name','=','trigger_related'),('model_id.model','=','res.alarm')]" />
             <field name="fn">field</field>
@@ -234,77 +234,77 @@
 
 
         <record model="basic.calendar.fields" id="map_attendee_1">
-            <field name="name" ref="base_calendar.field_attendee_cn"/>
+            <field name="name" ref="caldav.field_attendee_cn"/>
             <field name="type_id" ref="caldav.calendar_lines_attendee2" />
 	        <field name="field_id" search="[('name','=','cn'),('model_id.model','=','calendar.attendee')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_attendee_2">
-            <field name="name" ref="base_calendar.field_attendee_sent-by"/>
+            <field name="name" ref="caldav.field_attendee_sent-by"/>
             <field name="type_id" ref="caldav.calendar_lines_attendee2" />
 	        <field name="field_id" search="[('name','=','sent_by'),('model_id.model','=','calendar.attendee')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_attendee_3">
-            <field name="name" ref="base_calendar.field_attendee_language"/>
+            <field name="name" ref="caldav.field_attendee_language"/>
             <field name="type_id" ref="caldav.calendar_lines_attendee2" />
 	        <field name="field_id" search="[('name','=','language'),('model_id.model','=','calendar.attendee')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_attendee_4">
-            <field name="name" ref="base_calendar.field_attendee_delegated-from"/>
+            <field name="name" ref="caldav.field_attendee_delegated-from"/>
             <field name="type_id" ref="caldav.calendar_lines_attendee2" />
 	        <field name="field_id" search="[('name','=','delegated_from'),('model_id.model','=','calendar.attendee')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_attendee_5">
-            <field name="name" ref="base_calendar.field_attendee_member"/>
+            <field name="name" ref="caldav.field_attendee_member"/>
             <field name="type_id" ref="caldav.calendar_lines_attendee2" />
 	        <field name="field_id" search="[('name','=','member'),('model_id.model','=','calendar.attendee')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_attendee_6">
-            <field name="name" ref="base_calendar.field_attendee_cutype"/>
+            <field name="name" ref="caldav.field_attendee_cutype"/>
             <field name="type_id" ref="caldav.calendar_lines_attendee2" />
 	        <field name="field_id" search="[('name','=','cutype'),('model_id.model','=','calendar.attendee')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_attendee_7">
-            <field name="name" ref="base_calendar.field_attendee_role"/>
+            <field name="name" ref="caldav.field_attendee_role"/>
             <field name="type_id" ref="caldav.calendar_lines_attendee2" />
 	        <field name="field_id" search="[('name','=','role'),('model_id.model','=','calendar.attendee')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_attendee_8">
-            <field name="name" ref="base_calendar.field_attendee_partstat"/>
+            <field name="name" ref="caldav.field_attendee_partstat"/>
             <field name="type_id" ref="caldav.calendar_lines_attendee2" />
 	        <field name="field_id" search="[('name','=','state'),('model_id.model','=','calendar.attendee')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_attendee_9">
-            <field name="name" ref="base_calendar.field_attendee_delegated-to"/>
+            <field name="name" ref="caldav.field_attendee_delegated-to"/>
             <field name="type_id" ref="caldav.calendar_lines_attendee2" />
 	        <field name="field_id" search="[('name','=','delegated_to'),('model_id.model','=','calendar.attendee')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_attendee_10">
-            <field name="name" ref="base_calendar.field_attendee_dir"/>
+            <field name="name" ref="caldav.field_attendee_dir"/>
             <field name="type_id" ref="caldav.calendar_lines_attendee2" />
 	        <field name="field_id" search="[('name','=','dir'),('model_id.model','=','calendar.attendee')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_attendee_11">
-            <field name="name" ref="base_calendar.field_attendee_rsvp"/>
+            <field name="name" ref="caldav.field_attendee_rsvp"/>
             <field name="type_id" ref="caldav.calendar_lines_attendee2" />
 	        <field name="field_id" search="[('name','=','rsvp'),('model_id.model','=','calendar.attendee')]" />
             <field name="fn">field</field>
diff --git a/addons/project_calendar/project_calendar_view.xml b/addons/project_calendar/project_calendar_view.xml
index 3bae9922bd9..d4fc7115491 100644
--- a/addons/project_calendar/project_calendar_view.xml
+++ b/addons/project_calendar/project_calendar_view.xml
@@ -11,7 +11,7 @@
 				<notebook position="inside">
 					<page string="Assignees Detail">
             			<button string="Assign Task"
-            				name="%(caldav.action_view_calendar_invite_attendee_wizard)d"
+            				name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
             				icon="terp-partner" type="action"
             				context="{'model' : 'project.task'}" colspan="2"/>
             			<field name="attendee_ids" colspan="4"
@@ -89,7 +89,7 @@
 					<field name="vtimezone" colspan="2" />
 					<field name="location" colspan="2" />
 					<field name="alarm_id" string="Reminder" widget="selection" />
-					<field name="caldav_url" widget="url" />
+					<field name="base_calendar_url" widget="url" />
 					<field name="rrule" invisible="1"/>
 				</field>
 			</field>
diff --git a/addons/project_calendar/project_calendar_wizard.xml b/addons/project_calendar/project_calendar_wizard.xml
index 7928ff3cdca..2bb677eea46 100644
--- a/addons/project_calendar/project_calendar_wizard.xml
+++ b/addons/project_calendar/project_calendar_wizard.xml
@@ -1,17 +1,17 @@
 <openerp>
 	<data>
 		<wizard string="Import .ics File" model="project.task"
-			name="calendar.event.import" id="base_calendar.wizard_cal_event_import" />
+			name="calendar.event.import" id="caldav.wizard_cal_event_import" />
 
 		<wizard string="Subscribe"
 			model="project.task" name="calendar.event.subscribe"
-			id="base_calendar.wizard_cal_event_subscribe" />
+			id="caldav.wizard_cal_event_subscribe" />
 
 		<wizard string="Export .ics File" model="project.task"
-			name="calendar.event.export" id="base_calendar.wizard_cal_event_export" />
+			name="calendar.event.export" id="caldav.wizard_cal_event_export" />
 
 		<wizard string="Edit this event" model="project.task"
-			name="calendar.event.edit.this" id="base_calendar.wizard_edit_this_event"
+			name="calendar.event.edit.this" id="caldav.wizard_edit_this_event"
 			menu="False" />
 
 	</data>