diff options
| author | husen daudi <hda@hda> | 2009-04-13 18:13:13 +0530 |
|---|---|---|
| committer | husen daudi <hda@hda> | 2009-04-13 18:13:13 +0530 |
| commit | ea2efc15067b3b5f6448a5bce7baae8880c7bfbb (patch) | |
| tree | 921b362d733c0e601792aa59955a81cd70722f3a /addons/document | |
| parent | 7767525f1edc8c5e7dd32678ffce9ed2d19310a7 (diff) | |
| parent | 4b180641bdc3356ec778a98bc10d936042a8fc12 (diff) | |
Ported all bugs from trunk to stable
bzr revid: hda@hda-20090413124313-x9gdobzpxf1lkfxl
Diffstat (limited to 'addons/document')
| -rw-r--r-- | addons/document/document.py | 1 | ||||
| -rw-r--r-- | addons/document/ftpserver/__init__.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/addons/document/document.py b/addons/document/document.py index 8c69a428100..039778915d3 100644 --- a/addons/document/document.py +++ b/addons/document/document.py @@ -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): diff --git a/addons/document/ftpserver/__init__.py b/addons/document/ftpserver/__init__.py index b18cdd965dd..410267800a3 100644 --- a/addons/document/ftpserver/__init__.py +++ b/addons/document/ftpserver/__init__.py @@ -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 |