Merge lp:~xrg/openobject-addons/trunk-patch26 into lp:openobject-addons

[xrg]

=== modified file 'caldav/caldav_node.py'
--- caldav/caldav_node.py	2011-01-14 09:34:28 +0000
+++ caldav/caldav_node.py	2011-01-18 17:21:40 +0000
@@ -494,6 +494,17 @@
             res = '%d' % (self.calendar_id)
         return res
 
+    def _get_wtag(self, cr):
+        uid = self.context.uid
+        context = self.context.context
+        if self.model and self.res_id:
+            mod_obj = self.context._dirobj.pool.get(self.model)
+            pr = mod_obj.perm_read(cr, uid, [self.res_id], context=context, details=False)[0]
+            self.write_date = pr.get('write_date') or pr.get('create_date')
+        
+        # Super will use self.write_date, so we should be fine.
+        return super(res_node_calendar, self)._get_wtag(cr)
+
     def rm(self, cr):
         uid = self.context.uid
         res = False
 
=== modified file 'document/directory_report.py'
--- document/directory_report.py	2011-01-14 00:11:01 +0000
+++ document/directory_report.py	2011-01-18 17:21:40 +0000
@@ -42,8 +42,12 @@
     def _model_search(self, cr, uid, obj, name, args, context=None):
         if not len(args):
             return []
+        assert len(args) == 1 and args[0][1] == '=', 'expression is not what we expect: %r' % args
         model_id= args[0][2]
         if not model_id:
+            # a deviation from standard behavior: when searching model_id = False
+            # we return *all* reports, not just ones with empty model.
+            # One reason is that 'model' is a required field so far
             return []
         model = self.pool.get('ir.model').read(cr, uid, [model_id])[0]['model']
         report_id = self.search(cr, uid, [('model','=',model)])
 
=== modified file 'document/nodes.py'
--- document/nodes.py	2011-01-14 09:34:28 +0000
+++ document/nodes.py	2011-01-18 17:21:40 +0000
@@ -23,6 +23,7 @@
 import pooler
 from tools.safe_eval import safe_eval
 
+from tools.misc import ustr
 import errno
 # import os
 import time
@@ -808,7 +809,7 @@
             return res[0]
         return None
 
-    def _child_get(self, cr, name = None, domain=None):
+    def _child_get(self, cr, name=None, domain=None):
         """ return virtual children of resource, based on the
             foreign object.
 
@@ -868,7 +869,7 @@
             # Escape the name for characters not supported in filenames
             res_name = res_name.replace('/','_') # any other weird char?
             
-            if name and (res_name != name):
+            if name and (res_name != ustr(name)):
                 # we have matched _ to any character, but we only meant to match
                 # the special ones.
                 # Eg. 'a_c' will find 'abc', 'a/c', 'a_c', may only
@@ -1044,7 +1045,7 @@
                 if not res_name:
                     continue
                 res_name = res_name.replace('/', '_')
-                if name and (res_name != name):
+                if name and (res_name != ustr(name)):
                     continue
                 # TODO Revise
                 klass = directory.get_node_class(directory, dynamic=True, context=ctx)
 
=== modified file 'document_ics/document_view.xml'
--- document_ics/document_view.xml	2011-01-14 00:11:01 +0000
+++ document_ics/document_view.xml	2011-01-18 17:21:40 +0000
@@ -24,7 +24,7 @@
         <field name="inherit_id" ref="view_document_directory_form_1"/>
         <field name="arch" type="xml">
             <field name="report_id" position="replace">
-                <field name="report_id" domain="[('type', '=', 'ressource'),('model_id','=',parent.ressource_type_id)]"/>
+                <field name="report_id" domain="[('model_id','=',parent.ressource_type_id)]"/>
                 <separator string="ICS Calendar" colspan="4"/>
                 <field name="ics_domain"/>
                 <field name="ics_field_ids" colspan="4">
 
=== modified file 'document_webdav/dav_fs.py'
--- document_webdav/dav_fs.py	2011-01-14 09:34:28 +0000
+++ document_webdav/dav_fs.py	2011-01-18 17:21:40 +0000
@@ -414,6 +414,8 @@
                                     # relative part, because ul is relative, anyway
                                     uparts=urlparse.urlparse(turi)
                                     turi=uparts[2]
+                                    if uparts[3]:
+                                        turi += ';' + uparts[3]
                                 if turi.startswith(ul):
                                     result.append( turi[len(self.parent.davpath):])
                                 else:
@@ -440,6 +442,8 @@
     def uri2local(self, uri):
         uparts=urlparse.urlparse(uri)
         reluri=uparts[2]
+        if uparts[3]:
+            reluri += ';'+uparts[3]
         if reluri and reluri[-1]=="/":
             reluri=reluri[:-1]
         return reluri
 
=== modified file 'document_webdav/webdav.py'
--- document_webdav/webdav.py	2011-01-14 09:34:28 +0000
+++ document_webdav/webdav.py	2011-01-18 17:21:40 +0000
@@ -167,6 +167,8 @@
     # write href information
     uparts=urlparse.urlparse(uri)
     fileloc=uparts[2]
+    if uparts[3]:
+        fileloc += ';' + uparts[3]
     if isinstance(fileloc, unicode):
         fileloc = fileloc.encode('utf-8')
     href=doc.createElement("D:href")
@@ -246,6 +248,8 @@
     # write href information
     uparts=urlparse.urlparse(uri)
     fileloc=uparts[2]
+    if uparts[3]:
+        fileloc += ';' + uparts[3]
     if isinstance(fileloc, unicode):
         fileloc = fileloc.encode('utf-8')
     href=doc.createElement("D:href")
@@ -303,6 +307,8 @@
     # write href information
     uparts=urlparse.urlparse(uri)
     fileloc=uparts[2]
+    if uparts[3]:
+        fileloc += ';' + uparts[3]
     if isinstance(fileloc, unicode):
         fileloc = fileloc.encode('utf-8')
     davpath = self.parent.get_davpath()