Ported all bugs from trunk to stable

bzr revid: hda@hda-20090413124313-x9gdobzpxf1lkfxl
2009-04-13 18:13:13 +05:30
parent 7767525f1e 4b180641bd
commit ea2efc1506
82 changed files with 1905 additions and 837 deletions
@@ -588,6 +588,7 @@ class document_file(osv.osv):
                res=self.search(cr,uid,[('id','<>',file.id),('name','=',name),('parent_id','=',parent_id),('res_model','=',res_model),('res_id','=',res_id)])
                if len(res):
                    return False
+                
        if op=='create':
            res=self.search(cr,uid,[('name','=',name),('parent_id','=',parent_id),('res_id','=',res_id),('res_model','=',res_model)])
            if len(res):
@@ -36,7 +36,7 @@ class ftp_server(threading.Thread):
        logger.notifyChannel('FTP', level, message)

    def run(self):
-        autho = authorizer.authorizer()
+        autho = authorizer.authorizer()        
        ftpserver.FTPHandler.authorizer = autho
        ftpserver.max_cons = 300
        ftpserver.max_cons_per_ip = 50