[Merged]

bzr revid: hda@tinyerp.com-20091013063520-mq5q0epaop44ideg

addons/document/__terp__.py

@@ -23,7 +23,7 @@
 
 {
     'name': 'Integrated Document Management System',
-    'version': '1.0',
+    'version': '1.1',
     'category': 'Generic Modules/Others',
     'description': """This is a complete document management system:
     * FTP Interface

addons/document/document.py

@@ -655,7 +655,6 @@ class document_file(osv.osv):
             vals['res_id']=context.get('default_res_id',False)
         if not vals.get('res_model', False) and context.get('default_res_model',False):
             vals['res_model']=context.get('default_res_model',False)
-
         if vals.get('res_id', False) and vals.get('res_model',False):
             obj_model=self.pool.get(vals['res_model'])
             result = obj_model.read(cr, uid, [vals['res_id']], context=context)
@@ -694,7 +693,7 @@ class document_file(osv.osv):
         try:
             res = content_index(base64.decodestring(datas), vals['datas_fname'], vals.get('content_type', None))
             super(document_file,self).write(cr, uid, [result], {
-                'index_content' : res,
+                'index_content': res,
             })
             cr.commit()
         except:

addons/document/ftpserver/authorizer.py

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+import pooler
+from service import security
+
 class authorizer:
     read_perms = "elr"
     write_perms = "adfmw"
@@ -47,7 +50,7 @@ class authorizer:
         paths = path.split('/')
         if not len(paths)>2:
             return True
-        db_name = paths[1]
+        db_name = paths[1]        
         db,pool = pooler.get_db_and_pool(db_name)
         res = security.login(db_name, username, self.password)
         return bool(res)