diff options
| author | Harry (Open ERP) <hmo@tinyerp.com> | 2009-11-04 12:16:25 +0530 |
|---|---|---|
| committer | Harry (Open ERP) <hmo@tinyerp.com> | 2009-11-04 12:16:25 +0530 |
| commit | 1256d1c8ee5d0fb6e5f4ff6abf84112a3e6f7fe5 (patch) | |
| tree | 929323d1065052a4c3027ffabe8a4bc1403e1756 /addons/document_ics/document.py | |
| parent | bd8f4ee41e2d24e38699b6b874ffc5098b6ae6cc (diff) | |
| parent | 7022a6016f826c2c5d475aec6fc079e3e82ba8bc (diff) | |
[merge] merge stable/5.0 branch
bzr revid: hmo@tinyerp.com-20091104064625-8ufxibenj12wxj3o
Diffstat (limited to 'addons/document_ics/document.py')
| -rw-r--r-- | addons/document_ics/document.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/document_ics/document.py b/addons/document_ics/document.py index d2a68937821..bf32009f404 100644 --- a/addons/document_ics/document.py +++ b/addons/document_ics/document.py @@ -127,6 +127,7 @@ class document_directory_content(osv.osv): event.add('last-modified').value = ics_datetime(perm[0]['write_date'][:19]) for field in node.content.ics_field_ids: value = getattr(obj, field.field_id.name) + value = value and tools.ustr(value) if (not value) and field.name=='uid': value = 'OpenERP-%s_%s@%s' % (node.content.ics_object_id.model, str(obj.id), cr.dbname,) obj_class.write(cr, uid, [obj.id], {field.field_id.name: value}) @@ -145,7 +146,7 @@ class document_directory_content(osv.osv): else: value = ics_datetime(value) event.add(field.name).value = value - s= StringIO.StringIO(cal.serialize().encode('utf8')) + s= StringIO.StringIO(cal.serialize()) s.name = node cr.commit() return s |