Merge lp:~syleam/openobject-addons/5.0-ics-predicable-fix into lp:openobject-addons/5.0

[Christophe CHAUVET]

=== modified file 'document_ics/document.py'
--- document_ics/document.py	2009-01-05 13:49:37 +0000
+++ document_ics/document.py	2009-03-30 20:15:45 +0000
@@ -28,6 +28,7 @@
 import datetime
 import time
 import random
+import tools
 
 ICS_TAGS = {
     'summary':'normal',
@@ -35,7 +36,7 @@
     'dtstart':'date' ,
     'dtend':'date' ,
     'created':'date' ,
-    'dt-stamp':'date' ,
+    'dtstamp':'date' ,
     'last-modified':'normal' ,
     'url':'normal' ,
     'attendee':'multiple',
@@ -87,7 +88,7 @@
                     uuid = event.value
                 if event.name.lower() in fields:
                     if ICS_TAGS[event.name.lower()]=='normal':
-                        result[fields[event.name.lower()]] = event.value.encode('utf8')
+                        result[fields[event.name.lower()]] = event.value
                     elif ICS_TAGS[event.name.lower()]=='date':
                         result[fields[event.name.lower()]] = event.value.strftime('%Y-%m-%d %H:%M:%S')
             if not uuid:
@@ -105,6 +106,12 @@
         return True
 
     def process_read_ics(self, cr, uid, node, context={}):
+        def ics_datetime(idate, short=False):
+            if short:
+                return datetime.date.fromtimestamp(time.mktime(time.strptime(idate, '%Y-%m-%d')))
+            else:
+                return datetime.datetime.strptime(idate, '%Y-%m-%d %H:%M:%S')
+
         import vobject
         obj_class = self.pool.get(node.content.ics_object_id.model)
         # Can be improved to use context and active_id !
@@ -116,20 +123,19 @@
             for field in node.content.ics_field_ids:
                 value = getattr(obj, field.field_id.name)
                 if (not value) and field.name=='uid':
-                    value = 'OpenERP-'+str(random.randint(1999999999, 9999999999))
-                    obj_class.write(cr, uid, [obj.id], {field.field_id.name: value})
+                    value = 'OpenERP-%s_%s@%s' % (node.content.ics_object_id.model, str(obj.id), cr.dbname,)
                 if ICS_TAGS[field.name]=='normal':
                     if type(value)==type(obj):
                         value=value.name
                     value = value or ''
                     event.add(field.name).value = value or ''
-                elif ICS_TAGS[field.name]=='date':
-                    dt = value or time.strftime('%Y-%m-%d %H:%M:%S')
-                    if len(dt)==10:
-                        dt = dt+' 09:00:00'
-                    value = datetime.datetime.strptime(dt, '%Y-%m-%d %H:%M:%S')
+                elif ICS_TAGS[field.name]=='date' and value:
+                    if len(value)==10:
+                        value = ics_datetime(value, True)
+                    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
@@ -140,6 +146,16 @@
     _columns = {
         'code': fields.char('Calendar Code', size=64)
     }
+
+    def copy(self, cr, uid, id, default=None, context=None):
+        """
+        code field must be unique in ICS file
+        """
+        if not default: default = {}
+        if not context: context = {}
+        default.update({'code': False, 'id': False})
+        return super(crm_case, self).copy(cr, uid, id, default, context)
+
 crm_case()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: