[MERGE]:with latest addons

bzr revid: ksa@tinyerp.com-20111010085618-kbc3r13vqajoq0un

30 files changed, 120 insertions, 291 deletions

diff --git a/addons/document_ftp/__init__.py b/addons/document_ftp/__init__.py
index af514df8985..b86320f9909 100644
--- a/addons/document_ftp/__init__.py
+++ b/addons/document_ftp/__init__.py
@@ -21,4 +21,6 @@
 import ftpserver
 import wizard
 
+post_load = ftpserver.start_server
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_ftp/__openerp__.py b/addons/document_ftp/__openerp__.py
index 2683ba5ef0a..499a928c077 100644
--- a/addons/document_ftp/__openerp__.py
+++ b/addons/document_ftp/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'Integrated FTP Server with Document Management System',
+    'name': 'Shared Repositories (FTP)',
     'version': '1.99',
-    'category': 'Tools',
+    'category': 'Knowledge Management',
     'complexity': "normal",
     'description': """
 This is a support FTP Interface with document management system.
@@ -51,6 +51,7 @@ FTP client.
     'active': False,
     'certificate': '00934787762705016005',
     'images': ['images/1_configure_ftp.jpeg','images/2_document_browse.jpeg','images/3_document_ftp.jpeg'],
+    'post_load': 'post_load',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_ftp/ftpserver/__init__.py b/addons/document_ftp/ftpserver/__init__.py
index d110267f175..2e09a938a05 100644
--- a/addons/document_ftp/ftpserver/__init__.py
+++ b/addons/document_ftp/ftpserver/__init__.py
@@ -26,41 +26,42 @@ import abstracted_fs
 import netsvc
 from tools import config
 
-HOST = config.get('ftp_server_host', '127.0.0.1')
-PORT = int(config.get('ftp_server_port', '8021'))
-PASSIVE_PORTS = None
-pps = config.get('ftp_server_passive_ports', '').split(':')
-if len(pps) == 2:
-    PASSIVE_PORTS = int(pps[0]), int(pps[1])
+def start_server():
+    HOST = config.get('ftp_server_host', '127.0.0.1')
+    PORT = int(config.get('ftp_server_port', '8021'))
+    PASSIVE_PORTS = None
+    pps = config.get('ftp_server_passive_ports', '').split(':')
+    if len(pps) == 2:
+        PASSIVE_PORTS = int(pps[0]), int(pps[1])
 
-class ftp_server(threading.Thread):
-    def log(self, level, message):
-        logger = netsvc.Logger()
-        logger.notifyChannel('FTP', level, message)
+    class ftp_server(threading.Thread):
+        def log(self, level, message):
+            logger = netsvc.Logger()
+            logger.notifyChannel('FTP', level, message)
 
-    def run(self):
-        autho = authorizer.authorizer()
-        ftpserver.FTPHandler.authorizer = autho
-        ftpserver.max_cons = 300
-        ftpserver.max_cons_per_ip = 50
-        ftpserver.FTPHandler.abstracted_fs = abstracted_fs.abstracted_fs
-        if PASSIVE_PORTS:
-            ftpserver.FTPHandler.passive_ports = PASSIVE_PORTS
+        def run(self):
+            autho = authorizer.authorizer()
+            ftpserver.FTPHandler.authorizer = autho
+            ftpserver.max_cons = 300
+            ftpserver.max_cons_per_ip = 50
+            ftpserver.FTPHandler.abstracted_fs = abstracted_fs.abstracted_fs
+            if PASSIVE_PORTS:
+                ftpserver.FTPHandler.passive_ports = PASSIVE_PORTS
 
-        ftpserver.log = lambda msg: self.log(netsvc.LOG_INFO, msg)
-        ftpserver.logline = lambda msg: None
-        ftpserver.logerror = lambda msg: self.log(netsvc.LOG_ERROR, msg)
+            ftpserver.log = lambda msg: self.log(netsvc.LOG_INFO, msg)
+            ftpserver.logline = lambda msg: None
+            ftpserver.logerror = lambda msg: self.log(netsvc.LOG_ERROR, msg)
 
-        ftpd = ftpserver.FTPServer((HOST, PORT), ftpserver.FTPHandler)
-        ftpd.serve_forever()
+            ftpd = ftpserver.FTPServer((HOST, PORT), ftpserver.FTPHandler)
+            ftpd.serve_forever()
 
-if HOST.lower() == 'none':
-    netsvc.Logger().notifyChannel("FTP", netsvc.LOG_INFO, "\n Server FTP Not Started\n")
-else:
-    netsvc.Logger().notifyChannel("FTP", netsvc.LOG_INFO, "\n Serving FTP on %s:%s\n" % (HOST, PORT))
-    ds = ftp_server()
-    ds.daemon = True
-    ds.start()
+    if HOST.lower() == 'none':
+        netsvc.Logger().notifyChannel("FTP", netsvc.LOG_INFO, "\n Server FTP Not Started\n")
+    else:
+        netsvc.Logger().notifyChannel("FTP", netsvc.LOG_INFO, "\n Serving FTP on %s:%s\n" % (HOST, PORT))
+        ds = ftp_server()
+        ds.daemon = True
+        ds.start()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py
index b8ce97a7017..83cd1cde725 100644
--- a/addons/document_ftp/ftpserver/abstracted_fs.py
+++ b/addons/document_ftp/ftpserver/abstracted_fs.py
@@ -11,6 +11,7 @@ import fnmatch
 
 import pooler
 import netsvc
+import sql_db
 
 from service import security
 from osv import osv
@@ -68,7 +69,7 @@ class abstracted_fs(object):
             db, cr = None, None
             try:
                 try:
-                    db = pooler.get_db(db_name)
+                    db = sql_db.db_connect(db_name)
                     cr = db.cursor()
                     cr.execute("SELECT 1 FROM pg_class WHERE relkind = 'r' AND relname = 'ir_module_module'")
                     if not cr.fetchone():
diff --git a/addons/document_ftp/i18n/bg.po b/addons/document_ftp/i18n/bg.po
index 53e3e11708c..bb10de7ad57 100644
--- a/addons/document_ftp/i18n/bg.po
+++ b/addons/document_ftp/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/ca.po b/addons/document_ftp/i18n/ca.po
index b9804f04d9c..adc8dd9f6ff 100644
--- a/addons/document_ftp/i18n/ca.po
+++ b/addons/document_ftp/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/cs.po b/addons/document_ftp/i18n/cs.po
index fcd25f5a230..13b1c6e1a92 100644
--- a/addons/document_ftp/i18n/cs.po
+++ b/addons/document_ftp/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-05-10 04:37+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/de.po b/addons/document_ftp/i18n/de.po
index 2ab7f3cb7b9..5667084f254 100644
--- a/addons/document_ftp/i18n/de.po
+++ b/addons/document_ftp/i18n/de.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
@@ -146,27 +146,3 @@ msgstr "Suche Dokument"
 #: view:document.ftp.configuration:0
 msgid "res_config_contents"
 msgstr "res_config_contents"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Die Objektbezeichnung muss mit einem x_ beginnen und darf keine "
-#~ "Sonderzeichen haben !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter XML Quellcode für diese Ansicht!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
diff --git a/addons/document_ftp/i18n/el.po b/addons/document_ftp/i18n/el.po
index 7e82bf94209..edd7e78056f 100644
--- a/addons/document_ftp/i18n/el.po
+++ b/addons/document_ftp/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/en_GB.po b/addons/document_ftp/i18n/en_GB.po
index 5782c643b4a..7f9aa145615 100644
--- a/addons/document_ftp/i18n/en_GB.po
+++ b/addons/document_ftp/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-26 04:33+0000\n"
-"X-Generator: Launchpad (build 13779)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/es.po b/addons/document_ftp/i18n/es.po
index c5fa0eeeec4..4c568d4513e 100644
--- a/addons/document_ftp/i18n/es.po
+++ b/addons/document_ftp/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
@@ -146,27 +146,3 @@ msgstr "Navegar por los documentos"
 #: view:document.ftp.configuration:0
 msgid "res_config_contents"
 msgstr "res_config_contenidos"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML no válido para la estructura de la vista!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de la acción."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El Id del certificado debe ser único!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear un menú recursivo"
diff --git a/addons/document_ftp/i18n/es_EC.po b/addons/document_ftp/i18n/es_EC.po
index d9be58d6ed5..1edefac1ad6 100644
--- a/addons/document_ftp/i18n/es_EC.po
+++ b/addons/document_ftp/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/es_PY.po b/addons/document_ftp/i18n/es_PY.po
index c4582df0f20..5137360a4ec 100644
--- a/addons/document_ftp/i18n/es_PY.po
+++ b/addons/document_ftp/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/fi.po b/addons/document_ftp/i18n/fi.po
index 7dd3b90d649..c62779830f3 100644
--- a/addons/document_ftp/i18n/fi.po
+++ b/addons/document_ftp/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-28 04:40+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/fr.po b/addons/document_ftp/i18n/fr.po
index 782a630b1ec..ee3957c352c 100644
--- a/addons/document_ftp/i18n/fr.po
+++ b/addons/document_ftp/i18n/fr.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2010-12-29 10:19+0000\n"
-"Last-Translator: lolivier <olivier.lenoir@free.fr>\n"
+"Last-Translator: lholivier <olivier.lenoir@free.fr>\n"
 "Language-Team: French <fr@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-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
@@ -148,9 +148,3 @@ msgstr "Parcourir le document"
 #: view:document.ftp.configuration:0
 msgid "res_config_contents"
 msgstr "res_config_contents"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Le nom d'un module doit être unique !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La taille du champ ne doit jamais être inférieure à 1 !"
diff --git a/addons/document_ftp/i18n/gl.po b/addons/document_ftp/i18n/gl.po
index 83ea8515209..e43db3c5b21 100644
--- a/addons/document_ftp/i18n/gl.po
+++ b/addons/document_ftp/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/hu.po b/addons/document_ftp/i18n/hu.po
index 4af2340745b..30c5523b1bd 100644
--- a/addons/document_ftp/i18n/hu.po
+++ b/addons/document_ftp/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-03 12:46+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\n"
+"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
+"<openerp@novotrade.hu>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/it.po b/addons/document_ftp/i18n/it.po
index e88b42eb0e3..e8b94b17257 100644
--- a/addons/document_ftp/i18n/it.po
+++ b/addons/document_ftp/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
@@ -146,27 +146,3 @@ msgstr "Sfoglia documento"
 #: view:document.ftp.configuration:0
 msgid "res_config_contents"
 msgstr "res_config_contents"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Il nome dell'oggetto deve iniziare per “x_” e non contenere alcun carattere "
-#~ "speciale!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore! Non è possibile creare un menù ricorsivo."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome del modello non valido nella definizione dell'azione."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valido per la struttura della vista!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
diff --git a/addons/document_ftp/i18n/nl.po b/addons/document_ftp/i18n/nl.po
index 29629a4663f..5464b789e17 100644
--- a/addons/document_ftp/i18n/nl.po
+++ b/addons/document_ftp/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
@@ -145,26 +145,3 @@ msgstr "Document bladeren"
 #: view:document.ftp.configuration:0
 msgid "res_config_contents"
 msgstr "res_config_contents"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout! U kunt geen recursief menu maken."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ongeldige modelnaam in de actie definitie."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ongeldige XML voor weergave opbouw!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
diff --git a/addons/document_ftp/i18n/pl.po b/addons/document_ftp/i18n/pl.po
index 4ee4545fcb1..76ab5c6cead 100644
--- a/addons/document_ftp/i18n/pl.po
+++ b/addons/document_ftp/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
@@ -133,21 +133,3 @@ msgstr "Przeglądaj dokumenty"
 #: view:document.ftp.configuration:0
 msgid "res_config_contents"
 msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-#~ "specjalnych !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Nazwa modułu musi być unikalna !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Niewłaściwy XML dla architektury widoku!"
diff --git a/addons/document_ftp/i18n/pt.po b/addons/document_ftp/i18n/pt.po
index 3f2c71af342..371e6a606de 100644
--- a/addons/document_ftp/i18n/pt.po
+++ b/addons/document_ftp/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
@@ -139,27 +139,3 @@ msgstr "Ver documento"
 #: view:document.ftp.configuration:0
 msgid "res_config_contents"
 msgstr "res_config_contents"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do Objeto deve começar com x_ e não pode conter nenhum caracter "
-#~ "especial!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro! Não pode criar menus recursivos."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome de modelo inválido na definição da ação."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para a arquitetura de vista"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
diff --git a/addons/document_ftp/i18n/pt_BR.po b/addons/document_ftp/i18n/pt_BR.po
index 9a18e3996e5..7713f90b243 100644
--- a/addons/document_ftp/i18n/pt_BR.po
+++ b/addons/document_ftp/i18n/pt_BR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
@@ -146,27 +146,3 @@ msgstr "Navegar por Documentos"
 #: view:document.ftp.configuration:0
 msgid "res_config_contents"
 msgstr "res_config_contents"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do objeto precisa iniciar com x_ e não pode conter nenhum caracter "
-#~ "especial!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro ! Você não pode criar Menu recursivo."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome de modelo inválido na definição da ação."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para Arquitetura da View"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
diff --git a/addons/document_ftp/i18n/ru.po b/addons/document_ftp/i18n/ru.po
index 24f332d25cf..7781274e4da 100644
--- a/addons/document_ftp/i18n/ru.po
+++ b/addons/document_ftp/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
@@ -31,6 +31,10 @@ msgid ""
 "format is HOST:PORT and the default host (localhost) is only suitable for "
 "access from the server machine itself.."
 msgstr ""
+"Указывает сетевой адрес, на котором сервер OpenERP должен быть доступен для "
+"конечных пользователей. Это зависит от конфигурации и топологии сети и "
+"влияет только на отображение ссылок. Формат АДРЕС:ПОРТ и адрес по умолчанию "
+"(localhost) подходит только для доступа с самого сервера."
 
 #. module: document_ftp
 #: field:document.ftp.configuration,progress:0
@@ -72,11 +76,17 @@ msgid ""
 "using the\n"
 "    FTP client.\n"
 msgstr ""
+"Это поддержка интерфейса FTP к системе управления документами.\n"
+"    С помощью этого модуля вы не только получите доступ к документам через "
+"OpenERP,\n"
+"    но вы также сможете соединяться с ней через файловую систему, используя "
+"\n"
+"    FTP-клиент.\n"
 
 #. module: document_ftp
 #: view:document.ftp.browse:0
 msgid "_Browse"
-msgstr ""
+msgstr "_Обзор"
 
 #. module: document_ftp
 #: help:document.ftp.configuration,host:0
@@ -94,7 +104,7 @@ msgstr "Общее хранилище (FTP)"
 #. module: document_ftp
 #: view:document.ftp.browse:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Отмена"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
@@ -109,7 +119,7 @@ msgstr "Сервер FTP интегрированный  с системой у�
 #. module: document_ftp
 #: view:document.ftp.configuration:0
 msgid "title"
-msgstr ""
+msgstr "title"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_browse
diff --git a/addons/document_ftp/i18n/sr.po b/addons/document_ftp/i18n/sr.po
index be9c24c2b27..c14ba54b5f3 100644
--- a/addons/document_ftp/i18n/sr.po
+++ b/addons/document_ftp/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
@@ -141,17 +141,3 @@ msgstr "Pretrazi Dokument"
 #: view:document.ftp.configuration:0
 msgid "res_config_contents"
 msgstr "res_config_contents"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora zaoceti sa x_ i ne sme sadrzavati specijalne karaktere !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neispravno ime modela u definiciji akcije."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neispravan XML za pregled arhitekture!"
diff --git a/addons/document_ftp/i18n/sr@latin.po b/addons/document_ftp/i18n/sr@latin.po
index adffdca6b16..bd178189064 100644
--- a/addons/document_ftp/i18n/sr@latin.po
+++ b/addons/document_ftp/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
@@ -141,17 +141,3 @@ msgstr "Pretrazi Dokument"
 #: view:document.ftp.configuration:0
 msgid "res_config_contents"
 msgstr "res_config_contents"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora zaoceti sa x_ i ne sme sadrzavati specijalne karaktere !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivni meni."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neispravno ime modela u definiciji akcije."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neispravan XML za pregled arhitekture!"
diff --git a/addons/document_ftp/i18n/sv.po b/addons/document_ftp/i18n/sv.po
index ec6b2e2c8a7..c088e20e626 100644
--- a/addons/document_ftp/i18n/sv.po
+++ b/addons/document_ftp/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/tr.po b/addons/document_ftp/i18n/tr.po
index d629d255754..d2768807fa9 100644
--- a/addons/document_ftp/i18n/tr.po
+++ b/addons/document_ftp/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-24 05:00+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/zh_CN.po b/addons/document_ftp/i18n/zh_CN.po
index 288c2decb79..f828aa0f74c 100644
--- a/addons/document_ftp/i18n/zh_CN.po
+++ b/addons/document_ftp/i18n/zh_CN.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
 msgid "Auto Directory Configuration"
-msgstr "自动目录配置"
+msgstr "自动目录设置"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
@@ -31,11 +31,13 @@ msgid ""
 "format is HOST:PORT and the default host (localhost) is only suitable for "
 "access from the server machine itself.."
 msgstr ""
+"输入你的最终用户用于连接你OpenERP服务器的网址。基于你的网络配置，会影响客户端显示的链接。格式是：主机:端口。注意localhost只是在服务器本机"
+"才有用的。"
 
 #. module: document_ftp
 #: field:document.ftp.configuration,progress:0
 msgid "Configuration Progress"
-msgstr "配置进度"
+msgstr "设置进度"
 
 #. module: document_ftp
 #: model:ir.actions.url,name:document_ftp.action_document_browse
@@ -50,7 +52,7 @@ msgstr "图像"
 #. module: document_ftp
 #: field:document.ftp.configuration,host:0
 msgid "Address"
-msgstr ""
+msgstr "地址"
 
 #. module: document_ftp
 #: field:document.ftp.browse,url:0
@@ -60,7 +62,7 @@ msgstr "FTP 服务器"
 #. module: document_ftp
 #: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
 msgid "FTP Server Configuration"
-msgstr "FTP 服务器配置"
+msgstr "FTP 服务器设置"
 
 #. module: document_ftp
 #: model:ir.module.module,description:document_ftp.module_meta_information
@@ -71,7 +73,7 @@ msgid ""
 "    but you would also be able to connect with them through the file system "
 "using the\n"
 "    FTP client.\n"
-msgstr ""
+msgstr "此模块为文档管理增加了FTP支持。安装了这个模块你不仅可以在OpenERP里访问文档还能通过FTP客户端在文件系统上访问这些文件。\n"
 
 #. module: document_ftp
 #: view:document.ftp.browse:0
@@ -82,7 +84,7 @@ msgstr "浏览(_B)"
 #: help:document.ftp.configuration,host:0
 msgid ""
 "Server address or IP and port to which users should connect to for DMS access"
-msgstr ""
+msgstr "服务器地址或IP地址，以及端口。用于用户连接文档管理系统。"
 
 #. module: document_ftp
 #: model:ir.ui.menu,name:document_ftp.menu_document_browse
@@ -117,7 +119,7 @@ msgstr "文档 FTP 浏览"
 #. module: document_ftp
 #: view:document.ftp.configuration:0
 msgid "Knowledge Application Configuration"
-msgstr "知识管理应用配置"
+msgstr "知识管理应用设置"
 
 #. module: document_ftp
 #: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
@@ -132,4 +134,4 @@ msgstr "浏览文档"
 #. module: document_ftp
 #: view:document.ftp.configuration:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
diff --git a/addons/document_ftp/test/document_ftp_test2.yml b/addons/document_ftp/test/document_ftp_test2.yml
index 872456e7191..33ce1416ec8 100644
--- a/addons/document_ftp/test/document_ftp_test2.yml
+++ b/addons/document_ftp/test/document_ftp_test2.yml
@@ -100,12 +100,13 @@
         fdata = StringIO('abcd')
         ftp.storbinary('STOR test2.txt', fdata)
         ftp.close()
+        cr.commit()
 -
     I look for the "test2.txt" file at the server
 -
     !python {model: ir.attachment }: |
         ids = self.search(cr, uid, [('name', '=', 'test2.txt')])
-        assert ids
+        assert ids, "No test2.txt file found."
 -
     I delete the "test2.txt" file using FTP.
 -
@@ -115,12 +116,13 @@
         ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
         ftp.delete('test2.txt')
         ftp.close()
+        cr.commit()
 -
     I check at the server that test2.txt is deleted
 -
     !python {model: ir.attachment }: |
         ids = self.search(cr, uid, [('name', '=', 'test2.txt')])
-        assert not ids
+        assert not ids, "test2.txt file can still be found."
 -
     I create a test2.txt file again.
 -
@@ -131,6 +133,7 @@
         fdata = StringIO('abcd')
         ftp.storbinary('STOR test2.txt', fdata)
         ftp.close()
+        cr.commit()
 -
     I delete the test2.txt from the server (RPC).
 -
diff --git a/addons/document_ftp/test/document_ftp_test4.yml b/addons/document_ftp/test/document_ftp_test4.yml
index f05fac397bf..0a3ff33333e 100644
--- a/addons/document_ftp/test/document_ftp_test4.yml
+++ b/addons/document_ftp/test/document_ftp_test4.yml
@@ -4,6 +4,7 @@
     !python {model: ir.attachment}: |
         from document_ftp import test_easyftp as te
         ftp = te.get_plain_ftp(timeout=1.0)
+        cr.commit()
 - |
     I create two partners 'Partner1' and 'Partner2'.
     I create three partner categories: 'none', 'pat1' and 'all'
@@ -53,6 +54,7 @@
         dirs = ftp.nlst()
         for dir in [ 'All Partner1+2', 'No partners', 'Pat 1' ]:
             assert dir in dirs, "Dir %s not in folder" % dir
+        cr.commit()
 -
     I create a 'partners' folder by the first resource one.
 -
@@ -79,6 +81,7 @@
         for dir in correct:
             res = ftp.nlst(dir+'/Partners of Test')
             assert res == correct[dir], "Dir %s falsely contains %s" %(dir, res)
+        cr.commit()
 -
     I create an ir.attachment, attached (not related) to Partner1
 -