[MERGE]

bzr revid: hmo@tinyerp.com-20100711060646-gwp6039vsln1x30a

19 files changed, 1926 insertions, 1001 deletions

diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py
index a260a083d74..63b09121309 100644
--- a/addons/document/__openerp__.py
+++ b/addons/document/__openerp__.py
@@ -53,7 +53,7 @@
     ],
     'demo_xml': [ 'document_demo.xml','board_document_demo.xml'],
     'test': [
-        'test/document_test.yml',
+        'test/document_test2.yml',
     ],
     'installable': True,
     'active': False,
diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml
index 0b85dc8039c..8b8ef2557e6 100644
--- a/addons/document/board_document_view.xml
+++ b/addons/document/board_document_view.xml
@@ -53,7 +53,7 @@
         <menuitem id="menu_reporting" name="Reporting" sequence="2" parent="knowledge.menu_document"/>
          <menuitem
             name="Dashboard"
-            id="menu_board_document"
+            id="menu_reports_document"
             parent="menu_reporting"
             sequence="0"
             icon="terp-graph"
@@ -61,10 +61,10 @@
 
 
          <menuitem
-            parent="menu_board_document"
+            parent="menu_reports_document"
             action="open_board_document_manager"
             sequence="1"
-            id="menu_board_document_manager"
+            id="menu_reports_document_manager"
             icon="terp-graph"/>
 
         <record model="ir.ui.view" id="board_document_manager_form1">
@@ -107,10 +107,10 @@
         </record>
 
         <menuitem
-            parent="menu_board_document"
+            parent="menu_reports_document"
             action="open_board_document_manager1"
             sequence="1"
-            id="menu_board_document_manager1"
+            id="menu_reports_document_manager1"
             icon="terp-graph"/>
      </data>
  </openerp>
diff --git a/addons/document/content_index.py b/addons/document/content_index.py
index e7f88834647..d6012e60091 100644
--- a/addons/document/content_index.py
+++ b/addons/document/content_index.py
@@ -153,7 +153,10 @@ class contentIndex(object):
                 if realfname :
                     fname = realfname
                 else:
-                    bname,ext = os.path.splitext(filename)
+                    try:
+                        bname,ext = os.path.splitext(filename or 'test.tmp')
+                    except Exception:
+                        bname, ext = filename, 'tmp'
                     fd, fname = tempfile.mkstemp(suffix=ext)
                     os.write(fd, content)
                     os.close(fd)
diff --git a/addons/document/document.py b/addons/document/document.py
index aa893b617c3..6ab6cae5281 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -28,6 +28,7 @@ import os
 
 import pooler
 import netsvc
+from osv.orm import except_orm
 #import StringIO
 
 from psycopg2 import Binary
@@ -72,33 +73,32 @@ class document_file(osv.osv):
         return res
 
     _columns = {
-        'user_id': fields.many2one('res.users', 'Owner', select=1),
-        'group_ids': fields.many2many('res.groups', 'document_group_rel', 'item_id', 'group_id', 'Groups'),
-        # the directory id now is mandatory. It can still be computed automatically.
-        'parent_id': fields.many2one('document.directory', 'Directory', select=1),
-        'file_size': fields.integer('File Size', required=True),
-        'file_type': fields.char('Content Type', size=128),
+        # Columns from ir.attachment:
+        'create_date': fields.datetime('Date Created', readonly=True),
+        'create_uid':  fields.many2one('res.users', 'Creator', readonly=True),
+        'write_date': fields.datetime('Date Modified', readonly=True),
+        'write_uid':  fields.many2one('res.users', 'Last Modification User', readonly=True),
+        'res_model': fields.char('Attached Model', size=64, readonly=True),
+        'res_id': fields.integer('Attached ID', readonly=True),
+
         # If ir.attachment contained any data before document is installed, preserve
         # the data, don't drop the column!
         'db_datas': fields.binary('Data', oldname='datas'),
-        'index_content': fields.text('Indexed Content'),
-        'write_date': fields.datetime('Date Modified', readonly=True),
-        'write_uid':  fields.many2one('res.users', 'Last Modification User', readonly=True),
-        'create_date': fields.datetime('Date Created', readonly=True),
-        'create_uid':  fields.many2one('res.users', 'Creator', readonly=True),
-        'store_method': fields.selection([('db', 'Database'), ('fs', 'Filesystem'), ('link', 'Link')], "Storing Method"),
         'datas': fields.function(_data_get, method=True, fnct_inv=_data_set, string='File Content', type="binary", nodrop=True),
-        'url': fields.char('File URL',size=64),
-        'store_fname': fields.char('Stored Filename', size=200),
-        'res_model': fields.char('Attached Model', size=64), #res_model
-        'res_id': fields.integer('Attached ID'), #res_id
-        'partner_id':fields.many2one('res.partner', 'Partner', select=1),
-        'type':fields.selection([
-            ('url','URL'),
-            ('binary','Binary'),
 
-        ],'Type', help="Type is used to separate URL and binary File"),
+        # Fields of document:
+        'user_id': fields.many2one('res.users', 'Owner', select=1),
+        # 'group_ids': fields.many2many('res.groups', 'document_group_rel', 'item_id', 'group_id', 'Groups'),
+        # the directory id now is mandatory. It can still be computed automatically.
+        'parent_id': fields.many2one('document.directory', 'Directory', select=1, required=True),
+        'index_content': fields.text('Indexed Content'),
+        'partner_id':fields.many2one('res.partner', 'Partner', select=1),
         'company_id': fields.many2one('res.company', 'Company'),
+        'file_size': fields.integer('File Size', required=True),
+        'file_type': fields.char('Content Type', size=128),
+        
+        # fields used for file storage
+        'store_fname': fields.char('Stored Filename', size=200),
     }
 
     def __get_def_directory(self, cr, uid, context=None):
@@ -109,8 +109,6 @@ class document_file(osv.osv):
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'ir.attachment', context=c),
         'user_id': lambda self, cr, uid, ctx:uid,
         'file_size': lambda self, cr, uid, ctx:0,
-        'store_method': lambda *args: 'db',
-        'type': 'binary',
         'parent_id': __get_def_directory
     }
     _sql_constraints = [
@@ -122,7 +120,7 @@ class document_file(osv.osv):
         res_model = vals.get('res_model', False)
         res_id = vals.get('res_id', 0)
         if op == 'write':
-            for file in self.browse(cr, uid, ids):
+            for file in self.browse(cr, uid, ids): # FIXME fields_only
                 if not name:
                     name = file.name
                 if not parent_id:
@@ -156,8 +154,41 @@ class document_file(osv.osv):
             return False
         if not self._check_duplication(cr, uid, vals, ids, 'write'):
             raise osv.except_osv(_('ValidateError'), _('File name must be unique!'))
-        result = super(document_file, self).write(cr, uid, ids, vals, context=context)
-        cr.commit()
+        if ('parent_id' in vals) or ('name' in vals):
+            # perhaps this file is renaming or changing directory
+            nctx = nodes.get_node_context(cr,uid,context)
+            dirobj = self.pool.get('document.directory')
+            if 'parent_id' in vals:
+                dbro = dirobj.browse(cr, uid, vals['parent_id'], context=context)
+                dnode = nctx.get_dir_node(cr, dbro)
+            else:
+                dbro = None
+                dnode = None
+            ids2 = []
+            result = False
+            for fbro in self.browse(cr, uid, ids, context=context):
+                if ('parent_id' not in vals or fbro.parent_id.id == vals['parent_id']) \
+                    and ('name' not in vals or fbro.name == vals['name']) :
+                        ids2.append(fbro.id)
+                        continue
+                fnode = nctx.get_file_node(cr, fbro)
+                res = fnode.move_to(cr, dnode or fnode.parent, vals.get('name', fbro.name), fbro, dbro, True)
+                if isinstance(res, dict):
+                    vals2 = vals.copy()
+                    vals2.update(res)
+                    wid = res.get('id', fbro.id)
+                    result = super(document_file,self).write(cr,uid,wid,vals2,context=context)
+                    # TODO: how to handle/merge several results?
+                elif res == True:
+                    ids2.append(fbro.id)
+                elif res == False:
+                    pass
+            ids = ids2
+        if 'file_size' in vals: # only write that field using direct SQL calls
+            del vals['file_size']
+        if len(ids) and len(vals):
+            result = super(document_file,self).write(cr, uid, ids, vals, context=context)
+        cr.commit() # ?
         return result
 
     def create(self, cr, uid, vals, context=None):
@@ -170,26 +201,10 @@ 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']], ['name', 'partner_id', 'address_id'], context=context)
-            if len(result):
-                obj = result[0]
-                if obj_model._name == 'res.partner':
-                    vals['partner_id'] = obj['id']
-                elif obj.get('address_id', False):
-                    if isinstance(obj['address_id'], tuple) or isinstance(obj['address_id'], list):
-                        address_id = obj['address_id'][0]
-                    else:
-                        address_id = obj['address_id']
-                    address = self.pool.get('res.partner.address').read(cr, uid, [address_id], context=context)
-                    if len(address):
-                        vals['partner_id'] = address[0]['partner_id'][0] or False
-                elif obj.get('partner_id', False):
-                    if isinstance(obj['partner_id'], tuple) or isinstance(obj['partner_id'], list):
-                        vals['partner_id'] = obj['partner_id'][0]
-                    else:
-                        vals['partner_id'] = obj['partner_id']
+        if vals.get('res_id', False) and vals.get('res_model', False) \
+                and not vals.get('partner_id', False):
+            vals['partner_id'] = self.__get_partner_id(cr, uid, \
+                vals['res_model'], vals['res_id'], context)
 
         datas = None
         if vals.get('link', False) :
@@ -198,13 +213,33 @@ class document_file(osv.osv):
         else:
             datas = vals.get('datas', False)
 
-        vals['file_size'] = datas and len(datas) or 0
+        if datas:
+            vals['file_size'] = len(datas)
+        else:
+            if vals.get('file_size'):
+                del vals['file_size']
         if not self._check_duplication(cr, uid, vals):
             raise osv.except_osv(_('ValidateError'), _('File name must be unique!'))
         result = super(document_file, self).create(cr, uid, vals, context)
-        cr.commit()
+        cr.commit() # ?
         return result
 
+    def __get_partner_id(self, cr, uid, res_model, res_id, context):
+        """ A helper to retrieve the associated partner from any res_model+id
+            It is a hack that will try to discover if the mentioned record is
+            clearly associated with a partner record.
+        """
+        obj_model = self.pool.get(res_model)
+        if obj_model._name == 'res.partner':
+            return res_id
+        elif 'partner_id' in obj_model._columns and obj_model._columns['partner_id']._obj == 'res.partner':
+            bro = obj_model.browse(self, cr, uid, res_id, context=context)
+            return bro.partner_id.id
+        elif 'address_id' in obj_model._columns and obj_model._columns['address_id']._obj == 'res.partner.address':
+            bro = obj_model.browse(self, cr, uid, res_id, context=context)
+            return bro.address_id.partner_id.id
+        return False
+
     def unlink(self, cr, uid, ids, context={}):
         stor = self.pool.get('document.storage')
         unres = []
diff --git a/addons/document/document_data.xml b/addons/document/document_data.xml
index c2bef5de34f..f13213034e8 100644
--- a/addons/document/document_data.xml
+++ b/addons/document/document_data.xml
@@ -9,7 +9,7 @@
     </record>
     
     <record model="document.storage" id="storage_default">
-        <field name="name">Default DB storage</field>
+        <field name="name">Database storage</field>
         <field name="type">db</field>
         <field name="user_id" ref="base.user_admin"/>
     </record>
@@ -17,7 +17,7 @@
     <record model="document.directory" id="dir_root">
         <field name="name">Documents</field>
         <field name="user_id" ref="base.user_admin"/>
-	<field name="storage_id" ref="storage_default"/>
+        <field name="storage_id" ref="storage_default"/>
         <field name="ressource_id">0</field>
     </record>
 
@@ -25,7 +25,6 @@
         <field name="name">My Folder</field>
         <field name="parent_id" ref="dir_root"/>
         <field name="user_id" ref="base.user_admin"/>
-	<field name="storage_id" ref="storage_default"/>
         <field name="ressource_id">0</field>
  
     </record>
@@ -35,7 +34,6 @@
         <field name="parent_id" ref="dir_root"/>
         <field name="type">ressource</field>
         <field name="ressource_tree">1</field>
-	<field name="storage_id" ref="storage_default"/>
         <field name="ressource_id">0</field>
 
         <field name="ressource_type_id" search="[('model','=','res.partner.category')]" />
@@ -57,7 +55,6 @@
         <field name="name">Personal Folders</field>
         <field name="parent_id" ref="dir_root"/>
         <field name="type">ressource</field>
-	<field name="storage_id" ref="storage_default"/>
         <field name="ressource_type_id" ref="base.model_res_users" />
         <field name="ressource_id">0</field>
 
diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index fee633b7169..4d1079d6be9 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -39,19 +39,23 @@ class document_directory(osv.osv):
         'write_uid':  fields.many2one('res.users', 'Last Modification User', readonly=True),
         'create_date': fields.datetime('Date Created', readonly=True),
         'create_uid':  fields.many2one('res.users', 'Creator', readonly=True),
-        'file_type': fields.char('Content Type', size=32),
         'domain': fields.char('Domain', size=128, help="Use a domain if you want to apply an automatic filter on visible resources."),
         'user_id': fields.many2one('res.users', 'Owner'),
         'storage_id': fields.many2one('document.storage', 'Storage'),
         'group_ids': fields.many2many('res.groups', 'document_directory_group_rel', 'item_id', 'group_id', 'Groups'),
-        'parent_id': fields.many2one('document.directory', 'Parent Item'),
+        'parent_id': fields.many2one('document.directory', 'Parent Directory', select=1),
         'child_ids': fields.one2many('document.directory', 'parent_id', 'Children'),
         'file_ids': fields.one2many('ir.attachment', 'parent_id', 'Files'),
         'content_ids': fields.one2many('document.directory.content', 'directory_id', 'Virtual Files'),
-        'type': fields.selection([('directory','Static Directory'),('ressource','Other Resources')], 'Type', required=True),
-        'ressource_type_id': fields.many2one('ir.model', 'Directories Mapped to Objects',
-            help="Select an object here and Open ERP will create a mapping for each of these " \
-                 "objects, using the given domain, when browsing through FTP."),
+        'type': fields.selection([ 
+            ('directory','Static Directory'),
+            ('ressource','Folders per resource'),
+            ],
+            'Type', required=True, select=1,
+            help="Defines directory's behaviour."),
+        
+        'ressource_type_id': fields.many2one('ir.model', 'Resource model',
+            help="Select an object here and there will be one folder per record of that resource."),
         'resource_field': fields.many2one('ir.model.fields', 'Name field', help='Field to be used as name on resource directories. If empty, the "name" will be used.'),
         'ressource_parent_type_id': fields.many2one('ir.model', 'Parent Model',
             help="If you put an object here, this directory template will appear bellow all of these objects. " \
@@ -60,7 +64,7 @@ class document_directory(osv.osv):
         'ressource_tree': fields.boolean('Tree Structure',
             help="Check this if you want to use the same tree structure as the object selected in the system."),
         'dctx_ids': fields.one2many('document.directory.dctx', 'dir_id', 'Context fields'),
-        'company_id': fields.many2one('res.company', 'Company'),        
+        'company_id': fields.many2one('res.company', 'Company'),
     }
 
 
@@ -102,7 +106,8 @@ class document_directory(osv.osv):
     }
     _sql_constraints = [
         ('dirname_uniq', 'unique (name,parent_id,ressource_id,ressource_parent_type_id)', 'The directory name must be unique !'),
-        ('no_selfparent', 'check(parent_id <> id)', 'Directory cannot be parent of itself!')
+        ('no_selfparent', 'check(parent_id <> id)', 'Directory cannot be parent of itself!'),
+        ('dir_parented', 'check(parent_id IS NOT NULL OR storage_id IS NOT NULL)', 'Directory must have a parent or a storage')
     ]
     def name_get(self, cr, uid, ids, context={}):
         res = []
@@ -190,17 +195,8 @@ class document_directory(osv.osv):
         """
         if not context:
                 context = {}
-        lang = context.get('lang',False)
-        if not lang:
-            user = self.pool.get('res.users').browse(cr, uid, uid)
-            lang = user.context_lang 
-            context['lang'] = lang
             
-        try: #just instrumentation
-                return nodes.get_node_context(cr, uid, context).get_uri(cr, uri)
-        except Exception,e:
-                print "exception: ",e
-                raise
+        return nodes.get_node_context(cr, uid, context).get_uri(cr, uri)
 
 
     def _locate_child(self, cr, uid, root_id, uri,nparent, ncontext):
@@ -274,6 +270,8 @@ class document_directory(osv.osv):
             raise osv.except_osv(_('ValidateError'), _('Directory name contains special characters!'))
         return super(document_directory,self).create(cr, uid, vals, context)
 
+    # TODO def unlink(...
+
 document_directory()
 
 class document_directory_dctx(osv.osv):
diff --git a/addons/document/document_storage.py b/addons/document/document_storage.py
index 90be2bc47df..48f7ccf2f87 100644
--- a/addons/document/document_storage.py
+++ b/addons/document/document_storage.py
@@ -24,7 +24,10 @@ from osv import osv, fields
 import os
 import tools
 import base64
+import errno
 import logging
+from StringIO import StringIO
+import psycopg2
 
 from tools.misc import ustr
 from tools.translate import _
@@ -33,7 +36,9 @@ from osv.orm import except_orm
 
 import random
 import string
+import pooler
 import netsvc
+import nodes
 from content_index import cntIndex
 
 DMS_ROOT_PATH = tools.config.get('document_path', os.path.join(tools.config.get('root_path'), 'filestore'))
@@ -84,6 +89,127 @@ def create_directory(path):
     os.makedirs(path)
     return dir_name
 
+class nodefd_file(nodes.node_descriptor):
+    """ A descriptor to a real file
+
+    Inheriting directly from file doesn't work, since file exports
+    some read-only attributes (like 'name') that we don't like.
+    """
+    def __init__(self, parent, path, mode):
+        nodes.node_descriptor.__init__(self, parent)
+        self.__file = open(path, mode)
+        
+        for attr in ('closed', 'read', 'write', 'seek', 'tell'):
+            setattr(self,attr, getattr(self.__file, attr))
+
+    def close(self):
+        # TODO: locking in init, close()
+        self.__file.close()
+
+    
+class nodefd_db(StringIO, nodes.node_descriptor):
+    """ A descriptor to db data
+    """
+    def __init__(self, parent, ira_browse, mode):
+        nodes.node_descriptor.__init__(self, parent)
+        if mode.endswith('b'):
+            mode = mode[:-1]
+        
+        if mode in ('r', 'r+'):
+            cr = ira_browse._cr # reuse the cursor of the browse object, just now
+            cr.execute('SELECT db_datas FROM ir_attachment WHERE id = %s',(ira_browse.id,))
+            data = cr.fetchone()[0]
+            StringIO.__init__(self, data)
+        elif mode in ('w', 'w+'):
+            StringIO.__init__(self, None)
+            # at write, we start at 0 (= overwrite), but have the original
+            # data available, in case of a seek()
+        elif mode == 'a':
+            StringIO.__init__(self, None)
+        else:
+            logging.getLogger('document.storage').error("Incorrect mode %s specified", mode)
+            raise IOError(errno.EINVAL, "Invalid file mode")
+        self.mode = mode
+
+    def close(self):
+        # we now open a *separate* cursor, to update the data.
+        # FIXME: this may be improved, for concurrency handling
+        par = self._get_parent()
+        uid = par.context.uid
+        cr = pooler.get_db(par.context.dbname).cursor()
+        try:
+            if self.mode in ('w', 'w+', 'r+'):
+                data = self.getvalue()
+                out = psycopg2.Binary(data)
+                cr.execute("UPDATE ir_attachment SET db_datas = %s, file_size=%s WHERE id = %s",
+                    (out, len(data), par.file_id))
+            elif self.mode == 'a':
+                data = self.getvalue()
+                out = psycopg2.Binary(data)
+                cr.execute("UPDATE ir_attachment " \
+                    "SET db_datas = COALESCE(db_datas,'') || %s, " \
+                    "    file_size = COALESCE(file_size, 0) + %s " \
+                    " WHERE id = %s",
+                    (out, len(data), par.file_id))
+            cr.commit()
+        except Exception, e:
+            logging.getLogger('document.storage').exception('Cannot update db file #%d for close:', par.file_id)
+            raise
+        finally:
+            cr.close()
+        StringIO.close(self)
+
+class nodefd_db64(StringIO, nodes.node_descriptor):
+    """ A descriptor to db data, base64 (the old way)
+    
+        It stores the data in base64 encoding at the db. Not optimal, but
+        the transparent compression of Postgres will save the day.
+    """
+    def __init__(self, parent, ira_browse, mode):
+        nodes.node_descriptor.__init__(self, parent)
+        if mode.endswith('b'):
+            mode = mode[:-1]
+        
+        if mode in ('r', 'r+'):
+            StringIO.__init__(self, base64.decodestring(ira_browse.db_datas))
+        elif mode in ('w', 'w+'):
+            StringIO.__init__(self, None)
+            # at write, we start at 0 (= overwrite), but have the original
+            # data available, in case of a seek()
+        elif mode == 'a':
+            StringIO.__init__(self, None)
+        else:
+            logging.getLogger('document.storage').error("Incorrect mode %s specified", mode)
+            raise IOError(errno.EINVAL, "Invalid file mode")
+        self.mode = mode
+
+    def close(self):
+        # we now open a *separate* cursor, to update the data.
+        # FIXME: this may be improved, for concurrency handling
+        par = self._get_parent()
+        uid = par.context.uid
+        cr = pooler.get_db(par.context.dbname).cursor()
+        try:
+            if self.mode in ('w', 'w+', 'r+'):
+                out = self.getvalue()
+                cr.execute('UPDATE ir_attachment SET db_datas = %s::bytea, file_size=%s WHERE id = %s',
+                    (base64.encodestring(out), len(out), par.file_id))
+            elif self.mode == 'a':
+                out = self.getvalue()
+                # Yes, we're obviously using the wrong representation for storing our
+                # data as base64-in-bytea
+                cr.execute("UPDATE ir_attachment " \
+                    "SET db_datas = encode( (COALESCE(decode(encode(db_datas,'escape'),'base64'),'') || decode(%s, 'base64')),'base64')::bytea , " \
+                    "    file_size = COALESCE(file_size, 0) + %s " \
+                    " WHERE id = %s",
+                    (base64.encodestring(out), len(out), par.file_id))
+            cr.commit()
+        except Exception, e:
+            logging.getLogger('document.storage').exception('Cannot update db file #%d for close:', par.file_id)
+            raise
+        finally:
+            cr.close()
+        StringIO.close(self)
 
 class document_storage(osv.osv):
     """ The primary object for data storage.
@@ -110,7 +236,7 @@ class document_storage(osv.osv):
         'group_ids': fields.many2many('res.groups', 'document_storage_group_rel', 'item_id', 'group_id', 'Groups'),
         'dir_ids': fields.one2many('document.directory', 'parent_id', 'Directories'),
         'type': fields.selection([('db', 'Database'), ('filestore', 'Internal File storage'),
-            ('realstore', 'External file storage'), ('virtual', 'Virtual storage')], 'Type', required=True),
+                ('realstore','External file storage'),], 'Type', required=True),
         'path': fields.char('Path', size=250, select=1, help="For file storage, the root path of the storage"),
         'online': fields.boolean('Online', help="If not checked, media is currently offline and its contents not available", required=True),
         'readonly': fields.boolean('Read Only', help="If set, media is for reading only"),
@@ -147,6 +273,51 @@ class document_storage(osv.osv):
             ira = self.pool.get('ir.attachment').browse(cr, uid, file_node.file_id, context=context)
         return self.__get_data_3(cr, uid, boo, ira, context)
 
+    def get_file(self, cr, uid, id, file_node, mode, context=None):
+        """ Return a file-like object for the contents of some node
+        """
+        if context is None:
+            context = {}
+        boo = self.browse(cr, uid, id, context)
+        if not boo.online:
+            raise RuntimeError('media offline')
+        
+        ira = self.pool.get('ir.attachment').browse(cr, uid, file_node.file_id, context=context)
+        if boo.type == 'filestore':
+            if not ira.store_fname:
+                # On a migrated db, some files may have the wrong storage type
+                # try to fix their directory.
+                if ira.file_size:
+                    self._doclog.warning( "ir.attachment #%d does not have a filename, but is at filestore, fix it!" % ira.id)
+                raise IOError(errno.ENOENT, 'No file can be located')
+            fpath = os.path.join(boo.path, ira.store_fname)
+            return nodefd_file(file_node, path=fpath, mode=mode)
+
+        elif boo.type == 'db':
+            # TODO: we need a better api for large files
+            return nodefd_db(file_node, ira_browse=ira, mode=mode)
+
+        elif boo.type == 'db64':
+            return nodefd_db64(file_node, ira_browse=ira, mode=mode)
+
+        elif boo.type == 'realstore':
+            if not ira.store_fname:
+                # On a migrated db, some files may have the wrong storage type
+                # try to fix their directory.
+                if ira.file_size:
+                    self._doclog.warning("ir.attachment #%d does not have a filename, trying the name." %ira.id)
+                sfname = ira.name
+            fpath = os.path.join(boo.path,ira.store_fname or ira.name)
+            if not os.path.exists(fpath):
+                raise IOError("File not found: %s" % fpath)
+            return nodefd_file(file_node, path=fpath, mode=mode)
+
+        elif boo.type == 'virtual':
+            raise ValueError('Virtual storage does not support static files')
+        
+        else:
+            raise TypeError("No %s storage" % boo.type)
+
     def __get_data_3(self, cr, uid, boo, ira, context):
         if not boo.online:
             raise RuntimeError('media offline')
@@ -159,13 +330,21 @@ class document_storage(osv.osv):
                 return None
             fpath = os.path.join(boo.path, ira.store_fname)
             return file(fpath, 'rb').read()
-        elif boo.type == 'db':
+        elif boo.type == 'db64':
             # TODO: we need a better api for large files
             if ira.db_datas:
                 out = base64.decodestring(ira.db_datas)
             else:
                 out = ''
             return out
+        elif boo.type == 'db':
+            # We do an explicit query, to avoid type transformations.
+            cr.execute('SELECT db_datas FROM ir_attachment WHERE id = %s', (ira.id,))
+            res = cr.fetchone()
+            if res:
+                return res[0]
+            else:
+                return ''
         elif boo.type == 'realstore':
             if not ira.store_fname:
                 # On a migrated db, some files may have the wrong storage type
@@ -180,6 +359,10 @@ class document_storage(osv.osv):
                 return None
             else:
                 raise IOError("File not found: %s" % fpath)
+
+        elif boo.type == 'virtual':
+            raise ValueError('Virtual storage does not support static files')
+
         else:
             raise TypeError("No %s storage" % boo.type)
 
@@ -228,7 +411,13 @@ class document_storage(osv.osv):
                 raise except_orm(_('Error!'), str(e))
         elif boo.type == 'db':
             filesize = len(data)
-            # will that work for huge data? TODO
+            # will that work for huge data?
+            out = psycopg2.Binary(data)
+            cr.execute('UPDATE ir_attachment SET db_datas = %s WHERE id = %s',
+                (out, file_node.file_id))
+        elif boo.type == 'db64':
+            filesize = len(data)
+            # will that work for huge data?
             out = base64.encodestring(data)
             cr.execute('UPDATE ir_attachment SET db_datas = %s WHERE id = %s',
                 (out, file_node.file_id))
@@ -260,6 +449,10 @@ class document_storage(osv.osv):
             except Exception,e :
                 self._doclog.warning("Couldn't save data:", exc_info=True)
                 raise except_orm(_('Error!'), str(e))
+
+        elif boo.type == 'virtual':
+            raise ValueError('Virtual storage does not support static files')
+
         else:
             raise TypeError("No %s storage" % boo.type)
 
@@ -276,16 +469,21 @@ class document_storage(osv.osv):
                 self._doclog.debug('Cannot index file:', exc_info=True)
                 pass
 
+            try:
+                icont_u = ustr(icont)
+            except UnicodeError:
+                icont_u = ''
+
             # a hack: /assume/ that the calling write operation will not try
             # to write the fname and size, and update them in the db concurrently.
             # We cannot use a write() here, because we are already in one.
             cr.execute('UPDATE ir_attachment SET store_fname = %s, file_size = %s, index_content = %s, file_type = %s WHERE id = %s',
-                (store_fname, filesize, ustr(icont), mime, file_node.file_id))
+                (store_fname, filesize, icont_u, mime, file_node.file_id))
             file_node.content_length = filesize
             file_node.content_type = mime
             return True
         except Exception, e :
-            self._doclog.warning( "Couldn't save data:", exc_info=True)
+            self._doclog.warning("Couldn't save data:", exc_info=True)
             # should we really rollback once we have written the actual data?
             # at the db case (only), that rollback would be safe
             raise except_orm(_('Error at doc write!'), str(e))
@@ -303,7 +501,7 @@ class document_storage(osv.osv):
                 return None
             path = storage_bo.path
             return (storage_bo.id, 'file', os.path.join(path, fname))
-        elif storage_bo.type == 'db':
+        elif storage_bo.type in ('db', 'db64'):
             return None
         elif storage_bo.type == 'realstore':
             fname = fil_bo.store_fname
@@ -312,7 +510,7 @@ class document_storage(osv.osv):
             path = storage_bo.path
             return ( storage_bo.id, 'file', os.path.join(path, fname))
         else:
-            raise TypeError("No %s storage" % boo.type)
+            raise TypeError("No %s storage" % storage_bo.type)
 
     def do_unlink(self, cr, uid, unres):
         for id, ktype, fname in unres:
@@ -326,6 +524,92 @@ class document_storage(osv.osv):
 
         return True
 
+    def simple_rename(self, cr, uid, file_node, new_name, context=None):
+        """ A preparation for a file rename.
+            It will not affect the database, but merely check and perhaps
+            rename the realstore file.
+            
+            @return the dict of values that can safely be be stored in the db.
+        """
+        sbro = self.browse(cr, uid, file_node.storage_id, context=context)
+        assert sbro, "The file #%d didn't provide storage" % file_node.file_id
+        
+        if sbro.type in ('filestore', 'db', 'db64'):
+            # nothing to do for a rename, allow to change the db field
+            return { 'name': new_name, 'datas_fname': new_name }
+        elif sbro.type == 'realstore':
+            fname = fil_bo.store_fname
+            if not fname:
+                return ValueError("Tried to rename a non-stored file")
+            path = storage_bo.path
+            oldpath = os.path.join(path, fname)
+            
+            for ch in ('*', '|', "\\", '/', ':', '"', '<', '>', '?', '..'):
+                if ch in new_name:
+                    raise ValueError("Invalid char %s in name %s" %(ch, new_name))
+                
+            file_node.fix_ppath(cr, ira)
+            npath = file_node.full_path() or []
+            dpath = [path,]
+            dpath.extend(npath[:-1])
+            dpath.append(new_name)
+            newpath = os.path.join(*dpath)
+            # print "old, new paths:", oldpath, newpath
+            os.rename(oldpath, newpath)
+            return { 'name': new_name, 'datas_fname': new_name, 'store_fname': new_name }
+        else:
+            raise TypeError("No %s storage" % boo.type)
+
+    def simple_move(self, cr, uid, file_node, ndir_bro, context=None):
+        """ A preparation for a file move.
+            It will not affect the database, but merely check and perhaps
+            move the realstore file.
+            
+            @param ndir_bro a browse object of document.directory, where this
+                    file should move to.
+            @return the dict of values that can safely be be stored in the db.
+        """
+        sbro = self.browse(cr, uid, file_node.storage_id, context=context)
+        assert sbro, "The file #%d didn't provide storage" % file_node.file_id
+
+        par = ndir_bro
+        psto = None
+        while par:
+            if par.storage_id:
+                psto = par.storage_id.id
+                break
+            par = par.parent_id
+        if file_node.storage_id != psto:
+            self._doclog.debug('Cannot move file %r from %r to %r', file_node, file_node.parent, ndir_bro.name)
+            raise NotImplementedError('Cannot move files between storage media')
+
+        if sbro.type in ('filestore', 'db', 'db64'):
+            # nothing to do for a rename, allow to change the db field
+            return { 'parent_id': ndir_bro.id }
+        elif sbro.type == 'realstore':
+            raise NotImplementedError("Cannot move in realstore, yet") # TODO
+            fname = fil_bo.store_fname
+            if not fname:
+                return ValueError("Tried to rename a non-stored file")
+            path = storage_bo.path
+            oldpath = os.path.join(path, fname)
+            
+            for ch in ('*', '|', "\\", '/', ':', '"', '<', '>', '?', '..'):
+                if ch in new_name:
+                    raise ValueError("Invalid char %s in name %s" %(ch, new_name))
+                
+            file_node.fix_ppath(cr, ira)
+            npath = file_node.full_path() or []
+            dpath = [path,]
+            dpath.extend(npath[:-1])
+            dpath.append(new_name)
+            newpath = os.path.join(*dpath)
+            # print "old, new paths:", oldpath, newpath
+            os.rename(oldpath, newpath)
+            return { 'name': new_name, 'datas_fname': new_name, 'store_fname': new_name }
+        else:
+            raise TypeError("No %s storage" % boo.type)
+
 
 document_storage()
 
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 1a5a4c8e1e3..693d7370567 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -16,7 +16,7 @@
                     <field name="online"/>
                     <field name="readonly"/>
                 </group>
-                <group colspan="2" attrs="{'invisible':[('type','=','db')]}">
+                <group colspan="2" attrs="{'invisible':[('type','in',['db', 'db64'])]}">
                     <field name="path"/>
                 </group>
             </form>
@@ -61,6 +61,7 @@
         name="Storage Media"
         action="action_document_storage_form"
         id="menu_document_storage_media"
+        groups="base.group_extended"
         parent="menu_document_management_configuration"/>
 
     <record model="ir.ui.view" id="view_document_directory_form">
@@ -68,25 +69,32 @@
         <field name="model">document.directory</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Directories">
+            <form string="Directories" col="6">
                 <field name="name" select="1" colspan="4"/>
-                <field name="user_id"/>
                 <field name="parent_id"/>
-                <field name="storage_id" />
+                <field name="storage_id" widget="selection" />
+                <field name="user_id"/>
                 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 <notebook colspan="4">
                 <page string="Definition">
                     <separator string="Directory Type" colspan="4"/>
                     <field name="type"/>
-                    <field name="ressource_type_id"  on_change="onchange_content_id(ressource_type_id)" attrs="{'required': [('type','=','ressource')], 'readonly': [('type','=','static')]}"/>
-                    <newline/>
-                    <field name="domain" attrs="{'required': [('type','=','ressource')], 'readonly': [('type','=','static')]}"/>
-                    <field name="ressource_tree"/>
-                    <field name="resource_field"     domain="[('model_id','=',ressource_type_id), ('ttype', 'in', ('char', 'selection', 'date', 'datetime'))]"/>
-                    <field name="ressource_id" select="2" readonly="1"/>
-                    <field name="ressource_parent_type_id"/>
+                    <group colspan="4" col="4" attrs="{'invisible': [('type','!=','ressource')]}">
+                        <field name="ressource_type_id"  on_change="onchange_content_id(ressource_type_id)" 
+                            attrs="{'required': [('type','=','ressource')] }"/>
+                        <newline/>
+                        <field name="resource_field"     domain="[('model_id','=',ressource_type_id), ('ttype', 'in', ('char', 'selection', 'date', 'datetime'))]"/>
+                        <field name="ressource_tree"/>
+                        <newline/>
+                        <field name="domain" attrs="{'required': [('type','=','ressource')], 'readonly': [('type','=','static')]}"/>
+                    </group>
+                    <group colspan="4" col="4">
+                        <field name="ressource_parent_type_id"/>
+                        <field name="ressource_id" select="2" readonly="1"/>
+                    </group>
+                    
                 </page>
-                <page string="Generated Files">
+                <page string="Generated Files" groups="base.group_extended">
                     <label colspan="4" string="For each entry here, virtual files will appear in this folder." />
                     <field name="content_ids" nolabel="1" colspan="4" attrs="{'readonly': [('ressource_type_id','=',False)]}">
                         <form string="Contents">
@@ -108,6 +116,7 @@
                     </field>
                 </page>
                 <page string="Dynamic context" groups="base.group_extended">
+                    <label colspan="4" string="Define words in the context, for all child directories and files" />
                     <field name="dctx_ids" nolabel="1" colspan="4">
                         <tree string="Fields" editable="bottom">
                             <field name="field"/>
@@ -120,6 +129,8 @@
                     </field>
                 </page>
                 <page string="Security">
+                    <label colspan="4" string="Only members of these groups will have access to this directory and its files." />
+                    <label colspan="4" string="These groups, however, do NOT apply to children directories, which must define their own groups." />
                     <field name="group_ids" colspan="4" nolabel="1"/>
                 </page>
                 </notebook>
@@ -213,44 +224,46 @@
         <field name="arch" type="xml">
             <form string="Documents">
                 <group colspan="4" col="6">
-                    <field name="name" select="1" />
-                    <field name="type"/>
+                    <field name="name" select="1" colspan="4" />
                     <field name="parent_id"/>
+                    <newline/>
+                    <field name="user_id"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </group>
                 <notebook colspan="4">
                 <page string="Attachment">
                     <group col="2" colspan="2">
                         <separator string="Data" colspan="2"/>
+                        <field name="type"/>
+                        <newline />
                         <group col="2" colspan="2" attrs="{'invisible':[('type','=','url')]}">
-                        <field name="datas" filename="datas_fname"/>
-                        <field name="datas_fname" select="1"/>
+                            <field name="datas" filename="datas_fname"/>
+                            <field name="datas_fname" select="1"/>
                         </group>
                         <group col="2" colspan="2" attrs="{'invisible':[('type','=','binary')]}">
-                        <field name="url" widget="url"/>
+                            <field name="url" widget="url"/>
                         </group>
                     </group>
                     <group col="2" colspan="2">
-                        <separator string="Relation" colspan="2"/>
-                         <field name="res_name" readonly="1"/>
-                         <field name="partner_id"/>
-                          <field name="user_id"/>
-                    </group>
-                    <group col="4" colspan="4">
-                        <separator string="History" colspan="4"/>
-                        <group col="4" colspan="4">
-                        <field name="create_uid"/>
-                        <field name="create_date"/>
-                        </group>
-                        <group col="4" colspan="4">
-                        <field name="write_uid"/>
-                        <field name="write_date"/>
+                    <field name="res_id" invisible="True"/>
+                        <group col="2" colspan="2" attrs="{'invisible': [('res_id','=',0)]}">
+                            <separator string="Attached To" colspan="2"/>
+                            <field name="res_model" readonly="True" invisible="True"/>
+                            <field name="res_name" readonly="1"/>
                         </group>
+                        <separator string="Related to" colspan="2"/>
+                            <field name="partner_id"/>
+                    </group>
+                    <group col="2" colspan="2" groups="base.group_extended">
+                        <separator string="Created" colspan="2"/>
+                        <field name="create_uid" readonly="1"/>
+                        <field name="create_date" readonly="1"/>
+                    </group>
+                    <group col="2" colspan="2" groups="base.group_extended">
+                        <separator string="Modified" colspan="2"/>
+                        <field name="write_uid" readonly="1"/>
+                        <field name="write_date" readonly="1"/>
                     </group>
-
-                </page>
-                <page string="Security">
-                    <field name="group_ids" colspan="4" nolabel="1"/>
                 </page>
                 <page string="Indexed Content" groups="base.group_extended">
                     <field name="index_content" colspan="4" nolabel="1"/>
@@ -269,11 +282,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
              <search string="IR Attachment">
-             <filter icon="terp-go-month" string="Recent"
-                    help="less 1 month modified/created attachments"
+             <filter icon="terp-go-month" string="Recent Month"
+                    help="Attachment modified/created last 30 days"
                     domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
                 />
                  <separator orientation="vertical"/>
+                 <field name="name"/>
+                 <field name="parent_id" />
                  <field name="user_id">
                     <filter icon="terp-personal"
                         domain="[('user_id','=', False)]"
@@ -284,9 +299,9 @@
                 <newline/>
                 <group expand="0" string="Group By...">
                     <filter string="Partner" icon="terp-personal" domain="[]"
-                       context="{'group_by':'partner_id'}" />
+                       context="{'group_by':'partner_id'}"  groups="base.group_extended"/>
                     <filter string="Directory" icon="terp-folder-green" domain="[]" context="{'group_by':'parent_id'}"/>
-                    <filter string="Type"  domain="[]" context="{'group_by':'type'}"/>
+                    <filter string="Type"  domain="[]" context="{'group_by':'type'}"  groups="base.group_extended"/>
                     <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                     <filter string="Company" icon="terp-personal" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                 </group>
@@ -301,11 +316,12 @@
         <field name="arch" type="xml">
             <tree colors="blue:type in ('url',)">
                 <field name="name"/>
-                <field name="type"/>
-                <field name="datas_fname"/>
+                <field name="parent_id" />
                 <field name="user_id"/>
                 <field name="create_date"/>
                 <field name="write_date"/>
+                <field name="partner_id" groups="base.group_extended" />
+                <field name="type"  groups="base.group_extended"/>
             </tree>
 
         </field>
diff --git a/addons/document/nodes.py b/addons/document/nodes.py
index dcd864e6db0..8988437e6aa 100644
--- a/addons/document/nodes.py
+++ b/addons/document/nodes.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,18 +15,19 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
-import base64
-import StringIO
+# import base64
+# import StringIO
 from osv import osv, fields
 from osv.orm import except_orm
-import urlparse
+# import urlparse
 import pooler
 from tools.safe_eval import safe_eval
 
+import errno
 import os
 import time
 
@@ -49,7 +50,7 @@ class node_context(object):
         context """
     cached_roots = {}
 
-    def __init__(self, cr, uid, context=None):        
+    def __init__(self, cr, uid, context=None):
         self.dbname = cr.dbname
         self.uid = uid
         self.context = context
@@ -57,26 +58,104 @@ class node_context(object):
         assert self._dirobj
         self.rootdir = False #self._dirobj._get_root_directory(cr,uid,context)
 
+    def __eq__(self, other):
+        if not type(other) == node_context:
+            return False
+        if self.dbname != other.dbname:
+            return False
+        if self.uid != other.uid:
+            return False
+        if self.context != other.context:
+            return False
+        if self.rootdir != other.rootdir:
+            return False
+        return True
+
+    def __ne__(self, other):
+        return not self.__eq__(other)
+
     def get_uri(self, cr,  uri):
         """ Although this fn passes back to doc.dir, it is needed since
-        it is a potential caching point """            
-        (ndir, duri) =  self._dirobj._locate_child(cr, self.uid, self.rootdir, uri, None, self)          
-        while duri:                    
-            ndir = ndir.child(cr, duri[0])            
+        it is a potential caching point """
+        (ndir, duri) =  self._dirobj._locate_child(cr, self.uid, self.rootdir, uri, None, self)
+        while duri:
+            ndir = ndir.child(cr, duri[0])
             if not ndir:
-                return False            
-            duri = duri[1:] 
+                return False
+            duri = duri[1:]
         return ndir
 
+    def get_dir_node(self, cr, dbro):
+        """Create (or locate) a node for a directory
+            @param dbro a browse object of document.directory
+        """
+        fullpath = self._dirobj.get_full_path(cr, self.uid, dbro.id, self.context)
+        if dbro.type == 'directory':
+            return node_dir(fullpath, None ,self, dbro)
+        elif dbro.type == 'ressource':
+            assert dbro.ressource_parent_type_id == False
+            return node_res_dir(fullpath, None, self, dbro)
+        else:
+            raise ValueError("dir node for %s type", dbro.type)
+
+    def get_file_node(self, cr, fbro):
+        """ Create or locate a node for a static file
+            @param fbro a browse object of an ir.attachment
+        """
+        parent = None
+        if fbro.parent_id:
+            parent = self.get_dir_node(cr, fbro.parent_id)
+
+        return node_file(fbro.name,parent,self,fbro)
+
+
+class node_descriptor(object):
+    """A file-like interface to the data contents of a node.
+
+       This class is NOT a node, but an /open descriptor/ for some
+       node. It can hold references to a cursor or a file object,
+       because the life of a node_descriptor will be the open period
+       of the data.
+       It should also take care of locking, with any native mechanism
+       or using the db.
+       For the implementation, it would be OK just to wrap around file,
+       StringIO or similar class. The node_descriptor is only needed to
+       provide the link to the parent /node/ object.
+    """
 
+    def __init__(self, parent):
+        assert isinstance(parent, node_class)
+        self.name = parent.displayname
+        self.__parent = parent
 
+    def _get_parent(self):
+        return self.__parent
+
+    def open(self, **kwargs):
+        raise NotImplementedError
+
+    def close(self):
+        raise NotImplementedError
+
+    def read(self, size=None):
+        raise NotImplementedError
+
+    def seek(self, offset, whence=None):
+        raise NotImplementedError
+
+    def tell(self):
+        raise NotImplementedError
+
+    def write(self, str):
+        raise NotImplementedError
 
 class node_class(object):
     """ this is a superclass for our inodes
-        It is an API for all code that wants to access the document files. 
+        It is an API for all code that wants to access the document files.
         Nodes have attributes which contain usual file properties
         """
     our_type = 'baseclass'
+
     def __init__(self, path, parent, context):
         assert isinstance(context,node_context)
         assert (not parent ) or isinstance(parent,node_class)
@@ -87,16 +166,25 @@ class node_class(object):
         self.mimetype = 'application/octet-stream'
         self.create_date = None
         self.write_date = None
+        self.unixperms = 0660
+        self.uuser = 'user'
+        self.ugroup = 'group'
         self.content_length = 0
         # dynamic context:
         self.dctx = {}
         if parent:
             self.dctx = parent.dctx.copy()
         self.displayname = 'Object'
-    
+
+    def __eq__(self, other):
+        return NotImplemented
+
+    def __ne__(self, other):
+        return not self.__eq__(other)
+
     def full_path(self):
         """ Return the components of the full path for some
-            node. 
+            node.
             The returned list only contains the names of nodes.
         """
         if self.parent:
@@ -105,9 +193,14 @@ class node_class(object):
             s = []
         if isinstance(self.path,list):
             s+=self.path
+        elif self.path is None:
+            s.append('')
         else:
             s.append(self.path)
         return s #map(lambda x: '/' +x, s)
+        
+    def __repr__(self):
+        return "%s@/%s" % (self.our_type, '/'.join(self.full_path()))
 
     def children(self, cr, domain=None):
         print "node_class.children()"
@@ -117,19 +210,43 @@ class node_class(object):
         print "node_class.child()"
         return None
 
+    def get_uri(self, cr, uri):
+        duri = uri
+        ndir = self
+        while duri:
+            ndir = ndir.child(cr, duri[0])
+            if not ndir:
+                return False
+            duri = duri[1:]
+        return ndir
+
     def path_get(self):
         print "node_class.path_get()"
         return False
-    
+
     def get_data(self,cr):
-        raise TypeError('no data for %s'% self.type)
+        raise IOError(errno.EINVAL, 'no data for %s' % self.type)
+
+    def open_data(self, cr, mode):
+        """ Open a node_descriptor object for this node.
+
+        @param the mode of open, eg 'r', 'w', 'a', like file.open()
+
+        This operation may lock the data for this node (and accross
+        other node hierarchies), until the descriptor is close()d. If
+        the node is locked, subsequent opens (depending on mode) may
+        immediately fail with an exception (which?).
+        For this class, there is no data, so no implementation. Each
+        child class that has data should override this.
+        """
+        raise IOError(errno.EINVAL, 'no data for %s' % self.type)
 
     def _get_storage(self,cr):
         raise RuntimeError("no storage for base class")
 
     def get_etag(self,cr):
         """ Get a tag, unique per object + modification.
-    
+
             see. http://tools.ietf.org/html/rfc2616#section-13.3.3 """
         return self._get_ttag(cr) + ':' + self._get_wtag(cr)
 
@@ -139,14 +256,14 @@ class node_class(object):
             wtime = time.mktime(time.strptime(self.write_date,'%Y-%m-%d %H:%M:%S'))
         else: wtime = time.time()
         return str(wtime)
-    
+
     def _get_ttag(self,cr):
         """ Get a unique tag for this type/id of object.
             Must be overriden, so that each node is uniquely identified.
         """
         print "node_class.get_ttag()",self
         raise RuntimeError("get_etag stub()")
-    
+
     def get_dav_props(self, cr):
         """ If this class has special behaviour for GroupDAV etc, export
         its capabilities """
@@ -161,6 +278,35 @@ class node_class(object):
     def get_dav_eprop(self, cr, ns, prop):
         return None
 
+    def move_to(self, cr, ndir_node, new_name=False, fil_obj=None, ndir_obj=None, in_write=False):
+        """ Move this node to a new parent directory.
+        @param ndir_node the collection that this node should be moved under
+        @param new_name a name to rename this node to. If omitted, the old
+            name is preserved
+        @param fil_obj, can be None, is the browse object for the file,
+            if already available.
+        @param ndir_obj must be the browse object to the new doc.directory
+            location, where this node should be moved to.
+        in_write: When called by write(), we shouldn't attempt to write the
+            object, but instead return the dict of vals (avoid re-entrance).
+            If false, we should write all data to the object, here, as if the
+            caller won't do anything after calling move_to()
+
+        Return value:
+            True: the node is moved, the caller can update other values, too.
+            False: the node is either removed or fully updated, the caller
+                must discard the fil_obj, not attempt to write any more to it.
+            dict: values to write back to the object. *May* contain a new id!
+
+        Depending on src and target storage, implementations of this function
+        could do various things.
+        Should also consider node<->content, dir<->dir moves etc.
+
+        Move operations, as instructed from APIs (eg. request from DAV) could
+        use this function.
+        """
+        raise NotImplementedError
+
     def rm(self, cr):
         raise RuntimeError("Not Implemented")
 
@@ -172,17 +318,18 @@ class node_class(object):
 
 class node_database(node_class):
     """ A node representing the database directory
-        
+
     """
     our_type = 'database'
     def __init__(self, path=[], parent=False, context=None):
         super(node_database,self).__init__(path, parent, context)
+        self.unixperms = 040750
 
     def children(self, cr, domain=None):
-        res = self._child_get(cr, domain=domain) + self._file_get(cr)        
+        res = self._child_get(cr, domain=domain) + self._file_get(cr)
         return res
 
-    def child(self, cr, name, domain=None):        
+    def child(self, cr, name, domain=None):
         res = self._child_get(cr, name, domain=None)
         if res:
             return res[0]
@@ -196,7 +343,7 @@ class node_database(node_class):
         uid = self.context.uid
         ctx = self.context.context.copy()
         ctx.update(self.dctx)
-        where = [('parent_id','=',parent_id)]                              
+        where = [('parent_id','=',parent_id)]
         if name:
             where.append(('name','=',name))
         if not domain:
@@ -204,40 +351,29 @@ class node_database(node_class):
 
         where2 = where + domain + [('type', '=', 'directory')]
         ids = dirobj.search(cr, uid, where2, context=ctx)
-        res = []        
-        for dirr in dirobj.browse(cr, uid, ids, context=ctx):            
+        res = []
+        for dirr in dirobj.browse(cr, uid, ids, context=ctx):
             res.append(node_dir(dirr.name, self, self.context,dirr))
-        
+
         where2 = where + domain + [('type', '=', 'ressource'), ('ressource_parent_type_id','=',False)]
-        ids = dirobj.search(cr, uid, where2, context=ctx)        
-        for dirr in dirobj.browse(cr, uid, ids, context=ctx):                       
+        ids = dirobj.search(cr, uid, where2, context=ctx)
+        for dirr in dirobj.browse(cr, uid, ids, context=ctx):
             res.append(node_res_dir(dirr.name, self, self.context, dirr))
-        
-        fil_obj = dirobj.pool.get('ir.attachment')        
+
+        fil_obj = dirobj.pool.get('ir.attachment')
         ids = fil_obj.search(cr, uid, where, context=ctx)
         if ids:
             for fil in fil_obj.browse(cr, uid, ids, context=ctx):
                 res.append(node_file(fil.name, self, self.context, fil))
         return res
 
-    def _file_get(self,cr, nodename=False, directory_id=False):
+    def _file_get(self,cr, nodename=False):
         res = []
-        cntobj = self.context._dirobj.pool.get('document.directory.content')
-        uid = self.context.uid
-        ctx = self.context.context.copy()
-        ctx.update(self.dctx)
-        where = [('directory_id','=',directory_id) ]
-        ids = cntobj.search(cr, uid, where, context=ctx)
-        for content in cntobj.browse(cr, uid, ids, context=ctx):
-            res3 = cntobj._file_get(cr, self, nodename, content)
-            if res3:
-                res.extend(res3)
-
         return res
 
     def _get_ttag(self,cr):
         return 'db-%s' % cr.dbname
-        
+
 
 class node_dir(node_database):
     our_type = 'collection'
@@ -253,6 +389,7 @@ class node_dir(node_database):
         # TODO: the write date should be MAX(file.write)..
         self.write_date = dirr and (dirr.write_date or dirr.create_date) or False
         self.content_length = 0
+        self.unixperms = 040750
         if dctx:
             self.dctx.update(dctx)
         dc2 = self.context.context
@@ -268,29 +405,48 @@ class node_dir(node_database):
                     print e
                     pass
 
-    
+    def __eq__(self, other):
+        if type(self) != type(other):
+            return False
+        if not self.context == other.context:
+            return False
+        # Two directory nodes, for the same document.directory, may have a
+        # different context! (dynamic folders)
+        if self.dctx != other.dctx:
+            return False
+        return self.dir_id == other.dir_id
+
     def get_data(self, cr):
         res = ''
-        for child in self.children(cr):            
-            res += child.get_data(cr)  
+        for child in self.children(cr):
+            res += child.get_data(cr)
         return res
 
-    
-
     def _file_get(self, cr, nodename=False):
-        return super(node_dir,self)._file_get(cr, nodename, self.dir_id)       
+        res = super(node_dir,self)._file_get(cr, nodename)
+        
+        cntobj = self.context._dirobj.pool.get('document.directory.content')
+        uid = self.context.uid
+        ctx = self.context.context.copy()
+        ctx.update(self.dctx)
+        where = [('directory_id','=',self.dir_id) ]
+        ids = cntobj.search(cr, uid, where, context=ctx)
+        for content in cntobj.browse(cr, uid, ids, context=ctx):
+            res3 = cntobj._file_get(cr, self, nodename, content)
+            if res3:
+                res.extend(res3)
 
-    
+        return res
 
     def _child_get(self, cr, name=None, domain=None):
         return super(node_dir,self)._child_get(cr, name, self.dir_id, domain=domain)
 
     def rmcol(self, cr):
         uid = self.context.uid
-        directory = self.context._dirobj.browse(cr, uid, self.dir_id) 
-        res = False       
+        directory = self.context._dirobj.browse(cr, uid, self.dir_id)
+        res = False
         if not directory:
-            raise OSError(2, 'Not such file or directory.')        
+            raise OSError(2, 'Not such file or directory.')
         if directory._table_name=='document.directory':
             if self.children(cr):
                 raise OSError(39, 'Directory not empty.')
@@ -300,12 +456,12 @@ class node_dir(node_database):
         return res
 
     def create_child_collection(self, cr, objname):
-        object2 = False            
+        object2 = False
         dirobj = self.context._dirobj
         uid = self.context.uid
         ctx = self.context.context.copy()
         ctx.update(self.dctx)
-        obj = dirobj.browse(cr, uid, self.dir_id)            
+        obj = dirobj.browse(cr, uid, self.dir_id)
         if obj and (obj.type == 'ressource') and not object2:
             raise OSError(1, 'Operation not permited.')
 
@@ -315,11 +471,11 @@ class node_dir(node_database):
                 'ressource_parent_type_id': obj and obj.ressource_type_id.id or False,
                 'ressource_id': object2 and object2.id or False,
                 'parent_id' : obj and obj.id or False
-        }                 
-        
+        }
+
         return dirobj.create(cr, uid, val)
-        
-    
+
+
     def create_child(self, cr, path, data):
         """ API function to create a child file object and node
             Return the node_* created
@@ -354,11 +510,55 @@ class node_dir(node_database):
         if self.write_date:
             wtime = time.mktime(time.strptime(self.write_date, '%Y-%m-%d %H:%M:%S'))
         else: wtime = time.time()
-        return str(wtime)    
-    
+        return str(wtime)
+
     def _get_ttag(self,cr):
         return 'dir-%d' % self.dir_id
 
+    def move_to(self, cr, ndir_node, new_name=False, fil_obj=None, ndir_obj=None, in_write=False):
+        """ Move directory. This operation is simple, since the present node is
+        only used for static, simple directories.
+            Note /may/ be called with ndir_node = None, to rename the document root.
+        """
+        if ndir_node and (ndir_node.context != self.context):
+            raise NotImplementedError("Cannot move directories between contexts")
+
+        dir_obj = self.context._dirobj
+        if not fil_obj:
+            dbro = dir_obj.browse(cr, self.context.uid, self.dir_id, context=self.context.context)
+        else:
+            dbro = dir_obj
+            assert dbro.id == self.dir_id
+
+        if not dbro:
+            raise IndexError("Cannot locate dir %d", self.dir_id)
+
+        if (not self.parent) and ndir_node:
+            if not dbro.parent_id:
+                raise IOError(errno.EPERM, "Cannot move the root directory!")
+            self.parent = self.context.get_dir_node(cr, dbro.parent_id.id)
+            assert self.parent
+        
+        # TODO: test if parent is writable.
+
+        if self.parent != ndir_node:
+            logger.debug('Cannot move dir %r from %r to %r', self, self.parent, ndir_node)
+            raise NotImplementedError('Cannot move dir to another dir')
+
+        ret = {}
+        if new_name and (new_name != dbro.name):
+            ret['name'] = new_name
+
+        del dbro
+
+        if not in_write:
+            # We have to update the data ourselves
+            if ret:
+                dir_obj.write(cr, self.context.uid, [self.dir_id,], ret, self.context.context)
+            ret = True
+
+        return ret
+
 class node_res_dir(node_class):
     """ A special sibling to node_dir, which does only contain dynamically
         created folders foreach resource in the foreign model.
@@ -376,26 +576,38 @@ class node_res_dir(node_class):
         # TODO: the write date should be MAX(file.write)..
         self.write_date = dirr.write_date or dirr.create_date
         self.content_length = 0
+        self.unixperms = 040750
         self.res_model = dirr.ressource_type_id and dirr.ressource_type_id.model or False
         self.resm_id = dirr.ressource_id
         self.namefield = dirr.resource_field.name or 'name'
         self.displayname = dirr.name
-        # Important: the domain is evaluated using the *parent* dctx!        
+        # Important: the domain is evaluated using the *parent* dctx!
         self.domain = dirr.domain
         self.ressource_tree = dirr.ressource_tree
         # and then, we add our own vars in the dctx:
         if dctx:
             self.dctx.update(dctx)
-    
+
         # and then, we prepare a dctx dict, for deferred evaluation:
         self.dctx_dict = {}
         for dfld in dirr.dctx_ids:
             self.dctx_dict['dctx_' + dfld.field] = dfld.expr
 
+    def __eq__(self, other):
+        if type(self) != type(other):
+            return False
+        if not self.context == other.context:
+            return False
+        # Two nodes, for the same document.directory, may have a
+        # different context! (dynamic folders)
+        if self.dctx != other.dctx:
+            return False
+        return self.dir_id == other.dir_id
+
     def children(self, cr, domain=None):
         return self._child_get(cr, domain=domain)
 
-    def child(self,cr, name, domain=None):        
+    def child(self,cr, name, domain=None):
         res = self._child_get(cr, name, domain=domain)
         if res:
             return res[0]
@@ -404,7 +616,7 @@ class node_res_dir(node_class):
     def _child_get(self, cr, name = None, domain=None):
         """ return virtual children of resource, based on the
             foreign object.
-        
+
             Note that many objects use NULL for a name, so we should
             better call the name_search(),name_get() set of methods
         """
@@ -417,31 +629,39 @@ class node_res_dir(node_class):
         ctx.update(self.dctx)
         where = []
         if self.domain:
-            where += safe_eval(self.domain, self.dctx)
+            app = safe_eval(self.domain, self.dctx)
+            if not app:
+                pass
+            elif isinstance(app, list):
+                where.extend(app)
+            elif isinstance(app, tuple):
+                where.append(app)
+            else:
+                raise RuntimeError("incorrect domain expr: %s" % self.domain)
         if self.resm_id:
             where.append(('id','=',self.resm_id))
-    
+
         if name:
             where.append((self.namefield,'=',name))
-        
+
         # print "Where clause for %s" % self.res_model, where
         if self.ressource_tree:
             object2 = False
             if self.resm_id:
-                object2 = dirobj.pool.get(self.res_model).browse(cr, uid, self.resm_id) or False                
-            if obj._parent_name in obj.fields_get(cr, uid):                    
+                object2 = dirobj.pool.get(self.res_model).browse(cr, uid, self.resm_id) or False
+            if obj._parent_name in obj.fields_get(cr, uid):
                 where.append((obj._parent_name,'=',object2 and object2.id or False))
-                
+
         resids = obj.search(cr, uid, where, context=ctx)
-        res = []        
+        res = []
         for bo in obj.browse(cr, uid, resids, context=ctx):
             if not bo:
                 continue
             name = getattr(bo, self.namefield)
             if not name:
                 continue
-                # Yes! we can't do better but skip nameless records.     
-             
+                # Yes! we can't do better but skip nameless records.
+
             res.append(node_res_obj(name, self.dir_id, self, self.context, self.res_model, bo))
         return res
 
@@ -458,7 +678,7 @@ class node_res_obj(node_class):
     def __init__(self, path, dir_id, parent, context, res_model, res_bo, res_id = None):
         super(node_res_obj,self).__init__(path, parent,context)
         assert parent
-        #todo: more info from dirr            
+        #todo: more info from dirr
         self.dir_id = dir_id
         self.mimetype = 'application/x-directory'
                         # 'httpd/unix-directory'
@@ -466,17 +686,18 @@ class node_res_obj(node_class):
         # TODO: the write date should be MAX(file.write)..
         self.write_date = parent.write_date
         self.content_length = 0
+        self.unixperms = 040750
         self.res_model = res_model
         self.domain = parent.domain
-        self.displayname = path  
-        self.dctx_dict = parent.dctx_dict      
-        if res_bo:            
-            self.res_id = res_bo.id            
+        self.displayname = path
+        self.dctx_dict = parent.dctx_dict
+        if res_bo:
+            self.res_id = res_bo.id
             dc2 = self.context.context
             dc2.update(self.dctx)
             dc2['res_model'] = res_model
             dc2['res_id'] = res_bo.id
-            dc2['this'] = res_bo            
+            dc2['this'] = res_bo
             for fld,expr in self.dctx_dict.items():
                 try:
                     self.dctx[fld] = safe_eval(expr, dc2)
@@ -487,11 +708,26 @@ class node_res_obj(node_class):
         else:
             self.res_id = res_id
 
-    def children(self, cr, domain=None):        
+    def __eq__(self, other):
+        if type(self) != type(other):
+            return False
+        if not self.context == other.context:
+            return False
+        if not self.res_model == other.res_model:
+            return False
+        if not self.res_id == other.res_id:
+            return False
+        if self.domain != other.domain:
+            return False
+        if self.dctx != other.dctx:
+            return False
+        return self.dir_id == other.dir_id
+
+    def children(self, cr, domain=None):
         return self._child_get(cr, domain=domain) + self._file_get(cr)
 
-    def child(self, cr, name, domain=None):            
-        res = self._child_get(cr, name, domain=domain)                
+    def child(self, cr, name, domain=None):
+        res = self._child_get(cr, name, domain=domain)
         if res:
             return res[0]
         res = self._file_get(cr, name)
@@ -546,7 +782,7 @@ class node_res_obj(node_class):
                 return ('vevent-collection','http://groupdav.org/')
         return None
 
-    def _child_get(self, cr, name=None, domain=None):        
+    def _child_get(self, cr, name=None, domain=None):
         dirobj = self.context._dirobj
         uid = self.context.uid
         ctx = self.context.context.copy()
@@ -554,38 +790,38 @@ class node_res_obj(node_class):
         directory = dirobj.browse(cr, uid, self.dir_id)
         obj = dirobj.pool.get(self.res_model)
         where = []
-        res = []        
+        res = []
         if name:
-            where.append(('name','=',name))   
-       
+            where.append(('name','=',name))
+
         # Directory Structure display in tree structure
-        if self.res_id and directory.ressource_tree:  
-            where1 = []                 
-            if obj._parent_name in obj.fields_get(cr, uid):                    
+        if self.res_id and directory.ressource_tree:
+            where1 = []
+            if obj._parent_name in obj.fields_get(cr, uid):
                 where1 = where + [(obj._parent_name, '=', self.res_id)]
-            resids = obj.search(cr, uid, where1, context=ctx)                        
+            resids = obj.search(cr, uid, where1, context=ctx)
             for bo in obj.browse(cr, uid, resids, context=ctx):
                 namefield = directory.resource_field.name or 'name'
                 if not bo:
                     continue
                 res_name = getattr(bo, namefield)
                 if not res_name:
-                    continue                
-                res.append(node_res_obj(res_name, self.dir_id, self, self.context, self.res_model, res_bo = bo))        
-        
-        
-        where2 = where + [('parent_id','=',self.dir_id) ]        
-        ids = dirobj.search(cr, uid, where2, context=ctx) 
+                    continue
+                res.append(node_res_obj(res_name, self.dir_id, self, self.context, self.res_model, res_bo = bo))
+
+
+        where2 = where + [('parent_id','=',self.dir_id) ]
+        ids = dirobj.search(cr, uid, where2, context=ctx)
         for dirr in dirobj.browse(cr, uid, ids, context=ctx):
             if dirr.type == 'directory':
                 res.append(node_res_obj(dirr.name, dirr.id, self, self.context, self.res_model, res_bo = None, res_id = self.res_id))
             elif dirr.type == 'ressource':
                 # child resources can be controlled by properly set dctx
                 res.append(node_res_dir(dirr.name,self,self.context, dirr, {'active_id': self.res_id}))
-        
 
-       
-        
+
+
+
         fil_obj = dirobj.pool.get('ir.attachment')
         where3 = where2  + [('res_model', '=', self.res_model), ('res_id','=',self.res_id)]
         # print "where clause for dir_obj", where2
@@ -593,20 +829,20 @@ class node_res_obj(node_class):
         if ids:
             for fil in fil_obj.browse(cr, uid, ids, context=ctx):
                 res.append(node_file(fil.name, self, self.context, fil))
-    
-        
-        # Get Child Ressource Directories                
-        if directory.ressource_type_id and directory.ressource_type_id.id:              
-            where4 = where + [('ressource_parent_type_id','=',directory.ressource_type_id.id)]            
+
+
+        # Get Child Ressource Directories
+        if directory.ressource_type_id and directory.ressource_type_id.id:
+            where4 = where + [('ressource_parent_type_id','=',directory.ressource_type_id.id)]
             where5 = where4 + [('ressource_id','=',0)]
-            dirids = dirobj.search(cr,uid, where5)            
+            dirids = dirobj.search(cr,uid, where5)
             where5 = where4 + [('ressource_id','=',self.res_id)]
-            dirids = dirids + dirobj.search(cr,uid, where5)            
+            dirids = dirids + dirobj.search(cr,uid, where5)
             for dirr in dirobj.browse(cr, uid, dirids, context=ctx):
                 if dirr.type == 'directory' and not dirr.parent_id:
                     res.append(node_res_obj(dirr.name, dirr.id, self, self.context, self.res_model, res_bo = None, res_id = self.res_id))
                 if dirr.type == 'ressource':
-                    res.append(node_res_dir(dirr.name, self, self.context, dirr, {'active_id': self.res_id}))                
+                    res.append(node_res_dir(dirr.name, self, self.context, dirr, {'active_id': self.res_id}))
         return res
 
     def create_child_collection(self, cr, objname):
@@ -614,26 +850,26 @@ class node_res_obj(node_class):
         uid = self.context.uid
         ctx = self.context.context.copy()
         ctx.update(self.dctx)
-        res_obj = dirobj.pool.get(self.context.context['res_model'])           
-        
-        object2 = res_obj.browse(cr, uid, self.context.context['res_id']) or False            
-        
-        obj = dirobj.browse(cr, uid, self.dir_id)            
+        res_obj = dirobj.pool.get(self.context.context['res_model'])
+
+        object2 = res_obj.browse(cr, uid, self.context.context['res_id']) or False
+
+        obj = dirobj.browse(cr, uid, self.dir_id)
         if obj and (obj.type == 'ressource') and not object2:
             raise OSError(1, 'Operation not permited.')
 
-        
+
         val = {
                 'name': objname,
                 'ressource_parent_type_id': obj and obj.ressource_type_id.id or False,
                 'ressource_id': object2 and object2.id or False,
                 'parent_id' : False
-        }        
-        if (obj and (obj.type in ('directory'))) or not object2:                
-            val['parent_id'] =  obj and obj.id or False            
-        
+        }
+        if (obj and (obj.type in ('directory'))) or not object2:
+            val['parent_id'] =  obj and obj.id or False
+
         return dirobj.create(cr, uid, val)
-    
+
     def create_child(self, cr, path, data):
         """ API function to create a child file object and node
             Return the node_* created
@@ -655,7 +891,8 @@ class node_res_obj(node_class):
         fil_id = fil_obj.create(cr, uid, val, context=ctx)
         fil = fil_obj.browse(cr, uid, fil_id, context=ctx)
         fnode = node_file(path, self, self.context, fil)
-        fnode.set_data(cr, data, fil)
+        if data is not None:
+            fnode.set_data(cr, data, fil)
         return fnode
 
     def _get_ttag(self,cr):
@@ -673,41 +910,50 @@ class node_file(node_class):
         self.write_date = fil.write_date or fil.create_date
         self.content_length = fil.file_size
         self.displayname = fil.name
-        
+
         # This only propagates the problem to get_data. Better
         # fix those files to point to the root dir.
-        if fil.parent_id:
-            self.storage_id = fil.parent_id.storage_id.id
-        else:
-            self.storage_id = None    
-
-    def open(self, cr, mode=False):
-        uid = self.context.uid
-        if self.type in ('collection','database'):
-            return False            
-        fobj = self.context._dirobj.pool.get('ir.attachment').browse(cr, uid, self.file_id, context=self.context.context)
-        if fobj.store_method and fobj.store_method== 'fs' :
-            s = StringIO.StringIO(self.get_data(cr, fobj))
-        else:
-            s = StringIO.StringIO(base64.decodestring(fobj.db_datas or ''))
-        s.name = self
-        return s   
+        self.storage_id = None
+        par = fil.parent_id
+        while par:
+            if par.storage_id and par.storage_id.id:
+                self.storage_id = par.storage_id.id
+                break
+            par = par.parent_id
+
+    def __eq__(self, other):
+        if type(self) != type(other):
+            return False
+        if not self.context == other.context:
+            return False
+        if self.dctx != other.dctx:
+            return False
+        return self.file_id == other.file_id
+
+
+    def open_data(self, cr, mode):
+        stor = self.storage_id
+        assert stor, "No storage for file #%s" % self.file_id
+        # If storage is not set properly, we are just screwed here, don't
+        # try to get it from default.
+        stobj = self.context._dirobj.pool.get('document.storage')
+        return stobj.get_file(cr, self.context.uid, stor, self, mode=mode, context=self.context.context)
 
     def rm(self, cr):
         uid = self.context.uid
         document_obj = self.context._dirobj.pool.get('ir.attachment')
         if self.type in ('collection','database'):
-            return False  
-        document = document_obj.browse(cr, uid, self.file_id, context=self.context.context)        
+            return False
+        document = document_obj.browse(cr, uid, self.file_id, context=self.context.context)
         res = False
         if document and document._table_name == 'ir.attachment':
             res = document_obj.unlink(cr, uid, [document.id])
-        return res                 
+        return res
 
     def fix_ppath(self, cr, fbro):
         """Sometimes we may init this w/o path, parent.
         This function fills the missing path from the file browse object
-        
+
         Note: this may be an expensive operation, do on demand. However,
         once caching is in, we might want to do that at init time and keep
         this object anyway
@@ -716,7 +962,7 @@ class node_file(node_class):
             return
         assert fbro
         uid = self.context.uid
-        
+
         dirpath = []
         if fbro.parent_id:
             dirobj = self.context._dirobj.pool.get('document.directory')
@@ -725,25 +971,22 @@ class node_file(node_class):
             dirpath.append(fbro.datas_fname)
         else:
             dirpath.append(fbro.name)
-        
+
         if len(dirpath)>1:
             self.path = dirpath
         else:
-            self.path = dirpath[0]   
-    
+            self.path = dirpath[0]
+
     def get_data(self, cr, fil_obj = None):
-        """ Retrieve the data for some file. 
+        """ Retrieve the data for some file.
             fil_obj may optionally be specified, and should be a browse object
             for the file. This is useful when the caller has already initiated
             the browse object. """
         # this is where storage kicks in..
         stor = self.storage_id
-        if not stor:
-            data_obj = self.context._dirobj.pool.get('ir.model.data')
-            data_id = data_obj._get_id(cr, self.context.uid, 'document', 'storage_db')
-            if data_id:
-                stor = data_obj.browse(cr, self.context.uid, data_id, context=self.context.context).res_id 
-        assert stor
+        assert stor, "No storage for file #%s" % self.file_id
+        # If storage is not set properly, we are just screwed here, don't
+        # try to get it from default.
         stobj = self.context._dirobj.pool.get('document.storage')
         return stobj.get_data(cr, self.context.uid,stor, self,self.context.context, fil_obj)
 
@@ -755,24 +998,75 @@ class node_file(node_class):
         return self.content_length
 
     def set_data(self, cr, data, fil_obj = None):
-        """ Store data at some file. 
+        """ Store data at some file.
             fil_obj may optionally be specified, and should be a browse object
             for the file. This is useful when the caller has already initiated
             the browse object. """
         # this is where storage kicks in..
         stor = self.storage_id
-        if not stor:
-            data_obj = self.context._dirobj.pool.get('ir.model.data')
-            data_id = data_obj._get_id(cr, self.context.uid, 'document', 'storage_db')
-            if data_id:
-                stor = data_obj.browse(cr, self.context.uid, data_id, context=self.context.context).res_id 
-        assert stor
+        assert stor, "No storage for file #%s" % self.file_id
         stobj = self.context._dirobj.pool.get('document.storage')
         return stobj.set_data(cr, self.context.uid,stor, self, data, self.context.context, fil_obj)
 
     def _get_ttag(self,cr):
         return 'file-%d' % self.file_id
 
+    def move_to(self, cr, ndir_node, new_name=False, fil_obj=None, ndir_obj=None, in_write=False):
+        if ndir_node.context != self.context:
+            raise NotImplementedError("Cannot move files between contexts")
+
+        doc_obj = self.context._dirobj.pool.get('ir.attachment')
+        if not fil_obj:
+            dbro = doc_obj.browse(cr, self.context.uid, self.file_id, context=self.context.context)
+        else:
+            dbro = fil_obj
+            assert dbro.id == self.file_id, "%s != %s for %r" % (dbro.id, self.file_id, self)
+
+        if not dbro:
+            raise IndexError("Cannot locate doc %d", self.file_id)
+
+        if (not self.parent):
+            # there *must* be a parent node for this one
+            self.parent = self.context.get_dir_node(cr, dbro.parent_id.id)
+            assert self.parent
+        
+        # TODO: test if parent is writable.
+
+
+        ret = {}
+        if self.parent != ndir_node:
+            if not (isinstance(self.parent, node_dir) and isinstance(ndir_node, node_dir)):
+                logger.debug('Cannot move file %r from %r to %r', self, self.parent, ndir_node)
+                raise NotImplementedError('Cannot move files between dynamic folders')
+
+            if not ndir_obj:
+                ndir_obj = self.context._dirobj.browse(cr, self.context.uid, \
+                        ndir_node.dir_id, context=self.context.context)
+
+            assert ndir_obj.id == ndir_node.dir_id
+
+            stobj = self.context._dirobj.pool.get('document.storage')
+            r2 = stobj.simple_move(cr, self.context.uid, self, ndir_obj, \
+                        context=self.context.context)
+            ret.update(r2)
+
+        if new_name and (new_name != dbro.name):
+            if len(ret):
+                raise NotImplementedError("Cannot rename and move") # TODO
+            stobj = self.context._dirobj.pool.get('document.storage')
+            r2 = stobj.simple_rename(cr, self.context.uid, self, new_name, self.context.context)
+            ret.update(r2)
+
+        del dbro
+
+        if not in_write:
+            # We have to update the data ourselves
+            if ret:
+                doc_obj.write(cr, self.context.uid, [self.file_id,], ret, self.context.context)
+            ret = True
+
+        return ret
+
 class node_content(node_class):
     our_type = 'content'
     def __init__(self, path, parent, context, cnt, dctx = None, act_id=None):
@@ -781,6 +1075,7 @@ class node_content(node_class):
         self.create_date = False
         self.write_date = False
         self.content_length = False
+        self.unixperms = 0640
         self.extension = cnt.extension
         self.report_id = cnt.report_id and cnt.report_id.id
         #self.mimetype = cnt.extension.
@@ -790,22 +1085,15 @@ class node_content(node_class):
         self.act_id = act_id
 
     def open(self, cr, mode=False):
-        uid = self.context.uid
-        if self.type in ('collection','database'):
-            return False                    
-        pool = self.context._dirobj.pool
-        res = getattr(pool.get('document.directory.content'), 'process_read')(cr, uid, self)
-        res = StringIO.StringIO(res)
-        res.name = self
-        return res     
-    
+        raise DeprecationWarning()
+
     def fill_fields(self, cr, dctx = None):
         """ Try to read the object and fill missing fields, like mimetype,
             dates etc.
             This function must be different from the constructor, because
             it uses the db cursor.
         """
-        
+
         cr.execute('SELECT DISTINCT mimetype FROM document_directory_content_type WHERE active AND code = %s;',
                 (self.extension,))
         res = cr.fetchall()
diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml
index 00743d768e7..d0ba1303a39 100644
--- a/addons/document/report/document_report_view.xml
+++ b/addons/document/report/document_report_view.xml
@@ -33,22 +33,22 @@
             </field>
         </record>
 
-		<record id="view_report_document_user_search" model="ir.ui.view">
+        <record id="view_report_document_user_search" model="ir.ui.view">
             <field name="name">report.document.user.search</field>
             <field name="model">report.document.user</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="All users files">
-                	<group col="12" colspan="4">
+                        <group col="12" colspan="4">
                         <separator orientation="vertical"/>
-						<filter icon="terp-go-year" string="This Year" domain="[('name','=',time.localtime()[0])]" help="All Months Files"/>
-						<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.localtime()[1])]" help="This Months Files"/>
-						<separator orientation="vertical"/>
-						<field name="name" select="1"/>
-						<field name="month" select="1"/>
-	                    <field name="user" select="1"/>
-	                    <field name="directory" select="1"/>
-	           		</group>
+                            <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.localtime()[0])]" help="All Months Files"/>
+                            <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.localtime()[1])]" help="This Months Files"/>
+                            <separator orientation="vertical"/>
+                            <field name="name" select="1"/>
+                            <field name="month" select="1"/>
+                            <field name="user" select="1"/>
+                            <field name="directory" select="1"/>
+                        </group>
                </search>
             </field>
         </record>
@@ -61,7 +61,7 @@
             <field name="res_model">report.document.user</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree</field>
-            <field name="context">{"search_default_user":uid}</field>
+            <field name="context">{'search_default_user': 'user_id'}</field>
             <field name="search_view_id" ref="view_report_document_user_search"/>
         </record>
 
diff --git a/addons/document/test/document_test2.yml b/addons/document/test/document_test2.yml
new file mode 100644
index 00000000000..a83cfa23bfe
--- /dev/null
+++ b/addons/document/test/document_test2.yml
@@ -0,0 +1,73 @@
+- 
+    In order to test the document management
+-
+    I make sure the default installation has some storage and root directory.
+-
+    !assert {model: document.storage, id: storage_default }:
+      - id != False
+-
+    !assert {model: document.directory, id: dir_root}:
+      - storage_id != False
+-
+    I create a "Testing" folder where all the test data will go.
+-
+    !record {model: document.directory, id: dir_tests }:
+        name: 'Testing'
+        parent_id: dir_root
+-
+    I create an attachment into the root folder (w. empty fields, test that
+    defaults work)
+-
+    !record {model: ir.attachment, id: file_test1 }:
+        name: Test file
+-
+    I delete the attachment from the root folder
+-
+    !delete {model: ir.attachment, id: file_test1, search: }
+-
+    I create an attachment into the Testing folder.
+-
+    !record {model: ir.attachment, id: file_test2 }:
+        name: Test file 2
+        parent_id: dir_tests
+-
+    I update the attachment with data, namely "abcd"
+-
+    !record {model: ir.attachment, id: file_test2 }:
+        datas: "abcd"
+-
+    I test that the datas of the attachment are correct
+-
+    !assert {model: ir.attachment, id: file_test2 }:
+        - datas == "abcd\n"
+        - file_size == 5
+        - file_type == 'text/plain'
+-
+    I rename the attachment.
+-
+    !record {model: ir.attachment, id: file_test2 }:
+        name: Test renamed 2
+-
+    I search the testing folder for attachments.
+-
+    !python {model: ir.attachment}: |
+        ids = self.search(cr, uid, [('parent_id.name','=', 'Testing'), ('name','=','Test renamed 2')])
+        assert ids == [ ref("file_test2") ], ids
+-
+    I create an attachment to a 3rd resource, eg. a res.country
+-
+    !record {model: ir.attachment, id: attach_3rd }:
+        name: 'Res country attachment.txt'
+        parent_id: dir_tests
+        datas: 'defg'
+        res_model: res.country
+        res_id: !eval ref("base.za")
+-
+    I search for the res.country attachment
+-
+    !python {model: ir.attachment}: |
+        ids = self.search(cr, uid, [('res_model', '=', 'res.country'), ('res_id', '=', ref("base.za"))])
+        assert ids == [ ref("attach_3rd")], ids
+-
+    !delete {model: ir.attachment, id: attach_3rd, search: }
+-
diff --git a/addons/document_ftp/__openerp__.py b/addons/document_ftp/__openerp__.py
index a2b88d0a2a2..89281c9072f 100644
--- a/addons/document_ftp/__openerp__.py
+++ b/addons/document_ftp/__openerp__.py
@@ -26,20 +26,23 @@
     'category': 'Generic Modules/Others',
     'description': """This is a support FTP Interface with document management system.
     With this module you would not only be able to access documents through open erp
-    but you would also be able to connect with them through the file system using the FTP protocol.
+    but you would also be able to connect with them through the file system using the 
+    a FTP client.
 """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'document'],
     'init_xml': [],
     'update_xml': [
-        'wizard/ftp_configuration_view.xml',  
-        'wizard/ftp_browse_view.xml',        
+        'wizard/ftp_configuration_view.xml',
+        'wizard/ftp_browse_view.xml',
         'security/ir.model.access.csv'
     ],
     'demo_xml': [],
     'test': [
-        'test/document_ftp_test.yml',
+        'test/document_ftp_test2.yml',
+        # 'test/document_ftp_test2.yml',
+        'test/document_ftp_test4.yml',
     ],
     'installable': True,
     'active': False,
diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py
index 60b3c24c7a9..4f0428ecb02 100644
--- a/addons/document_ftp/ftpserver/abstracted_fs.py
+++ b/addons/document_ftp/ftpserver/abstracted_fs.py
@@ -4,6 +4,8 @@ import time
 from tarfile import filemode
 import StringIO
 import base64
+import logging
+import errno
 
 import glob
 import fnmatch
@@ -13,14 +15,10 @@ import netsvc
 import os
 from service import security
 from osv import osv
-from document.nodes import node_res_dir, node_res_obj
+#from document.nodes import node_res_dir, node_res_obj
+from document.nodes import get_node_context
 import stat
 
-def log(message):
-    logger = netsvc.Logger()
-    logger.notifyChannel('DMS', netsvc.LOG_ERROR, message)
-
-
 def _get_month_name(month):
     month=int(month)
     if month==1:return 'Jan'
@@ -36,75 +34,10 @@ def _get_month_name(month):
     elif month==11:return 'Nov'
     elif month==12:return 'Dec'
 
-def _to_unicode(s):
-    try:
-        return s.decode('utf-8')
-    except UnicodeError:
-        try:
-            return s.decode('latin')
-        except UnicodeError:
-            try:
-                return s.encode('ascii')
-            except UnicodeError:
-                return s
-
-def _to_decode(s):
-    try:
-        return s.encode('utf-8')
-    except UnicodeError:
-        try:
-            return s.encode('latin')
-        except UnicodeError:
-            try:
-                return s.decode('ascii')
-            except UnicodeError:
-                return s  
-    
-			
-class file_wrapper(StringIO.StringIO):
-    def __init__(self, sstr='', ressource_id=False, dbname=None, uid=1, name=''):
-        StringIO.StringIO.__init__(self, sstr)
-        self.ressource_id = ressource_id
-        self.name = name
-        self.dbname = dbname
-        self.uid = uid
-    def close(self, *args, **kwargs):
-        db,pool = pooler.get_db_and_pool(self.dbname)
-        cr = db.cursor()
-        cr.commit()
-        try:
-            val = self.getvalue()
-            val2 = {
-                'datas': base64.encodestring(val),
-                'file_size': len(val),
-            }
-            pool.get('ir.attachment').write(cr, self.uid, [self.ressource_id], val2)
-        finally:
-            cr.commit()
-            cr.close()
-        StringIO.StringIO.close(self, *args, **kwargs)
-
-class content_wrapper(StringIO.StringIO):
-    def __init__(self, dbname, uid, pool, node, name=''):
-        StringIO.StringIO.__init__(self, '')
-        self.dbname = dbname
-        self.uid = uid
-        self.node = node
-        self.pool = pool
-        self.name = name
-    def close(self, *args, **kwargs):
-        db,pool = pooler.get_db_and_pool(self.dbname)
-        cr = db.cursor()
-        cr.commit()
-        try:
-            getattr(self.pool.get('document.directory.content'), 'process_write')(cr, self.uid, self.node, self.getvalue())
-        finally:
-            cr.commit()
-            cr.close()
-        StringIO.StringIO.close(self, *args, **kwargs)
+from ftpserver import _to_decode, _to_unicode
 
 
-class abstracted_fs:
+class abstracted_fs(object):
     """A class used to interact with the file system, providing a high
     level, cross-platform interface compatible with both Windows and
     UNIX style filesystems.
@@ -117,11 +50,20 @@ class abstracted_fs:
      - (str) root: the user home directory.
      - (str) cwd: the current working directory.
      - (str) rnfr: source file to be renamed.
+
     """
 
+    def __init__(self):
+        self.root = None
+        self.cwd = '/'
+        self.cwd_node = None
+        self.rnfr = None
+        self._log = logging.getLogger('FTP.fs')
+
     # Ok
     def db_list(self):
-        #return pooler.pool_dic.keys()
+        """Get the list of available databases, with FTPd support
+        """
         s = netsvc.ExportService.getService('db')
         result = s.exp_list(document=True)
         self.db_name_list = []
@@ -135,13 +77,13 @@ class abstracted_fs:
                     if not cr.fetchone():
                         continue
     
-                    cr.execute("select id from ir_module_module where name like 'document%' and state='installed' ")
+                    cr.execute("SELECT id FROM ir_module_module WHERE name = 'document_ftp' AND state IN ('installed', 'to upgrade') ")
                     res = cr.fetchone()
                     if res and len(res):
                         self.db_name_list.append(db_name)
                     cr.commit()
-                except Exception, e:
-                    log(e)
+                except Exception:
+                    self._log.warning('Cannot use db "%s"', db_name)
             finally:
                 if cr is not None:
                     cr.close()
@@ -149,177 +91,85 @@ class abstracted_fs:
                 #    pooler.close_db(db_name)        
         return self.db_name_list
 
-    # Ok
-    def __init__(self):
-        self.root = None
-        self.cwd = '/'
-        self.rnfr = None
-
-    # --- Pathname / conversion utilities
-
-    # Ok
     def ftpnorm(self, ftppath):
         """Normalize a "virtual" ftp pathname (tipically the raw string
-        coming from client) depending on the current working directory.
-
-        Example (having "/foo" as current working directory):
-        'x' -> '/foo/x'
+        coming from client).
 
-        Note: directory separators are system independent ("/").
-        Pathname returned is always absolutized.
+        Pathname returned is relative!.
         """
-        if os.path.isabs(ftppath):
-            p = os.path.normpath(ftppath)
-        else:
-            p = os.path.normpath(os.path.join(self.cwd, ftppath))
+        p = os.path.normpath(ftppath)
         # normalize string in a standard web-path notation having '/'
-        # as separator.
+        # as separator. xrg: is that really in the spec?
         p = p.replace("\\", "/")
         # os.path.normpath supports UNC paths (e.g. "//a/b/c") but we
         # don't need them.  In case we get an UNC path we collapse
         # redundant separators appearing at the beginning of the string
         while p[:2] == '//':
             p = p[1:]
-        # Anti path traversal: don't trust user input, in the event
-        # that self.cwd is not absolute, return "/" as a safety measure.
-        # This is for extra protection, maybe not really necessary.
-        if not os.path.isabs(p):
-            p = "/"
+        if p == '.':
+            return ''
         return p
 
-    # Ok
+    def get_cwd(self):
+        """ return the cwd, decoded in utf"""
+        return _to_decode(self.cwd)
+
     def ftp2fs(self, path_orig, data):
-        path = self.ftpnorm(path_orig)        
-        if not data or (path and path=='/'):
-            return None               
-        path2 = filter(None,path.split('/'))[1:]
-        (cr, uid, pool) = data
-        if len(path2):     
-            path2[-1]=_to_unicode(path2[-1])        
-        res = pool.get('document.directory').get_object(cr, uid, path2[:])
-        if not res:
-            raise OSError(2, 'Not such file or directory.')
-        return res
+        raise DeprecationWarning()
 
-    # Ok
     def fs2ftp(self, node):        
+        """ Return the string path of a node, in ftp form
+        """
         res='/'
         if node:
             paths = node.full_path()
-            paths = map(lambda x: '/' +x, paths)
-            res = os.path.normpath(''.join(paths))
-            res = res.replace("\\", "/")        
-            while res[:2] == '//':
-                res = res[1:]
-            res = '/' + node.context.dbname + '/' + _to_decode(res)            
+            res = '/' + node.context.dbname + '/' +  \
+                _to_decode(os.path.join(*paths))
             
-        #res = node and ('/' + node.cr.dbname + '/' + _to_decode(self.ftpnorm(node.path))) or '/'
         return res
 
-    # Ok
     def validpath(self, path):
         """Check whether the path belongs to user's home directory.
-        Expected argument is a "real" filesystem pathname.
-
-        If path is a symbolic link it is resolved to check its real
-        destination.
-
-        Pathnames escaping from user's root directory are considered
-        not valid.
+        Expected argument is a datacr tuple
         """
-        return path and True or False
+        # TODO: are we called for "/" ?
+        return isinstance(path, tuple) and path[1] and True or False
 
     # --- Wrapper methods around open() and tempfile.mkstemp
 
-    # Ok
-    def create(self, node, objname, mode):
+    def create(self, datacr, objname, mode):
+        """ Create a children file-node under node, open it
+            @return open node_descriptor of the created node
+        """
         objname = _to_unicode(objname) 
-        cr = None       
+        cr , node, rem = datacr
         try:
-            uid = node.context.uid
-            pool = pooler.get_pool(node.context.dbname)
-            cr = pooler.get_db(node.context.dbname).cursor()
             child = node.child(cr, objname)
             if child:
-                if child.type in ('collection','database'):
+                if child.type not in ('file','content'):
                     raise OSError(1, 'Operation not permited.')
-                if child.type == 'content':
-                    s = content_wrapper(node.context.dbname, uid, pool, child)
-                    return s
-            fobj = pool.get('ir.attachment')
-            ext = objname.find('.') >0 and objname.split('.')[1] or False
-
-            # TODO: test if already exist and modify in this case if node.type=file
-            ### checked already exits
-            object2 = False
-            if isinstance(node, node_res_obj):
-                object2 = node and pool.get(node.context.context['res_model']).browse(cr, uid, node.context.context['res_id']) or False            
-            
-            cid = False
-            object = node.context._dirobj.browse(cr, uid, node.dir_id)
-            where = [('name','=',objname)]
-            if object and (object.type in ('directory')) or object2:
-                where.append(('parent_id','=',object.id))
-            else:
-                where.append(('parent_id','=',False))
-
-            if object2:
-                where += [('res_id','=',object2.id),('res_model','=',object2._name)]
-            cids = fobj.search(cr, uid, where)
-            if len(cids):
-                cid = cids[0]
-
-            if not cid:
-                val = {
-                    'name': objname,
-                    'datas_fname': objname,
-                    'parent_id' : node.dir_id, 
-                    'datas': '',
-                    'file_size': 0L,
-                    'file_type': ext,
-                    'store_method' :  (object.storage_id.type == 'filestore' and 'fs')\
-                                 or  (object.storage_id.type == 'db' and 'db')
-                }
-                if object and (object.type in ('directory')) or not object2:
-                    val['parent_id']= object and object.id or False
-                partner = False
-                if object2:
-                    if 'partner_id' in object2 and object2.partner_id.id:
-                        partner = object2.partner_id.id
-                    if object2._name == 'res.partner':
-                        partner = object2.id
-                    val.update( {
-                        'res_model': object2._name,
-                        'partner_id': partner,
-                        'res_id': object2.id
-                    })
-                cid = fobj.create(cr, uid, val, context={})
-            cr.commit()
 
-            s = file_wrapper('', cid, node.context.dbname, uid, )
-            return s
+                ret = child.open_data(cr, mode)
+                return ret
+        except EnvironmentError:
+            raise
         except Exception,e:
-            log(e)
+            self._log.exception('Cannot locate item %s at node %s', objname, repr(node))
+            pass
+
+        try:
+            child = node.create_child(cr, objname, data=None)
+            return child.open_data(cr, mode)
+        except Exception,e:
+            self._log.exception('Cannot create item %s at node %s', objname, repr(node))
             raise OSError(1, 'Operation not permited.')
-        finally:
-            if cr:
-                cr.close()
 
-    # Ok
-    def open(self, node, mode):
-        if not node:
+    def open(self, datacr, mode):
+        if not (datacr and datacr[1]):
             raise OSError(1, 'Operation not permited.')
         # Reading operation
-        cr = pooler.get_db(node.context.dbname).cursor()
-        res = False
-        #try:
-        if node.type not in ('collection','database'):            
-            res = node.open(cr, mode)   
-        #except:
-        #    pass
-        cr.close()     
-        if not res:
-            raise OSError(1, 'Operation not permited.')
+        cr, node, rem = datacr
+        res = node.open_data(cr, mode)
         return res
 
     # ok, but need test more
@@ -329,24 +179,12 @@ class abstracted_fs:
         name.  Unlike mkstemp it returns an object with a file-like
         interface.
         """
-        raise 'Not Yet Implemented'
-#        class FileWrapper:
-#            def __init__(self, fd, name):
-#                self.file = fd
-#                self.name = name
-#            def __getattr__(self, attr):
-#                return getattr(self.file, attr)
-#
-#        text = not 'b' in mode
-#        # max number of tries to find out a unique file name
-#        tempfile.TMP_MAX = 50
-#        fd, name = tempfile.mkstemp(suffix, prefix, dir, text=text)
-#        file = os.fdopen(fd, mode)
-#        return FileWrapper(file, name)
+        raise NotImplementedError
 
         text = not 'b' in mode
         # for unique file , maintain version if duplicate file
         if dir:
+	    # TODO
             cr = dir.cr
             uid = dir.uid
             pool = pooler.get_pool(node.context.dbname)
@@ -362,299 +200,212 @@ class abstracted_fs:
 
 
     # Ok
-    def chdir(self, path):        
-        if not path:
+    def chdir(self, datacr):
+        if (not datacr) or datacr == (None, None, None):
             self.cwd = '/'
+            self.cwd_node = None
             return None        
-        if path.type in ('collection','database'):
-            self.cwd = self.fs2ftp(path)
-        elif path.type in ('file'):            
-            parent_path = path.full_path()[:-1]            
-            self.cwd = os.path.normpath(''.join(parent_path))
-        else:
-            raise OSError(1, 'Operation not permited.')
+        if not datacr[1]:
+            raise OSError(1, 'Operation not permitted')
+        if datacr[1].type not in  ('collection','database'):
+            raise OSError(2, 'Path is not a directory')
+        self.cwd = '/'+datacr[1].context.dbname + '/'
+        self.cwd += '/'.join(datacr[1].full_path())
+        self.cwd_node = datacr[1]
 
     # Ok
-    def mkdir(self, node, basename):
+    def mkdir(self, datacr, basename):
         """Create the specified directory."""
-        cr = False
+        cr, node, rem = datacr or (None, None, None)
         if not node:
             raise OSError(1, 'Operation not permited.')
+        
         try:
             basename =_to_unicode(basename)
-            cr = pooler.get_db(node.context.dbname).cursor()
-            uid = node.context.uid
-            pool = pooler.get_pool(node.context.dbname)
-            object2 = False            
-            if isinstance(node, node_res_obj):
-                object2 = node and pool.get(node.context.context['res_model']).browse(cr, uid, node.context.context['res_id']) or False            
-            obj = node.context._dirobj.browse(cr, uid, node.dir_id)            
-            if obj and (obj.type == 'ressource') and not object2:
-                raise OSError(1, 'Operation not permited.')
-            val = {
-                'name': basename,
-                'ressource_parent_type_id': obj and obj.ressource_type_id.id or False,
-                'ressource_id': object2 and object2.id or False,
-                'parent_id' : False
-            }
-            if (obj and (obj.type in ('directory'))) or not object2:                
-                val['parent_id'] =  obj and obj.id or False            
-            # Check if it alreayd exists !
-            pool.get('document.directory').create(cr, uid, val)
-            cr.commit()            
+            cdir = node.create_child_collection(cr, basename)
+            self._log.debug("Created child dir: %r", cdir)
+            cr.commit()
         except Exception,e:
-            log(e)
+            self._log.exception('Cannot create dir "%s" at node %s', basename, repr(node))
             raise OSError(1, 'Operation not permited.')
-        finally:
-            if cr: cr.close()
 
-    # Ok
     def close_cr(self, data):
-        if data:
+        if data and data[0]:
             data[0].close()
         return True
 
-    def get_cr(self, path):
-        path = self.ftpnorm(path)
-        if path=='/':
-            return None
-        dbname = path.split('/')[1]
-        if dbname not in self.db_list():
-            return None
-        try:
-            db,pool = pooler.get_db_and_pool(dbname)
-        except:
-            raise OSError(1, 'Operation not permited.')
-        cr = db.cursor()
-        uid = security.login(dbname, self.username, self.password)
-        if not uid:
-            raise OSError(2, 'Authentification Required.')
-        return cr, uid, pool
+    def get_cr(self, pathname):
+        raise DeprecationWarning()
+    
+    def get_crdata(self, line, mode='file'):
+        """ Get database cursor, node and remainder data, for commands
+        
+        This is the helper function that will prepare the arguments for
+        any of the subsequent commands.
+        It returns a tuple in the form of:
+        @code        ( cr, node, rem_path=None )
+        
+        @param line An absolute or relative ftp path, as passed to the cmd.
+        @param mode A word describing the mode of operation, so that this
+                    function behaves properly in the different commands.
+        """
+        path = self.ftpnorm(line)
+        if self.cwd_node is None:
+            if not os.path.isabs(path):
+                path = os.path.join(self.root, path)
+
+        if path == '/' and mode in ('list', 'cwd'):
+            return (None, None, None )
+
+        path = _to_unicode(os.path.normpath(path)) # again, for '/db/../ss'
+        if path == '.': path = ''
+
+        if os.path.isabs(path) and self.cwd_node is not None \
+                and path.startswith(self.cwd):
+            # make relative, so that cwd_node is used again
+            path = path[len(self.cwd):]
+            if path.startswith('/'):
+                path = path[1:]
+
+        p_parts = path.split('/') # hard-code the unix sep here, by spec.
+
+        assert '..' not in p_parts
+
+        rem_path = None
+        if mode in ('create',):
+            rem_path = p_parts[-1]
+            p_parts = p_parts[:-1]
+
+        if os.path.isabs(path):
+            # we have to start from root, again
+            while p_parts[0] == '':
+                p_parts = p_parts[1:]
+            # self._log.debug("Path parts: %r ", p_parts)
+            if not p_parts:
+                raise IOError(errno.EPERM, 'Cannot perform operation at root dir')
+            dbname = p_parts[0]
+            if dbname not in self.db_list():
+                raise IOError(errno.ENOENT,'Invalid database path')
+            try:
+                db = pooler.get_db(dbname)
+            except Exception:
+                raise OSError(1, 'Database cannot be used.')
+            cr = db.cursor()
+            try:
+                uid = security.login(dbname, self.username, self.password)
+            except Exception:
+                cr.close()
+                raise
+            if not uid:
+                cr.close()
+                raise OSError(2, 'Authentification Required.')
+            n = get_node_context(cr, uid, {})
+            node = n.get_uri(cr, p_parts[1:])
+            # self._log.debug("get_crdata(abs): %r" % ( (cr, node, rem_path),))
+            return (cr, node, rem_path)
+        else:
+            # we never reach here if cwd_node is not set
+            if p_parts and p_parts[-1] == '':
+                p_parts = p_parts[:-1]
+            cr, uid = self.get_node_cr_uid(self.cwd_node)
+            if p_parts:
+                node = self.cwd_node.get_uri(cr, p_parts)
+            else:
+                node = self.cwd_node
+            if node is False and mode not in ('???'):
+                cr.close()
+                raise IOError(errno.ENOENT, 'Path does not exist')
+            # self._log.debug("get_crdata(rel): %r" % ( (cr, node, rem_path),))
+            return (cr, node, rem_path)
 
-    # Ok
-    def listdir(self, path):
+    def get_node_cr_uid(self, node):
+        """ Get cr, uid, pool from a node
+        """
+        assert node
+        db = pooler.get_db(node.context.dbname)
+        return db.cursor(), node.context.uid
+        
+    def get_node_cr(self, node):
+        """ Get the cursor for the database of a node
+        
+        The cursor is the only thing that a node will not store 
+        persistenly, so we have to obtain a new one for each call.
+        """
+        return self.get_node_cr_uid(node)[0]
+        
+    def listdir(self, datacr):
         """List the content of a directory."""
         class false_node(object):
-            write_date = None
-            create_date = None
+            write_date = 0.0
+            create_date = 0.0
+            unixperms = 040550
+            content_length = 0L
+            uuser = 'root'
+            ugroup = 'root'
             type = 'database'
+            
             def __init__(self, db):
-                self.path = '/'+db
+                self.path = db
 
-        if path is None:
+        if datacr[1] is None:
             result = []
             for db in self.db_list():
                 try:
-                    uid = security.login(db, self.username, self.password)
-                    if uid:
-                        result.append(false_node(db))                    
-                except osv.except_osv:          
+                    result.append(false_node(db))
+                except osv.except_osv:
                     pass
             return result
-        cr = pooler.get_db(path.context.dbname).cursor()        
-        res = path.children(cr)
-        cr.close()
+        cr, node, rem = datacr
+        res = node.children(cr)
         return res
 
-    # Ok
-    def rmdir(self, node):
+    def rmdir(self, datacr):
         """Remove the specified directory."""
+        cr, node, rem = datacr
         assert node
-        cr = pooler.get_db(node.context.dbname).cursor()
-        uid = node.context.uid
-        pool = pooler.get_pool(node.context.dbname)        
-        object = node.context._dirobj.browse(cr, uid, node.dir_id)
-        if not object:
-            raise OSError(2, 'Not such file or directory.')
-        if object._table_name == 'document.directory':            
-            if node.children(cr):
-                raise OSError(39, 'Directory not empty.')
-            res = pool.get('document.directory').unlink(cr, uid, [object.id])
-        else:
-            raise OSError(1, 'Operation not permited.')
-
+        cr = self.get_node_cr(node)
+        node.rmcol(cr)
         cr.commit()
-        cr.close()
 
-    # Ok
-    def remove(self, node):
-        assert node
-        if node.type == 'collection':
-            return self.rmdir(node)
-        elif node.type == 'file':
-            return self.rmfile(node)
+    def remove(self, datacr):
+        assert datacr[1]
+        if datacr[1].type == 'collection':
+            return self.rmdir(datacr)
+        elif datacr[1].type == 'file':
+            return self.rmfile(datacr)
         raise OSError(1, 'Operation not permited.')
 
-    def rmfile(self, node):
+    def rmfile(self, datacr):
         """Remove the specified file."""
-        assert node
-        if node.type == 'collection':
-            return self.rmdir(node)
-        uid = node.context.uid
-        pool = pooler.get_pool(node.context.dbname)
-        cr = pooler.get_db(node.context.dbname).cursor()
-        object = pool.get('ir.attachment').browse(cr, uid, node.file_id)
-        if not object:
-            raise OSError(2, 'Not such file or directory.')
-        if object._table_name == 'ir.attachment':
-            res = pool.get('ir.attachment').unlink(cr, uid, [object.id])
-        else:
-            raise OSError(1, 'Operation not permited.')
+        assert datacr[1]
+        cr = datacr[0]
+        datacr[1].rm(cr)
         cr.commit()
-        cr.close()
 
-    # Ok
-    def rename(self, src, dst_basedir, dst_basename):
-        """
-            Renaming operation, the effect depends on the src:
+    def rename(self, src, datacr):
+        """ Renaming operation, the effect depends on the src:
             * A file: read, create and remove
             * A directory: change the parent and reassign childs to ressource
         """
-        cr = False
+        cr = datacr[0]
         try:
-            dst_basename = _to_unicode(dst_basename)
-            cr = pooler.get_db(src.context.dbname).cursor()
-            uid = src.context.uid                       
-            if src.type == 'collection':
-                obj2 = False
-                dst_obj2 = False
-                pool = pooler.get_pool(src.context.dbname)
-                if isinstance(src, node_res_obj):
-                    obj2 = src and pool.get(src.context.context['res_model']).browse(cr, uid, src.context.context['res_id']) or False            
-                obj = src.context._dirobj.browse(cr, uid, src.dir_id)                 
-                if isinstance(dst_basedir, node_res_obj):
-                    dst_obj2 = dst_basedir and pool.get(dst_basedir.context.context['res_model']).browse(cr, uid, dst_basedir.context.context['res_id']) or False
-                dst_obj = dst_basedir.context._dirobj.browse(cr, uid, dst_basedir.dir_id)                 
-                if obj._table_name <> 'document.directory':
-                    raise OSError(1, 'Operation not permited.')
-                result = {
-                    'directory': [],
-                    'attachment': []
-                }
-                # Compute all childs to set the new ressource ID                
-                child_ids = [src]
-                while len(child_ids):
-                    node = child_ids.pop(0)                    
-                    child_ids += node.children(cr)                        
-                    if node.type == 'collection':
-                        object2 = False                                            
-                        if isinstance(node, node_res_obj):                  
-                            object2 = node and pool.get(node.context.context['res_model']).browse(cr, uid, node.context.context['res_id']) or False                           
-                        object = node.context._dirobj.browse(cr, uid, node.dir_id)                         
-                        result['directory'].append(object.id)
-                        if (not object.ressource_id) and object2:
-                            raise OSError(1, 'Operation not permited.')
-                    elif node.type == 'file':
-                        result['attachment'].append(object.id)
-                
-                if obj2 and not obj.ressource_id:
-                    raise OSError(1, 'Operation not permited.')
-                
-                if (dst_obj and (dst_obj.type in ('directory'))) or not dst_obj2:
-                    parent_id = dst_obj and dst_obj.id or False
-                else:
-                    parent_id = False              
-                
-                
-                if dst_obj2:                    
-                    ressource_type_id = pool.get('ir.model').search(cr, uid, [('model','=',dst_obj2._name)])[0]
-                    ressource_id = dst_obj2.id                    
-                    ressource_model = dst_obj2._name                    
-                    if dst_obj2._name == 'res.partner':
-                        partner_id = dst_obj2.id
-                    else:                                                
-                        partner_id = pool.get(dst_obj2._name).fields_get(cr, uid, ['partner_id']) and dst_obj2.partner_id.id or False
-                else:
-                    ressource_type_id = False
-                    ressource_id = False
-                    ressource_model = False
-                    partner_id = False                               
-                pool.get('document.directory').write(cr, uid, result['directory'], {
-                    'name' : dst_basename,
-                    'ressource_id': ressource_id,
-                    'ressource_parent_type_id': ressource_type_id,
-                    'parent_id' : parent_id
-                })
-                val = {
-                    'res_id': ressource_id,
-                    'res_model': ressource_model,                    
-                    'partner_id': partner_id
-                }
-                pool.get('ir.attachment').write(cr, uid, result['attachment'], val)
-                if (not val['res_id']) and result['attachment']:
-                    cr.execute('update ir_attachment set res_id=NULL where id in ('+','.join(map(str,result['attachment']))+')')
-
-                cr.commit()
-
-            elif src.type == 'file':    
-                pool = pooler.get_pool(src.context.dbname)                
-                obj = pool.get('ir.attachment').browse(cr, uid, src.file_id)                
-                dst_obj2 = False                     
-                if isinstance(dst_basedir, node_res_obj):
-                    dst_obj2 = dst_basedir and pool.get(dst_basedir.context.context['res_model']).browse(cr, uid, dst_basedir.context.context['res_id']) or False            
-                dst_obj = dst_basedir.context._dirobj.browse(cr, uid, dst_basedir.dir_id)  
-             
-                val = {
-                    'partner_id':False,
-                    #'res_id': False,
-                    'res_model': False,
-                    'name': dst_basename,
-                    'datas_fname': dst_basename,
-                }
-
-                if (dst_obj and (dst_obj.type in ('directory','ressource'))) or not dst_obj2:
-                    val['parent_id'] = dst_obj and dst_obj.id or False
-                else:
-                    val['parent_id'] = False
-
-                if dst_obj2:
-                    val['res_model'] = dst_obj2._name
-                    val['res_id'] = dst_obj2.id                    
-                    if dst_obj2._name == 'res.partner':
-                        val['partner_id'] = dst_obj2.id
-                    else:                        
-                        val['partner_id'] = pool.get(dst_obj2._name).fields_get(cr, uid, ['partner_id']) and dst_obj2.partner_id.id or False
-                elif obj.res_id:
-                    # I had to do that because writing False to an integer writes 0 instead of NULL
-                    # change if one day we decide to improve osv/fields.py
-                    cr.execute('update ir_attachment set res_id=NULL where id=%s', (obj.id,))
-
-                pool.get('ir.attachment').write(cr, uid, [obj.id], val)
-                cr.commit()
-            elif src.type=='content':
-                src_file = self.open(src,'r')
-                dst_file = self.create(dst_basedir, dst_basename, 'w')
-                dst_file.write(src_file.getvalue())
-                dst_file.close()
-                src_file.close()
-                cr.commit()
-            else:
-                raise OSError(1, 'Operation not permited.')
+            nname = _to_unicode(datacr[2])
+            ret = src.move_to(cr, datacr[1], new_name=nname)
+            # API shouldn't wait for us to write the object
+            assert (ret is True) or (ret is False)
+            cr.commit()
         except Exception,err:
-            log(err)
+            self._log.exception('Cannot rename "%s" to "%s" at "%s"', src, datacr[2], datacr[1])
             raise OSError(1,'Operation not permited.')
-        finally:
-            if cr: cr.close()
-
-
 
-    # Nearly Ok
     def stat(self, node):
-        r = list(os.stat('/'))
-        if self.isfile(node):
-            r[0] = 33188
-        r[6] = self.getsize(node)
-        r[7] = self.getmtime(node)
-        r[8] =  self.getmtime(node)
-        r[9] =  self.getmtime(node)
-        return os.stat_result(r)
-    lstat = stat
+        raise NotImplementedError()
 
     # --- Wrapper methods around os.path.*
 
     # Ok
     def isfile(self, node):
-        if node and (node.type not in ('collection','database')):
+        if node and (node.type in ('file','content')):
             return True
         return False
 
@@ -663,7 +414,6 @@ class abstracted_fs:
         """Return True if path is a symbolic link."""
         return False
 
-    # Ok
     def isdir(self, node):
         """Return True if path is a directory."""
         if node is None:
@@ -672,19 +422,20 @@ class abstracted_fs:
             return True
         return False
 
-    # Ok
-    def getsize(self, node):
+    def getsize(self, datacr):
         """Return the size of the specified file in bytes."""
-        result = 0L
-        if node.type=='file':
-            result = node.content_length or 0L
-        return result
+        if not (datacr and datacr[1]):
+            return 0L
+        if datacr[1].type in ('file', 'content'):
+            return datacr[1].content_length or 0L
+        return 0L
 
     # Ok
-    def getmtime(self, node):
+    def getmtime(self, datacr):
         """Return the last modified time as a number of seconds since
         the epoch."""
         
+        node = datacr[1]
         if node.write_date or node.create_date:
             dt = (node.write_date or node.create_date)[:19]
             result = time.mktime(time.strptime(dt, '%Y-%m-%d %H:%M:%S'))
@@ -705,7 +456,9 @@ class abstracted_fs:
         """Return True if path refers to an existing path, including
         a broken or circular symbolic link.
         """
+        raise DeprecationWarning()
         return path and True or False
+
     exists = lexists
 
     # Ok, can be improved
@@ -724,23 +477,21 @@ class abstracted_fs:
 
     # note: the following operations are no more blocking
 
-    # Ok
-    def get_list_dir(self, path):
+    def get_list_dir(self, datacr):
         """"Return an iterator object that yields a directory listing
         in a form suitable for LIST command.
         """        
-        if self.isdir(path):
-            listing = self.listdir(path)
+        if not datacr:
+            return None
+        elif self.isdir(datacr[1]):
+            listing = self.listdir(datacr)
             #listing.sort()
-            return self.format_list(path and path.path or '/', listing)
+            return self.format_list(datacr[0], datacr[1], listing)
         # if path is a file or a symlink we return information about it
-        elif self.isfile(path):
-            basedir, filename = os.path.split(path.path)
-            self.lstat(path)  # raise exc in case of problems
-            return self.format_list(basedir, [path])
-
+        elif self.isfile(datacr[1]):
+            par = datacr[1].parent
+            return self.format_list(datacr[0], par, [datacr[1]])
 
-    # Ok
     def get_stat_dir(self, rawline, datacr):
         """Return an iterator object that yields a list of files
         matching a dirname pattern non-recursively in a form
@@ -763,13 +514,12 @@ class abstracted_fs:
                     listing.sort()
                 return self.format_list(basedir, listing)
 
-    # Ok    
-    def format_list(self, basedir, listing, ignore_err=True):
+    def format_list(self, cr, parent_node, listing, ignore_err=True):
         """Return an iterator object that yields the entries of given
         directory emulating the "/bin/ls -lA" UNIX command output.
 
-         - (str) basedir: the absolute dirname.
-         - (list) listing: the names of the entries in basedir
+         - (str) basedir: the parent directory node. Can be None
+         - (list) listing: a list of nodes
          - (bool) ignore_err: when False raise exception if os.lstat()
          call fails.
 
@@ -785,35 +535,35 @@ class abstracted_fs:
         drwxrwxrwx   1 owner   group          0 Aug 31 18:50 e-books
         -rw-rw-rw-   1 owner   group        380 Sep 02  3:40 module.py
         """
-        for file in listing:
-            try:
-                st = self.lstat(file)
-            except os.error:
-                if ignore_err:
-                    continue
-                raise
-            perms = filemode(st.st_mode)  # permissions
-            nlinks = st.st_nlink  # number of links to inode
-            if not nlinks:  # non-posix system, let's use a bogus value
-                nlinks = 1
-            size = st.st_size  # file size
-            uname = "owner"
-            gname = "group"
+        for node in listing:
+            perms = filemode(node.unixperms)  # permissions
+            nlinks = 1
+            size = node.content_length or 0L
+            uname = node.uuser
+            gname = node.ugroup
             # stat.st_mtime could fail (-1) if last mtime is too old
             # in which case we return the local time as last mtime
             try:
-                mname=_get_month_name(time.strftime("%m", time.localtime(st.st_mtime)))               
-                mtime = mname+' '+time.strftime("%d %H:%M", time.localtime(st.st_mtime))
+                st_mtime = node.write_date or 0.0
+                if isinstance(st_mtime, basestring):
+                    st_mtime = time.strptime(st_mtime, '%Y-%m-%d %H:%M:%S')
+                elif isinstance(st_mtime, float):
+                    st_mtime = time.localtime(st_mtime)
+                mname=_get_month_name(time.strftime("%m", st_mtime ))
+                mtime = mname+' '+time.strftime("%d %H:%M", st_mtime)
             except ValueError:
                 mname=_get_month_name(time.strftime("%m"))
                 mtime = mname+' '+time.strftime("%d %H:%M")            
+            fpath = node.path
+            if isinstance(fpath, (list, tuple)):
+                fpath = fpath[-1]
             # formatting is matched with proftpd ls output            
-            path=_to_decode(file.path) #file.path.encode('ascii','replace').replace('?','_')                    
+            path=_to_decode(fpath)
             yield "%s %3s %-8s %-8s %8s %s %s\r\n" %(perms, nlinks, uname, gname,
-                                                     size, mtime, path.split('/')[-1])
+                                                     size, mtime, path)
 
     # Ok
-    def format_mlsx(self, basedir, listing, perms, facts, ignore_err=True):
+    def format_mlsx(self, cr, basedir, listing, perms, facts, ignore_err=True):
         """Return an iterator object that yields the entries of a given
         directory or of a single file in a form suitable with MLSD and
         MLST commands.
@@ -846,15 +596,9 @@ class abstracted_fs:
         if 'd' in perms:
             permdir += 'p'
         type = size = perm = modify = create = unique = mode = uid = gid = ""
-        for file in listing:                        
-            try:
-                st = self.stat(file)
-            except OSError:
-                if ignore_err:
-                    continue
-                raise
+        for node in listing:
             # type + perm
-            if stat.S_ISDIR(st.st_mode):
+            if self.isdir(node):
                 if 'type' in facts:
                     type = 'type=dir;'                    
                 if 'perm' in facts:
@@ -865,29 +609,37 @@ class abstracted_fs:
                 if 'perm' in facts:
                     perm = 'perm=%s;' %permfile
             if 'size' in facts:
-                size = 'size=%s;' %st.st_size  # file size
+                size = 'size=%s;' % (node.content_length or 0L)
             # last modification time
             if 'modify' in facts:
                 try:
-                    modify = 'modify=%s;' %time.strftime("%Y%m%d%H%M%S",
-                                           time.localtime(st.st_mtime))
+                    st_mtime = node.write_date or 0.0
+                    if isinstance(st_mtime, basestring):
+                        st_mtime = time.strptime(st_mtime, '%Y-%m-%d %H:%M:%S')
+                    elif isinstance(st_mtime, float):
+                        st_mtime = time.localtime(st_mtime)
+                    modify = 'modify=%s;' %time.strftime("%Y%m%d%H%M%S", st_mtime)
                 except ValueError:
                     # stat.st_mtime could fail (-1) if last mtime is too old
                     modify = ""
             if 'create' in facts:
                 # on Windows we can provide also the creation time
                 try:
-                    create = 'create=%s;' %time.strftime("%Y%m%d%H%M%S",
-                                           time.localtime(st.st_ctime))
+                    st_ctime = node.create_date or 0.0
+                    if isinstance(st_ctime, basestring):
+                        st_ctime = time.strptime(st_ctime, '%Y-%m-%d %H:%M:%S')
+                    elif isinstance(st_mtime, float):
+                        st_ctime = time.localtime(st_ctime)
+                    create = 'create=%s;' %time.strftime("%Y%m%d%H%M%S",st_ctime)
                 except ValueError:
                     create = ""
             # UNIX only
             if 'unix.mode' in facts:
-                mode = 'unix.mode=%s;' %oct(st.st_mode & 0777)
+                mode = 'unix.mode=%s;' %oct(node.unixperms & 0777)
             if 'unix.uid' in facts:
-                uid = 'unix.uid=%s;' %st.st_uid
+                uid = 'unix.uid=%s;' % node.uuser
             if 'unix.gid' in facts:
-                gid = 'unix.gid=%s;' %st.st_gid
+                gid = 'unix.gid=%s;' % node.ugroup
             # We provide unique fact (see RFC-3659, chapter 7.5.2) on
             # posix platforms only; we get it by mixing st_dev and
             # st_ino values which should be enough for granting an
@@ -896,10 +648,12 @@ class abstracted_fs:
             # Implementors who want to provide unique fact on other
             # platforms should use some platform-specific method (e.g.
             # on Windows NTFS filesystems MTF records could be used).
-            if 'unique' in facts:
-                unique = "unique=%x%x;" %(st.st_dev, st.st_ino)
-            path=_to_decode(file.path)
-            path = path and path.split('/')[-1] or None
+            # if 'unique' in facts: todo
+            #    unique = "unique=%x%x;" %(st.st_dev, st.st_ino)
+            path = node.path
+            if isinstance (path, (list, tuple)):
+                path = path[-1]
+            path=_to_decode(path)
             yield "%s%s%s%s%s%s%s%s%s %s\r\n" %(type, size, perm, modify, create,
                                                 mode, uid, gid, unique, path)
 
diff --git a/addons/document_ftp/ftpserver/ftpserver.py b/addons/document_ftp/ftpserver/ftpserver.py
index 3a85b3061a7..e267216ddec 100644
--- a/addons/document_ftp/ftpserver/ftpserver.py
+++ b/addons/document_ftp/ftpserver/ftpserver.py
@@ -221,6 +221,33 @@ def _strerror(err):
     else:
         return err.strerror
 
+def _to_unicode(s):
+    try:
+        return s.decode('utf-8')
+    except UnicodeError:
+        pass
+    try:
+        return s.decode('latin')
+    except UnicodeError:
+        pass
+    try:
+        return s.encode('ascii')
+    except UnicodeError:
+        return s
+
+def _to_decode(s):
+    try:
+        return s.encode('utf-8')
+    except UnicodeError:
+        pass
+    try:
+        return s.encode('latin')
+    except UnicodeError:
+        pass
+    try:
+        return s.decode('ascii')
+    except UnicodeError:
+        return s
 
 # --- library defined exceptions
 
@@ -793,7 +820,7 @@ class DTPHandler(asyncore.dispatcher):
         if self.transfer_finished:
             self.cmd_channel.respond("226 Transfer complete.")
             if self.file_obj:
-                fname = self.cmd_channel.fs.fs2ftp(self.file_obj.name)
+                fname = self.file_obj.name
                 self.cmd_channel.log('"%s" %s.' %(fname, action))
         else:
             tot_bytes = self.get_transmitted_bytes()
@@ -1138,19 +1165,11 @@ class AbstractedFS:
 
     # note: the following operations are no more blocking
 
-    def get_list_dir(self, path):
+    def get_list_dir(self, datacr):
         """"Return an iterator object that yields a directory listing
         in a form suitable for LIST command.
         """
-        if self.isdir(path):
-            listing = self.listdir(path)
-            listing.sort()
-            return self.format_list(path, listing)
-        # if path is a file or a symlink we return information about it
-        else:
-            basedir, filename = os.path.split(path)
-            self.lstat(path)  # raise exc in case of problems
-            return self.format_list(basedir, [filename])
+        raise DeprecationWarning()
 
     def get_stat_dir(self, rawline):
         """Return an iterator object that yields a list of files
@@ -1591,26 +1610,8 @@ class FTPHandler(asynchat.async_chat):
 
     def __check_path(self, cmd, line):
         """Check whether a path is valid."""
-        # For the following commands we have to make sure that the real
-        # path destination belongs to the user's root directory.
-        # If provided path is a symlink we follow its final destination
-        # to do so.
-        if cmd in ('APPE','CWD','DELE','MDTM','NLST','MLSD','MLST','RETR',
-                   'RMD','SIZE','STOR','XCWD','XRMD'):
-            datacr = None
-            datacr = self.fs.get_cr(line)
-            try:
-                if not self.fs.validpath(self.fs.ftp2fs(line, datacr)):
-                    line = self.fs.ftpnorm(line)
-                    err = '"%s" points to a path which is outside ' \
-                          "the user's root directory" %line
-                    self.respond("550 %s." %err)
-                    self.log('FAIL %s "%s". %s.' %(cmd, line, err))
-                    self.fs.close_cr(datacr)
-                    return False
-            except:
-                pass
-            self.fs.close_cr(datacr)
+        
+        # Always true, we will only check later, once we have a cursor
         return True
 
     def __check_perm(self, cmd, line, datacr):
@@ -1623,6 +1624,7 @@ class FTPHandler(asynchat.async_chat):
                'RNFR':'f',
                'MKD':'m', 'XMKD':'m',
                'STOR':'w'}
+        raise NotImplementedError
         if cmd in map:
             if cmd == 'STAT' and not line:
                 return True
@@ -2032,56 +2034,71 @@ class FTPHandler(asynchat.async_chat):
         # - Some older FTP clients erroneously issue /bin/ls-like LIST
         #   formats in which case we fall back on cwd as default.
         if not line or line.lower() in ('-a', '-l', '-al', '-la'):
-            line = self.fs.cwd
+            line = ''
+        datacr = None
         try:
-            data = None
-            data = self.fs.get_cr(line)
-            path = self.fs.ftp2fs(line, data)
-            line = self.fs.ftpnorm(line)
-            iterator = self.run_as_current_user(self.fs.get_list_dir, path)
+            datacr = self.fs.get_crdata(line, mode='list')
+            iterator = self.run_as_current_user(self.fs.get_list_dir, datacr)
+        except IOError, err:
+            self.fs.close_cr(datacr)
+            self.respond('550 %s.'% err.strerror)
+            return
         except OSError, err:
-            self.fs.close_cr(data)
+            self.fs.close_cr(datacr)
             why = _strerror(err)
             self.log('FAIL LIST "%s". %s.' %(line, why))
             self.respond('550 %s.' %why)
-        else:
-            self.fs.close_cr(data)
-            self.log('OK LIST "%s". Transfer starting.' %line)
+            return
+        try:
+            self.log('OK LIST "%s". Transfer starting.' % line)
             producer = BufferedIteratorProducer(iterator)
             self.push_dtp_data(producer, isproducer=True)
+        finally:
+            self.fs.close_cr(datacr)
+
 
     def ftp_NLST(self, line):
         """Return a list of files in the specified directory in a
         compact form to the client.
         """
         if not line:
-            line = self.fs.cwd
+            line = ''
+
+        datacr = None
         try:
-            data = None
-            data = self.fs.get_cr(line)
-            path = self.fs.ftp2fs(line, data)
-            line = self.fs.ftpnorm(line)
-            if self.fs.isdir(path):
-                listing = self.run_as_current_user(self.fs.listdir, path)
-                listing = map(lambda x:os.path.split(x.path)[1], listing)
+            datacr = self.fs.get_crdata(line, mode='list')
+            if not datacr:
+                datacr = ( None, None, None )
+            if self.fs.isdir(datacr[1]):
+                nodelist = self.run_as_current_user(self.fs.listdir, datacr)
             else:
                 # if path is a file we just list its name
-                self.fs.lstat(path)  # raise exc in case of problems
-                basedir, filename = os.path.split(line)
-                listing = [filename]
+                nodelist = [datacr[1],]
+            
+            listing = []
+            for nl in nodelist:
+                if isinstance(nl.path, (list, tuple)):
+                    listing.append(nl.path[-1])
+                else:
+                    listing.append(nl.path)    # assume string
+        except IOError, err:
+            self.fs.close_cr(datacr)
+            self.respond('550 %s.'% err.strerror)
+            return
         except OSError, err:
-            self.fs.close_cr(data)
+            self.fs.close_cr(datacr)
             why = _strerror(err)
             self.log('FAIL NLST "%s". %s.' %(line, why))
             self.respond('550 %s.' %why)
-        else:
-            self.fs.close_cr(data)
-            data = ''
-            if listing:
-                listing.sort()
-                data = '\r\n'.join(listing) + '\r\n'
-            self.log('OK NLST "%s". Transfer starting.' %line)
-            self.push_dtp_data(data)
+            return
+        
+        self.fs.close_cr(datacr)
+        data = ''
+        if listing:
+            listing.sort()
+            data =  ''.join([ _to_decode(x) + '\r\n' for x in listing ])
+        self.log('OK NLST "%s". Transfer starting.' %line)
+        self.push_dtp_data(data)
 
         # --- MLST and MLSD commands
 
@@ -2096,18 +2113,15 @@ class FTPHandler(asynchat.async_chat):
         """
         # if no argument, fall back on cwd as default
         if not line:
-            line = self.fs.cwd
+            line = ''
+        datacr = None
         try:
-            datacr = None
-            datacr = self.fs.get_cr(line)
-            path = self.fs.ftp2fs(line, datacr)
-            line = self.fs.ftpnorm(line)
-            basedir, basename = os.path.split(path)
+            datacr = self.fs.get_crdata(line, mode='list')
             perms = self.authorizer.get_perms(self.username)
-            iterator = self.run_as_current_user(self.fs.format_mlsx, basedir,
-                       [basename], perms, self.current_facts, ignore_err=False)
+            iterator = self.run_as_current_user(self.fs.format_mlsx, datacr[0], datacr[1].parent,
+                       [datacr[1],], perms, self.current_facts, ignore_err=False)
             data = ''.join(iterator)
-        except OSError, err:
+        except EnvironmentError, err:
             self.fs.close_cr(datacr)
             why = _strerror(err)
             self.log('FAIL MLST "%s". %s.' %(line, why))
@@ -2129,19 +2143,18 @@ class FTPHandler(asynchat.async_chat):
         """
         # if no argument, fall back on cwd as default
         if not line:
-            line = self.fs.cwd
+            line = ''
+        
+        datacr = None
         try:
-            datacr = None
-            datacr = self.fs.get_cr(line)
-            path = self.fs.ftp2fs(line, datacr)
-            line = self.fs.ftpnorm(line)
+            datacr = self.fs.get_crdata(line, mode='list')
             # RFC-3659 requires 501 response code if path is not a directory
-            if not self.fs.isdir(path):
+            if not self.fs.isdir(datacr[1]):
                 err = 'No such directory'
                 self.log('FAIL MLSD "%s". %s.' %(line, err))
                 self.respond("501 %s." %err)
                 return
-            listing = self.run_as_current_user(self.fs.listdir, path)
+            listing = self.run_as_current_user(self.fs.listdir, datacr)
         except OSError, err:
             self.fs.close_cr(datacr)
             why = _strerror(err)
@@ -2150,7 +2163,7 @@ class FTPHandler(asynchat.async_chat):
         else:
             self.fs.close_cr(datacr)
             perms = self.authorizer.get_perms(self.username)
-            iterator = self.fs.format_mlsx(path, listing, perms,
+            iterator = self.fs.format_mlsx(datacr[0], datacr[1], listing, perms,
                        self.current_facts)
             producer = BufferedIteratorProducer(iterator)
             self.log('OK MLSD "%s". Transfer starting.' %line)
@@ -2160,12 +2173,10 @@ class FTPHandler(asynchat.async_chat):
         """Retrieve the specified file (transfer from the server to the
         client)
         """
+        datacr = None
         try:
-            datacr = None
-            datacr = self.fs.get_cr(line)
-            file = self.fs.ftp2fs(line, datacr)
-            line = self.fs.ftpnorm(line)
-            fd = self.run_as_current_user(self.fs.open, file, 'rb')            
+            datacr = self.fs.get_crdata(line, mode='file')
+            fd = self.run_as_current_user(self.fs.open, datacr, 'rb')
         except OSError, err:
             self.fs.close_cr(datacr)
             why = _strerror(err)
@@ -2174,7 +2185,7 @@ class FTPHandler(asynchat.async_chat):
             return
         except IOError, err:
             self.fs.close_cr(datacr)
-            why = _strerror(err)
+            why = err.strerror
             self.log('FAIL RETR "%s". %s.' %(line, why))
             self.respond('550 %s.' %why)
             return
@@ -2187,7 +2198,7 @@ class FTPHandler(asynchat.async_chat):
             # the REST.
             ok = 0
             try:
-                assert not self.restart_position > self.fs.getsize(file)
+                assert not self.restart_position > self.fs.getsize(datacr)
                 fd.seek(self.restart_position)
                 ok = 1
             except AssertionError:
@@ -2217,14 +2228,9 @@ class FTPHandler(asynchat.async_chat):
         else:
             cmd = 'STOR'
 
-        line = self.fs.ftpnorm(line)
-        basedir,basename = os.path.split(line)
-
         datacr = None
         try:
-            datacr = self.fs.get_cr(line)
-            file = self.fs.ftp2fs(basedir, datacr)
-
+            datacr = self.fs.get_crdata(line,mode='create')
         except OSError, err:
             self.fs.close_cr(datacr)
             why = _strerror(err)
@@ -2235,7 +2241,7 @@ class FTPHandler(asynchat.async_chat):
         if self.restart_position:
             mode = 'r+'
         try:
-            fd = self.run_as_current_user(self.fs.create, file, basename, mode + 'b')
+            fd = self.run_as_current_user(self.fs.create, datacr, datacr[2], mode + 'b')
         except IOError, err:
             self.fs.close_cr(datacr)
             why = _strerror(err)
@@ -2251,7 +2257,7 @@ class FTPHandler(asynchat.async_chat):
             # specified in the REST.
             ok = 0
             try:
-                assert not self.restart_position > self.fs.getsize(self.fs.ftp2fs(line, datacr))
+                assert not self.restart_position > self.fs.getsize(datacr)
                 fd.seek(self.restart_position)
                 ok = 1
             except AssertionError:
@@ -2293,15 +2299,12 @@ class FTPHandler(asynchat.async_chat):
             self.respond("450 Can't STOU while REST request is pending.")
             return
 
-        datacr = None
-        datacr = self.fs.get_cr(line)
 
         if line:
-            line = self.fs.ftpnorm(line)
-            basedir,prefix = os.path.split(line)
-            basedir = self.fs.ftp2fs(basedir, datacr)
-            #prefix = prefix + '.'
+	    datacr = self.fs.get_crdata(line, mode='create')
+	    # TODO
         else:
+	    # TODO
             basedir = self.fs.ftp2fs(self.fs.cwd, datacr)
             prefix = 'ftpd.'
         try:
@@ -2500,21 +2503,23 @@ class FTPHandler(asynchat.async_chat):
 
     def ftp_PWD(self, line):
         """Return the name of the current working directory to the client."""
-        self.respond('257 "%s" is the current directory.' %self.fs.cwd)
+        cwd = self.fs.get_cwd()
+        self.respond('257 "%s" is the current directory.' % cwd)
 
     def ftp_CWD(self, line):
         """Change the current working directory."""
-        # TODO: a lot of FTP servers go back to root directory if no
+        # check: a lot of FTP servers go back to root directory if no
         # arg is provided but this is not specified in RFC-959.
         # Search for official references about this behaviour.
-        if not line:
-            line = '/'
         datacr = None
         try:
-            datacr = self.fs.get_cr(line)
-            path = self.fs.ftp2fs(line, datacr)
-            self.run_as_current_user(self.fs.chdir, path)
-        except OSError, err:
+            datacr = self.fs.get_crdata(line,'cwd')
+            self.run_as_current_user(self.fs.chdir, datacr)
+            cwd = self.fs.get_cwd()
+            self.log('OK CWD "%s".' % cwd)
+            self.respond('250 "%s" is the current directory.' % cwd)
+        except EnvironmentError, err:
+            self.log("Could not cwd: %s" % err)
             if err.errno==2:
                 why = 'Authentication Required or Failed'
                 self.log('FAIL CWD "%s". %s.' %(self.fs.ftpnorm(line), why))
@@ -2523,9 +2528,6 @@ class FTPHandler(asynchat.async_chat):
                 why = _strerror(err)
                 self.log('FAIL CWD "%s". %s.' %(self.fs.ftpnorm(line), why))
                 self.respond('550 %s.' %why)
-        else:
-            self.log('OK CWD "%s".' %self.fs.cwd)
-            self.respond('250 "%s" is the current directory.' %self.fs.cwd)
         self.fs.close_cr(datacr)
 
     def ftp_CDUP(self, line):
@@ -2554,17 +2556,15 @@ class FTPHandler(asynchat.async_chat):
         """
         datacr = None
         try:
-            datacr = self.fs.get_cr(line)
-            path = self.fs.ftp2fs(line, datacr)
-            line = self.fs.ftpnorm(line)
-            if self.fs.isdir(path):
-                why = "%s is not retrievable" %line
-                self.log('FAIL SIZE "%s". %s.' %(line, why))
-                self.respond("550 %s." %why)
-                self.fs.close_cr(datacr)
-                return
-            size = self.run_as_current_user(self.fs.getsize, path)
-        except OSError, err:
+            datacr = self.fs.get_crdata(line, mode='file')
+            #if self.fs.isdir(datacr[1]):
+            #    why = "%s is not retrievable" %line
+            #    self.log('FAIL SIZE "%s". %s.' %(line, why))
+            #    self.respond("550 %s." %why)
+            #    self.fs.close_cr(datacr)
+            #    return
+            size = self.run_as_current_user(self.fs.getsize, datacr)
+        except EnvironmentError, err:
             why = _strerror(err)
             self.log('FAIL SIZE "%s". %s.' %(line, why))
             self.respond('550 %s.' %why)
@@ -2579,35 +2579,31 @@ class FTPHandler(asynchat.async_chat):
         """
         datacr = None
         try:
-            datacr = self.fs.get_cr(line)
-            path = self.fs.ftp2fs(line, datacr)
-            line = self.fs.ftpnorm(line)
-            if not self.fs.isfile(self.fs.realpath(path)):
+            datacr = self.fs.get_crdata(line)
+            if not self.fs.isfile(datacr):
                 why = "%s is not retrievable" %line
                 self.log('FAIL MDTM "%s". %s.' %(line, why))
                 self.respond("550 %s." %why)
                 self.fs.close_cr(datacr)
                 return
-            lmt = self.run_as_current_user(self.fs.getmtime, path)
+            lmt = self.run_as_current_user(self.fs.getmtime, datacr)
+            lmt = time.strftime("%Y%m%d%H%M%S", time.localtime(lmt))
+            self.respond("213 %s" %lmt)
+            self.log('OK MDTM "%s".' %line)
         except OSError, err:
             why = _strerror(err)
             self.log('FAIL MDTM "%s". %s.' %(line, why))
             self.respond('550 %s.' %why)
-        else:
-            lmt = time.strftime("%Y%m%d%H%M%S", time.localtime(lmt))
-            self.respond("213 %s" %lmt)
-            self.log('OK MDTM "%s".' %line)
         self.fs.close_cr(datacr)
 
     def ftp_MKD(self, line):
         """Create the specified directory."""
-        datacr = None
-        line = self.fs.ftpnorm(line)
-        basedir,basename = os.path.split(line)
         try:
-            datacr = self.fs.get_cr(line)
-            path = self.fs.ftp2fs(basedir, datacr)
-            self.run_as_current_user(self.fs.mkdir, path, basename)
+            datacr = self.fs.get_crdata(line, mode='create')
+            self.run_as_current_user(self.fs.mkdir, datacr, datacr[2])
+        except IOError, err:
+            self.log('FAIL MKD "%s". %s.' %(line, err.strerror))
+            self.respond('550 %s.' % err.strerror)
         except OSError, err:
             why = _strerror(err)
             self.log('FAIL MKD "%s". %s.' %(line, why))
@@ -2621,16 +2617,14 @@ class FTPHandler(asynchat.async_chat):
         """Remove the specified directory."""
         datacr = None
         try:
-            datacr = self.fs.get_cr(line)
-            path = self.fs.ftp2fs(line, datacr)
-            line = self.fs.ftpnorm(line)
-            if self.fs.realpath(path) == self.fs.realpath(self.fs.root):
+            datacr = self.fs.get_crdata(line, mode='delete')
+            if not datacr[1]:
                 msg = "Can't remove root directory."
                 self.respond("550 %s" %msg)
                 self.log('FAIL MKD "/". %s' %msg)
                 self.fs.close_cr(datacr)
                 return
-            self.run_as_current_user(self.fs.rmdir, path)
+            self.run_as_current_user(self.fs.rmdir, datacr)
         except OSError, err:
             why = _strerror(err)
             self.log('FAIL RMD "%s". %s.' %(line, why))
@@ -2644,10 +2638,8 @@ class FTPHandler(asynchat.async_chat):
         """Delete the specified file."""
         datacr = None
         try:
-            datacr = self.fs.get_cr(line)
-            path = self.fs.ftp2fs(line, datacr)
-            line = self.fs.ftpnorm(line)
-            self.run_as_current_user(self.fs.remove, path)
+            datacr = self.fs.get_crdata(line, mode='delete')
+            self.run_as_current_user(self.fs.remove, datacr)
         except OSError, err:
             why = _strerror(err)
             self.log('FAIL DELE "%s". %s.' %(line, why))
@@ -2662,15 +2654,13 @@ class FTPHandler(asynchat.async_chat):
         here, see RNTO command)"""
         datacr = None
         try:
-            datacr = self.fs.get_cr(line)
-            line = self.fs.ftpnorm(line)
-            path = self.fs.ftp2fs(line, datacr)
-            if not self.fs.lexists(path):
+            datacr = self.fs.get_crdata(line, mode='rfnr')
+            if not datacr[1]:
                 self.respond("550 No such file or directory.")
-            elif self.fs.realpath(path) == self.fs.realpath(self.fs.root):
+            elif not datacr[1]:
                 self.respond("550 Can't rename the home directory.")
             else:
-                self.fs.rnfr = line
+                self.fs.rnfr = datacr[1]
                 self.respond("350 Ready for destination name.")
         except:
             self.respond("550 Can't find the file or directory.")
@@ -2686,21 +2676,20 @@ class FTPHandler(asynchat.async_chat):
         datacr = None
         try:
             try:
-                datacr = self.fs.get_cr(line)
-                src = self.fs.ftp2fs(self.fs.rnfr, datacr)
-                line = self.fs.ftpnorm(line)
-                basedir,basename = os.path.split(line)
-                dst = self.fs.ftp2fs(basedir, datacr)
-                self.run_as_current_user(self.fs.rename, src, dst,basename)
-            except OSError, err:
+                datacr = self.fs.get_crdata(line,'create')
+                oldname = self.fs.rnfr.path
+                if isinstance(oldname, (list, tuple)):
+                    oldname = '/'.join(oldname)
+                self.run_as_current_user(self.fs.rename, self.fs.rnfr, datacr)
+                self.fs.rnfr = None
+                self.log('OK RNFR/RNTO "%s ==> %s".' % \
+			(_to_unicode(oldname), _to_unicode(line)))
+                self.respond("250 Renaming ok.")
+            except EnvironmentError, err:
                 why = _strerror(err)
                 self.log('FAIL RNFR/RNTO "%s ==> %s". %s.' \
-                         %(self.fs.ftpnorm(self.fs.rnfr), line, why))
+                         % (_to_unicode(oldname), _to_unicode(line), why))
                 self.respond('550 %s.' %why)
-            else:
-                self.log('OK RNFR/RNTO "%s ==> %s".' \
-                         %(self.fs.ftpnorm(self.fs.rnfr), line))
-                self.respond("250 Renaming ok.")
         finally:
             self.fs.rnfr = None
             self.fs.close_cr(datacr)
diff --git a/addons/document_ftp/test/document_ftp_test2.yml b/addons/document_ftp/test/document_ftp_test2.yml
new file mode 100644
index 00000000000..544c61e38eb
--- /dev/null
+++ b/addons/document_ftp/test/document_ftp_test2.yml
@@ -0,0 +1,221 @@
+-
+    In order to test the document_ftp functionality
+-
+    I open the 8021 port and see for ftp presence there
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        ftp = te.get_plain_ftp()
+        assert ftp.sock and (ftp.lastresp == '220'), ftp.lastresp
+-
+    I read the list of databases at port 8021 and confirm our db is
+    there
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        ftp = te.get_ftp_login(cr, uid, self)
+        assert cr.dbname in ftp.nlst("/")
+-
+    I try to locate the default "Documents" folder in the db.
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        ftp = te.get_ftp_login(cr, uid, self)
+        ftp.cwd('Documents')
+-
+    I create a "test.txt" file at the server (directly). The file
+    should have the "abcd" content
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        from cStringIO import StringIO
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
+        fdata = StringIO('abcd')
+        ftp.storbinary('STOR test.txt', fdata)
+-
+    I look for the "test.txt" file at the server
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
+        assert ftp.nlst("test.txt") == ['test.txt']
+-
+    I check that the content of "test.txt" is "abcd"
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        from cStringIO import StringIO
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
+        assert te.get_ftp_fulldata(ftp, "test.txt") == 'abcd'
+-
+    I append the string 'defgh' into "test.txt"
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        from cStringIO import StringIO
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
+        fdata = StringIO('defgh')
+        ftp.storbinary('APPE test.txt', fdata)
+-
+    I check that the content of "text.txt" is 'abcddefgh'
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        from cStringIO import StringIO
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
+        assert te.get_ftp_fulldata(ftp, "test.txt") == 'abcddefgh'
+-
+    I try to cd into an non-existing folder 'Not-This'
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        import ftplib
+        ftp = te.get_ftp_login(cr, uid, self)
+        try:
+            ftp.cwd('/Not-This')
+            assert False, "We should't be able to change here"
+        except ftplib.error_perm:
+            pass
+        except OSError, err:
+            assert err.errno == 2, err.errno
+-
+    I create a "test2.txt" file through FTP.
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        from cStringIO import StringIO
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
+        fdata = StringIO('abcd')
+        ftp.storbinary('STOR test2.txt', fdata)
+-
+    I look for the "test2.txt" file at the server
+-
+    !python {model: ir.attachment }: |
+        ids = self.search(cr, uid, [('name', '=', 'test2.txt')])
+        assert ids
+-
+    I delete the "test2.txt" file using FTP.
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        from cStringIO import StringIO
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
+        ftp.delete('test2.txt')
+-
+    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
+-
+    I create a test2.txt file again.
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        from cStringIO import StringIO
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
+        fdata = StringIO('abcd')
+        ftp.storbinary('STOR test2.txt', fdata)
+-
+    I delete the test2.txt from the server (RPC).
+-
+    !delete { model: ir.attachment, id:,  search: "[('name','=','test2.txt')]" }
+-
+    I check through FTP that test2.txt does not appear.
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
+        assert ftp.nlst("test2.txt") == []
+-
+    I create a "test-name.txt" file
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        from cStringIO import StringIO
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
+        fdata = StringIO('abcd')
+        ftp.storbinary('STOR test-name.txt', fdata)
+-
+    I rename the "test-name.txt" file through ftp.
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
+        ftp.rename("test-name.txt", "test-renamed.txt")
+-
+    I check that test-name.txt has been renamed.
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        from ftplib import error_perm
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
+        try:
+            res = ftp.nlst("test-name.txt")
+            assert res == []
+        except error_perm, e:
+            pass
+        assert ftp.nlst("test-renamed.txt") == ['test-renamed.txt']
+-
+    I create a new folder 'Test-Folder2' through FTP
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
+        ftp.mkd("Test-Folder2")
+-
+    I create a file 'test3.txt' at the 'Test-Folder2'
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        from cStringIO import StringIO
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Test-Folder2')
+        fdata = StringIO('abcd')
+        ftp.storbinary('STOR test3.txt', fdata)
+-
+    I try to retrieve test3.txt
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Test-Folder2')
+        assert ftp.nlst("test3.txt") == ['test3.txt']
+-
+    I create a new folder, 'Test-Folder3', through FTP
+    I try to move test3.txt to 'Test-Folder3'
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
+        ftp.mkd("Test-Folder2")
+        # TODO move
+-
+    I remove the 'Test-Folder3'
+-
+    I check that test3.txt is removed.
+-
+    I create 200 files through FTP
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        from cStringIO import StringIO
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Test-Folder2')
+        fdata = StringIO('abcd')
+        # TODO speed
+        for i in range(0, 200):
+            fdata.seek(0)
+            ftp.storbinary('STOR test-name%s.txt' %i, fdata)
+-
+    I list the 200 files, check speed
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Test-Folder2')
+        # TODO speed
+        assert len(ftp.nlst()) > 200
+-
+    I read the 200 files, check speed
+    # TODO
+-
+    I move the 200 files to 'Test-Folder2'
+    # TODO
+-
\ No newline at end of file
diff --git a/addons/document_ftp/test/document_ftp_test3.yml b/addons/document_ftp/test/document_ftp_test3.yml
new file mode 100644
index 00000000000..2a4939b2a8c
--- /dev/null
+++ b/addons/document_ftp/test/document_ftp_test3.yml
@@ -0,0 +1,78 @@
+-
+    In order to check international character functionality
+-
+    I create in the server a folder called 'Δοκιμαστικός Φάκελλος'
+-
+    !record {model: document.directory, id: dir_itests }:
+        name: 'Δοκιμαστικός Φάκελλος'
+        parent_id: document.dir_root
+-
+    And then I create another folder, under it, through FTP
+-
+    !python {model: ir.attachment}: |
+        cr.commit()
+        from document_ftp import test_easyftp as te
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Δοκιμαστικός Φάκελλος')
+        ftp.mkd("Φάκελλος από κάτω")
+-
+    I check that this folder exists at the server
+-
+    !assert {model: document.directory, id: , search: "[('name','=','Φάκελλος από κάτω')]" }:
+      - parent_id != False
+-
+    I login with FTP and check that 'Δοκιμαστικός Φάκελλος' is there
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Δοκιμαστικός Φάκελλος/Φάκελλος από κάτω')
+-
+    I create a file named 'Δοκιμή' into that folder
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        from cStringIO import StringIO
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Δοκιμαστικός Φάκελλος/Φάκελλος από κάτω')
+        fdata = StringIO('κείμενο με utf-8')
+        ftp.storbinary('STOR Δοκιμή.txt', fdata)
+-
+    I remove the 'Δοκιμή.txt' file
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        from cStringIO import StringIO
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Δοκιμαστικός Φάκελλος/Φάκελλος από κάτω')
+        ftp.delete('Δοκιμή.txt')
+-
+    I rename 'Φάκελλος από κάτω' into 'άλλος'
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Δοκιμαστικός Φάκελλος')
+        ftp.rename("Φάκελλος από κάτω", "άλλος")
+-
+    I place a file 'file Φ3' in 'άλλος'
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        from cStringIO import StringIO
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Δοκιμαστικός Φάκελλος/άλλος')
+        fdata = StringIO('κι άλλο κείμενο')
+        ftp.storbinary('STOR file Φ3.txt', fdata)
+-
+    I rename the file into file+range(1..200) (large filename)
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        from cStringIO import StringIO
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Δοκιμαστικός Φάκελλος/άλλος')
+        vuvuzela = 'b'+''.join('z' * 200)+'!'
+        ftp.rename("file Φ3.txt", vuvuzela)
+-
+    I delete the file with the large name
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        from cStringIO import StringIO
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Δοκιμαστικός Φάκελλος/άλλος')
+        vuvuzela = 'b'+''.join('z' * 200)+'!'
+        ftp.delete(vuvuzela)
diff --git a/addons/document_ftp/test/document_ftp_test4.yml b/addons/document_ftp/test/document_ftp_test4.yml
new file mode 100644
index 00000000000..4312dbf5f8c
--- /dev/null
+++ b/addons/document_ftp/test/document_ftp_test4.yml
@@ -0,0 +1,116 @@
+-
+    In order to check dynamic folder functionality of document + FTP
+- |
+    I create two partners 'Partner1' and 'Partner2'.
+    I create three partner categories: 'none', 'pat1' and 'all'
+    I attach Partner1 to pat1, Partner1+Partner2 to 'all'
+-
+    !record {model: res.partner.category, id: tpat_categ_none }:
+        name: 'No partners'
+-
+    !record {model: res.partner.category, id: tpat_categ_pat1 }:
+        name: 'Pat 1'
+-
+    !record {model: res.partner.category, id: tpat_categ_all }:
+        name: 'All Partner1+2'
+-
+    !record {model: res.partner, id: tpartner1 }:
+        name: Partner 1
+        category_id:
+            - tpat_categ_pat1
+            - tpat_categ_all
+-
+    !record {model: res.partner, id: tpartner_2 }:
+        name: 'Partner 2'
+        category_id:
+            - tpat_categ_all
+-
+    I create a resource folder of partners, by the (none, pat1, all) 
+    categories.
+-
+    !record {model: document.directory, id: dir_tests2 }:
+        name: Partners Testing
+        parent_id: document.dir_root
+        type: ressource
+        ressource_type_id: base.model_res_partner_category
+        domain: [] # TODO
+-
+    I commit (because FTP operations are on different transaction)
+-
+    !python {model: document.directory, id: }: |
+        cr.commit()
+-
+    I browse through ftp in the resource folder, checking that three
+    categories are there.
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Partners Testing')
+        dirs = ftp.nlst()
+        for dir in [ 'All Partner1+2', 'No partners', 'Pat 1' ]:
+            assert dir in dirs, "Dir %s not in folder" % dir
+-
+    I create a 'partners' folder by the first resource one.
+-
+    !record {model: document.directory, id: dir_respart1 }:
+        name: Partners of Test
+        parent_id: dir_tests2
+        type: ressource
+        ressource_type_id: base.model_res_partner
+        domain: "[('category_id','in',[active_id])]"
+        ressource_parent_type_id : base.model_res_partner_category
+-
+    !python {model: document.directory, id: }: |
+        cr.commit()
+-
+    I check through FTP that the correct partners are listed at each
+    'partners' folder.
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Partners Testing')
+        correct = { 'All Partner1+2': [ 'Partner 1', 'Partner 2' ],
+                'No partners': [],
+                'Pat 1': ['Partner 1',] }
+        for dir in correct:
+            res = ftp.nlst(dir+'/Partners of Test')
+            assert res == correct[dir], "Dir %s falsely contains %s" %(dir, res)
+-
+    I create an ir.attachment, attached (not related) to Partner1
+-
+    !record {model: ir.attachment, id: file_test1 }:
+        name: File of pat1
+        res_model: res.partner
+        res_id:  !eval ref("tpartner1")
+-
+    I check that pat1/Partner1 folder has the file.
+    I check that all/Partner1 folder has the file
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Partners Testing')
+        dirs = [ 'All Partner1+2', 'Pat 1' ]
+        for dir in dirs:
+            res = ftp.nlst(dir+'/Partners of Test/Partner 1')
+            assert 'File of pat1' in res, "Dir %s contains only %s" %(dir, res)
+-
+    I place a file at the 'pat1'/Partner1 folder, through FTP
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        from cStringIO import StringIO
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Partners Testing/Pat 1/Partners of Test/Partner 1')
+        fdata = StringIO('abcd')
+        ftp.storbinary('STOR pat1-dynamic.txt', fdata)
+-
+    I check at the server that the file is attached to Partner1
+-
+    !assert {model: ir.attachment, id: , search: "[('name','=','pat1-dynamic.txt')]" }:
+      - parent_id.name == 'Partners of Test'
+      - res_model == 'res.partner'
+      - res_id !=  False
+-
+    I check that all/Partner1 also has the file
+- |
+    Bonus Piste:
+    I create a 'Partner3' under 'all'
diff --git a/addons/document_ftp/test_easyftp.py b/addons/document_ftp/test_easyftp.py
new file mode 100644
index 00000000000..eb709c79e31
--- /dev/null
+++ b/addons/document_ftp/test_easyftp.py
@@ -0,0 +1,66 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+""" This is a testing module, which exports some functions for the YAML tests.
+    Instead of repeating the same FTP code all over, we prefer to have
+    it in this file
+"""
+
+from ftplib import FTP
+from tools.misc import detect_ip_addr
+from tools import config
+
+def get_plain_ftp():
+    ftp = FTP()
+    host = config.get('ftp_server_host', '127.0.0.1')
+    port = config.get('ftp_server_port','8021')
+    ftp.connect(host,port)
+    return ftp
+
+def get_ftp_login(cr, uid, ormobj):
+    ftp = get_plain_ftp()
+    user = ormobj.pool.get('res.users').read(cr, uid, uid)
+    ftp.login(user.get('login',''),user.get('password',''))
+    ftp.cwd("/" + cr.dbname)
+    return ftp
+
+def get_ftp_anonymous(cr):
+    ftp = get_plain_ftp()
+    ftp.login('anonymous', 'the-test')
+    ftp.cwd("/")
+    return ftp
+
+def get_ftp_folder(cr, uid, ormobj, foldername):
+    ftp = get_ftp_login(cr, uid, ormobj)
+    ftp.cwd("/" + cr.dbname+"/"+foldername)
+    return ftp
+
+def get_ftp_fulldata(ftp, fname, limit=8192):
+    from functools import partial
+    data = []
+    def ffp(data, ndata):
+        if len(data)+ len(ndata) > limit:
+            raise IndexError('Data over the limit')
+        data.append(ndata)
+    ftp.retrbinary('RETR %s' % fname, partial(ffp,data))
+    return ''.join(data)
+
+#eof
\ No newline at end of file
diff --git a/addons/document_webdav/webdav.py b/addons/document_webdav/webdav.py
index e904d2ecfb7..f2f57c77730 100644
--- a/addons/document_webdav/webdav.py
+++ b/addons/document_webdav/webdav.py
@@ -48,6 +48,8 @@ def mk_prop_response(self, uri, good_props, bad_props, doc):
     # write href information
     uparts=urlparse.urlparse(uri)
     fileloc=uparts[2]
+    if isinstance(fileloc, unicode):
+        fileloc = fileloc.encode('utf-8')
     href=doc.createElement("D:href")
     davpath = self._dataclass.parent.get_davpath()
     hurl = '%s://%s%s%s' % (uparts[0], uparts[1], davpath, urllib.quote(fileloc))
@@ -126,6 +128,8 @@ def mk_propname_response(self,uri,propnames,doc):
     # write href information
     uparts=urlparse.urlparse(uri)
     fileloc=uparts[2]
+    if isinstance(fileloc, unicode):
+        fileloc = fileloc.encode('utf-8')
     href=doc.createElement("D:href")
     davpath = self._dataclass.parent.get_davpath()
     hurl = '%s://%s%s%s' % (uparts[0], uparts[1], davpath, urllib.quote(fileloc))