diff options
| author | ksa (Open ERP) <ksa@tinyerp.co.in> | 2010-04-30 10:18:27 +0530 |
|---|---|---|
| committer | ksa (Open ERP) <ksa@tinyerp.co.in> | 2010-04-30 10:18:27 +0530 |
| commit | 9a690c3ed287c7b4fa32af8ce6617ed596fce8f1 (patch) | |
| tree | 9eacfe35257da1b97b9e5464561dd17b2fb925db | |
| parent | 084c657765a0677892058b1ad5bfb577e16769fa (diff) | |
| parent | 9d4e369c847ce2bd696bdeb9d356e6d2d72f313d (diff) | |
[MERGE]: Merge with lp:openobject-trunk-dev-addons2
bzr revid: ksa@tinyerp.co.in-20100430044827-my9d0qx63vwnni15
| -rw-r--r-- | addons/crm_caldav/crm_caldav.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/addons/crm_caldav/crm_caldav.py b/addons/crm_caldav/crm_caldav.py index ffa05577360..3c3e8b8ae2e 100644 --- a/addons/crm_caldav/crm_caldav.py +++ b/addons/crm_caldav/crm_caldav.py @@ -21,6 +21,8 @@ from osv import fields, osv from crm import crm +from caldav import calendar +from datetime import datetime class crm_meeting(osv.osv): _inherit = 'crm.meeting' @@ -67,7 +69,7 @@ class crm_meeting(osv.osv): recur_pool = {} try: for val in vals: - exists, r_id = caldav.uid2openobjectid(cr, val['id'], context.get('model'), \ + exists, r_id = calendar.uid2openobjectid(cr, val['id'], context.get('model'), \ val.get('recurrent_id')) if val.has_key('create_date'): val.pop('create_date') u_id = val.get('id', None) @@ -101,3 +103,4 @@ class crm_meeting(osv.osv): crm_meeting() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + |