[FIX] revert ir_values on document

bzr revid: al@openerp.com-20120626201946-44c5odspvbttqyv1

diff --git a/addons/document/document.py b/addons/document/document.py
index b304f54..66b47fd 100644 (file)
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -143,7 +143,8 @@ class document_file(osv.osv):
 
     _defaults = {
         'user_id': lambda self, cr, uid, ctx:uid,
-        'file_size': lambda self, cr, uid, ctx:0    
+        'parent_id': __get_def_directory
+        'file_size': lambda self, cr, uid, ctx:0
     }
     _sql_constraints = [
         # filename_uniq is not possible in pure SQL

diff --git a/addons/document/document_data.xml b/addons/document/document_data.xml
index c8a6e30..a7bc98d 100644 (file)
--- a/addons/document/document_data.xml
+++ b/addons/document/document_data.xml
@@ -104,10 +104,5 @@
     <!-- After we have setup the root directory, migrate the attachments
         to point to that. -->
     <function model="ir.attachment" name="_attach_parent_id"/>
-    <function
-            eval="('default',False,'parent_id', [('document.directory', False)], ref('document.dir_root'), True, False, False, False, True)"
-            id="document_default_set"
-            model="ir.values"
-            name="set"/>
 </data>
 </openerp>

diff --git a/addons/document_ftp/ftpserver/__init__.py b/addons/document_ftp/ftpserver/__init__.py
index 582972b..59aff85 100644 (file)
--- a/addons/document_ftp/ftpserver/__init__.py
+++ b/addons/document_ftp/ftpserver/__init__.py
@@ -47,7 +47,7 @@ def start_server():
 
             ftpserver.log = lambda msg: _logger.info(msg)
             ftpserver.logline = lambda msg: None
-            ftpserver.logerror = lambda msg: self.logger.error(msg)
+            ftpserver.logerror = lambda msg: _logger.error(msg)
 
             ftpd = ftpserver.FTPServer((HOST, PORT), ftpserver.FTPHandler)
             ftpd.serve_forever()