[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-import_sugarcrm

bzr revid: atp@tinyerp.com-20110303062054-fy1uftd4vls5nivo

4 files changed, 257 insertions, 21 deletions

diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index 22f50cb8e9a..8c606e4cca0 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -414,6 +414,8 @@ class openerp_dav_handler(dav_interface):
                                     # 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 @@ class openerp_dav_handler(dav_interface):
     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
diff --git a/addons/document_webdav/i18n/bg.po b/addons/document_webdav/i18n/bg.po
index eeb83bdf209..acef1855b4d 100644
--- a/addons/document_webdav/i18n/bg.po
+++ b/addons/document_webdav/i18n/bg.po
@@ -8,25 +8,25 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-08-03 03:52+0000\n"
-"Last-Translator: Boris <boris.t.ivanov@gmail.com>\n"
+"PO-Revision-Date: 2011-03-01 20:38+0000\n"
+"Last-Translator: Dimitar Markov <Unknown>\n"
 "Language-Team: Bulgarian <bg@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: 2011-01-15 05:49+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-03-02 04:38+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
 #: field:document.webdav.file.property,create_date:0
 msgid "Date Created"
-msgstr ""
+msgstr "Дата на създаване"
 
 #. module: document_webdav
 #: constraint:document.directory:0
 msgid "Error! You can not create recursive Directories."
-msgstr ""
+msgstr "Грешка! Не мжете да създавате директории реурсивно."
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
@@ -40,7 +40,7 @@ msgstr ""
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,namespace:0
 msgid "Namespace"
-msgstr ""
+msgstr "Пространство на имената"
 
 #. module: document_webdav
 #: field:document.directory,dav_prop_ids:0
@@ -50,13 +50,13 @@ msgstr ""
 #. module: document_webdav
 #: model:ir.model,name:document_webdav.model_document_webdav_file_property
 msgid "document.webdav.file.property"
-msgstr ""
+msgstr "document.webdav.file.property"
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
 #: view:document.webdav.file.property:0
 msgid "Group By..."
-msgstr ""
+msgstr "Групирай по"
 
 #. module: document_webdav
 #: view:document.directory:0
@@ -78,7 +78,7 @@ msgstr ""
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
 msgid "Document"
-msgstr ""
+msgstr "Документ"
 
 #. module: document_webdav
 #: model:ir.module.module,description:document_webdav.module_meta_information
@@ -120,7 +120,7 @@ msgstr ""
 #. module: document_webdav
 #: sql_constraint:document.directory:0
 msgid "The directory name must be unique !"
-msgstr ""
+msgstr "Името на директорията трябва да бъде уникално"
 
 #. module: document_webdav
 #: code:addons/document_webdav/webdav.py:37
@@ -141,53 +141,53 @@ msgstr ""
 #: view:document.webdav.dir.property:0
 #: view:document.webdav.file.property:0
 msgid "Properties"
-msgstr ""
+msgstr "Свойства"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,name:0
 #: field:document.webdav.file.property,name:0
 msgid "Name"
-msgstr ""
+msgstr "Име"
 
 #. module: document_webdav
 #: model:ir.model,name:document_webdav.model_document_webdav_dir_property
 msgid "document.webdav.dir.property"
-msgstr ""
+msgstr "document.webdav.dir.property"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,value:0
 #: field:document.webdav.file.property,value:0
 msgid "Value"
-msgstr ""
+msgstr "Стойност"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,dir_id:0
 #: model:ir.model,name:document_webdav.model_document_directory
 msgid "Directory"
-msgstr ""
+msgstr "Директория"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,write_uid:0
 #: field:document.webdav.file.property,write_uid:0
 msgid "Last Modification User"
-msgstr ""
+msgstr "Последна промяна потребител"
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
 msgid "Dir"
-msgstr ""
+msgstr "Посока"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,write_date:0
 #: field:document.webdav.file.property,write_date:0
 msgid "Date Modified"
-msgstr ""
+msgstr "Дата на промяна"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_uid:0
 #: field:document.webdav.file.property,create_uid:0
 msgid "Creator"
-msgstr ""
+msgstr "Създател"
 
 #. module: document_webdav
 #: model:ir.module.module,shortdesc:document_webdav.module_meta_information
@@ -203,7 +203,7 @@ msgstr ""
 #: field:document.webdav.dir.property,do_subst:0
 #: field:document.webdav.file.property,do_subst:0
 msgid "Substitute"
-msgstr ""
+msgstr "Замести"
 
 #~ msgid ""
 #~ "This is a complete document management system:\n"
diff --git a/addons/document_webdav/i18n/gl.po b/addons/document_webdav/i18n/gl.po
new file mode 100644
index 00000000000..c6ff64ed33f
--- /dev/null
+++ b/addons/document_webdav/i18n/gl.po
@@ -0,0 +1,226 @@
+# Galician translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-02-24 01:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician <gl@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: 2011-02-25 04:39+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,create_date:0
+#: field:document.webdav.file.property,create_date:0
+msgid "Date Created"
+msgstr "Data de creación"
+
+#. module: document_webdav
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr "Erro! Non se pode crear directorios recursivos."
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Search Document properties"
+msgstr "Búsqueda de propiedades do documento"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: field:document.webdav.dir.property,namespace:0
+#: view:document.webdav.file.property:0
+#: field:document.webdav.file.property,namespace:0
+msgid "Namespace"
+msgstr "Espazo de nomes"
+
+#. module: document_webdav
+#: field:document.directory,dav_prop_ids:0
+msgid "DAV properties"
+msgstr "Propiedades DAV"
+
+#. module: document_webdav
+#: model:ir.model,name:document_webdav.model_document_webdav_file_property
+msgid "document.webdav.file.property"
+msgstr "document.webdav.file.property"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Group By..."
+msgstr "Agrupar por ..."
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "These properties will be added to WebDAV requests"
+msgstr "Estas propiedades engadiranse as peticións WebDAV"
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_file_props
+msgid "DAV properties for documents"
+msgstr "Propiedades DAV para documentos"
+
+#. module: document_webdav
+#: code:addons/document_webdav/webdav.py:37
+#, python-format
+msgid "PyWebDAV Import Error!"
+msgstr "Erro de importación PyWebDAV!"
+
+#. module: document_webdav
+#: view:document.webdav.file.property:0
+#: field:document.webdav.file.property,file_id:0
+msgid "Document"
+msgstr "Documento"
+
+#. module: document_webdav
+#: model:ir.module.module,description:document_webdav.module_meta_information
+msgid ""
+" With this module, the WebDAV server for the documents is activated.\n"
+"        You can then use any compatible browser to remotely see the "
+"attachments of OpenObject.\n"
+"\n"
+"        After installation, the webDAV server can be controlled by a "
+"[webdav] section in the server's config.\n"
+"        Server Configuration Parameter:\n"
+"        [webdav]\n"
+"        ; enable = True ; Serve webdav over the http(s) servers\n"
+"        ; vdir = webdav ; the directory that webdav will be served at\n"
+"          ; this default val means that webdav will be\n"
+"          ; on \"http://localhost:8069/webdav/\n"
+"        ; verbose = True ; Turn on the verbose messages of webdav\n"
+"        ; debug = True ; Turn on the debugging messages of webdav\n"
+"          ; since the messages are routed to the python logging, with\n"
+"          ; levels \"debug\" and \"debug_rpc\" respectively, you can leave\n"
+"          ; these options on\n"
+msgstr ""
+" Con este módulo activase o servidor WebDAV para os documentos.\n"
+"    Pode utilizar calquer navegador compatible para ver os arquivos adxuntos "
+"de forma remota OpenObject.\n"
+"\n"
+"    Despois da instalación, o servidor WebDAV pode ser controlado na sección "
+"[webdav] da configuración do servidor.\n"
+"    Parámetros de configuración do servidor:\n"
+"        [webdav]\n"
+"        ; enable = True ; Serve webdav over the http(s) servers\n"
+"        ; vdir = webdav ; the directory that webdav will be served at\n"
+"          ; this default val means that webdav will be\n"
+"          ; on \"http://localhost:8069/webdav/\n"
+"        ; verbose = True ; Turn on the verbose messages of webdav\n"
+"        ; debug = True ; Turn on the debugging messages of webdav\n"
+"          ; since the messages are routed to the python logging, with\n"
+"          ; levels \"debug\" and \"debug_rpc\" respectively, you can leave\n"
+"          ; these options on\n"
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "Directory cannot be parent of itself!"
+msgstr "O directorio non pode ser o seu propio pai!"
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Contexto dinámico"
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "WebDAV properties"
+msgstr "Propiedades WebDAV"
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "The directory name must be unique !"
+msgstr "O nome do directorio debe ser único!"
+
+#. module: document_webdav
+#: code:addons/document_webdav/webdav.py:37
+#, python-format
+msgid ""
+"Please install PyWebDAV from "
+"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+"0.9.4.tar.gz&can=2&q=/"
+msgstr ""
+"Instale PyWebDAV desde "
+"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+"0.9.4.tar.gz&can=2&q=/"
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_dir_props
+msgid "DAV properties for folders"
+msgstr "Propiedades DAV para cartafois"
+
+#. module: document_webdav
+#: view:document.directory:0
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Properties"
+msgstr "Propiedades"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,name:0
+#: field:document.webdav.file.property,name:0
+msgid "Name"
+msgstr "Nome"
+
+#. module: document_webdav
+#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
+msgid "document.webdav.dir.property"
+msgstr "documento.webdav.dir.propiedad"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,value:0
+#: field:document.webdav.file.property,value:0
+msgid "Value"
+msgstr "Valor"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,dir_id:0
+#: model:ir.model,name:document_webdav.model_document_directory
+msgid "Directory"
+msgstr "Directorio"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,write_uid:0
+#: field:document.webdav.file.property,write_uid:0
+msgid "Last Modification User"
+msgstr "Usuario última modificación"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+msgid "Dir"
+msgstr "Dir"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,write_date:0
+#: field:document.webdav.file.property,write_date:0
+msgid "Date Modified"
+msgstr "Data de modificación"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,create_uid:0
+#: field:document.webdav.file.property,create_uid:0
+msgid "Creator"
+msgstr "Creador"
+
+#. module: document_webdav
+#: model:ir.module.module,shortdesc:document_webdav.module_meta_information
+msgid "WebDAV server for Document Management"
+msgstr "Servidor WebDAV para xestión de documentos"
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "Directory must have a parent or a storage"
+msgstr "O directorio debe ter un pai ou un almacenamento."
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,do_subst:0
+#: field:document.webdav.file.property,do_subst:0
+msgid "Substitute"
+msgstr "Substituto"
diff --git a/addons/document_webdav/webdav.py b/addons/document_webdav/webdav.py
index 1b60ade698f..3a68fb04fed 100644
--- a/addons/document_webdav/webdav.py
+++ b/addons/document_webdav/webdav.py
@@ -167,6 +167,8 @@ def mk_prop_response(self, uri, good_props, bad_props, doc):
     # 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 @@ def mk_propname_response(self,uri,propnames,doc):
     # 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 @@ def mk_lock_response(self, uri, props):
     # 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()