[MERGE] forward port of branch 8.0 up to ed1c173

3 files changed, 344 insertions, 310 deletions

diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py
index 7f387c22b0b..9e3b3e2a4db 100644
--- a/addons/document/__openerp__.py
+++ b/addons/document/__openerp__.py
@@ -36,7 +36,7 @@ This is a complete document management system.
         * Files Size by Month (graph)
 """,
     'author': 'OpenERP SA',
-    'website': 'http://www.openerp.com',
+    'website': 'https://www.odoo.com',
     'depends': ['knowledge', 'mail'],
     'data': [
         'security/document_security.xml',
diff --git a/addons/document/i18n/document.pot b/addons/document/i18n/document.pot
index ec8e08f72dc..096c8081219 100644
--- a/addons/document/i18n/document.pot
+++ b/addons/document/i18n/document.pot
@@ -1,13 +1,13 @@
-# Translation of OpenERP Server.
+# Translation of Odoo Server.
 # This file contains the translation of the following modules:
 #	* document
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 7.0alpha\n"
+"Project-Id-Version: Odoo Server 8.0rc1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-21 17:05+0000\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 13:09+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,341 +16,362 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: document
-#: field:document.directory,parent_id:0
-msgid "Parent Directory"
+#: field:report.document.file,nbr:0
+#: field:report.document.user,nbr:0
+msgid "# of Files"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document.py:336
+#. openerp-web
+#: code:addons/document/static/src/js/document.js:17
 #, python-format
-msgid "Directory name contains special characters!"
+msgid "%s (%s)"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-msgid "Search Document Directory"
+#: code:addons/document/document.py:117
+#: code:addons/document/document.py:307
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: document
-#: help:document.directory,resource_field:0
-msgid "Field to be used as name on resource directories. If empty, the \"name\" will be used."
+#: model:ir.actions.act_window,help:document.action_document_file_form
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create a new document. \n"
+"          </p><p>\n"
+"            The Documents repository gives you access to all attachments, such\n"
+"            as mails, project documents, invoices etc.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-msgid "Group By..."
+#: help:document.directory.dctx,expr:0
+msgid "A python expression used to evaluate the field.\n"
+"You can use 'dir_id' for current dir, 'res_id', 'res_model' as a reference to the current record, in dynamic folders"
 msgstr ""
 
 #. module: document
-#: view:ir.attachment:0
-msgid "Modification"
+#: field:document.directory.content.type,active:0
+msgid "Active"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-msgid "Resources"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
 msgstr ""
 
 #. module: document
-#: field:document.directory,file_ids:0
-#: view:report.document.user:0
-msgid "Files"
+#: view:report.document.user:document.view_report_document_user_search
+msgid "All users files"
 msgstr ""
 
 #. module: document
-#: field:document.directory.content.type,mimetype:0
-msgid "Mime Type"
+#: help:document.directory,ressource_id:0
+msgid "Along with Parent Model, this ID attaches this folder to a specific record of Parent Model."
 msgstr ""
 
 #. module: document
 #: selection:report.document.user,month:0
-msgid "March"
+msgid "April"
 msgstr ""
 
 #. module: document
-#: field:document.directory.dctx,expr:0
-msgid "Expression"
+#. openerp-web
+#: code:addons/document/static/src/js/document.js:6
+#, python-format
+msgid "Attachment(s)"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-#: field:document.directory,company_id:0
-msgid "Company"
+#: view:ir.attachment:document.view_document_file_tree
+msgid "Attachments"
 msgstr ""
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content
-msgid "Directory Content"
+#: selection:report.document.user,month:0
+msgid "August"
 msgstr ""
 
 #. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
+#: help:document.directory.content,include_name:0
+msgid "Check this field if you want that the name of the file to contain the record name.\n"
+"If set, the directory will have to be a resource one."
 msgstr ""
 
 #. module: document
-#: model:ir.ui.menu,name:document.menu_document_management_configuration
-msgid "Document Management"
+#: help:document.directory,ressource_tree:0
+msgid "Check this if you want to use the same tree structure as the object selected in the system."
 msgstr ""
 
 #. module: document
-#: help:document.directory.dctx,expr:0
-msgid "A python expression used to evaluate the field.\n"
-"You can use 'dir_id' for current dir, 'res_id', 'res_model' as a reference to the current record, in dynamic folders"
+#: field:document.directory,child_ids:0
+msgid "Children"
 msgstr ""
 
 #. module: document
-#: help:document.directory.dctx,field:0
-msgid "The name of the field."
+#: view:document.directory:document.view_document_directory_filter
+#: field:document.directory,company_id:0
+msgid "Company"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document.py:326
-#: code:addons/document/document.py:331
-#, python-format
-msgid "Directory name must be unique!"
+#: view:document.configuration:document.view_auto_config_form
+#: model:ir.actions.act_window,name:document.action_config_auto_directory
+msgid "Configure Directories"
 msgstr ""
 
 #. module: document
-#: view:ir.attachment:0
-msgid "Filter on my documents"
+#: field:document.directory.content,name:0
+msgid "Content Name"
 msgstr ""
 
 #. module: document
-#: view:ir.attachment:0
-#: field:ir.attachment,index_content:0
-msgid "Indexed Content"
+#: field:document.directory.content.type,name:0
+msgid "Content Type"
 msgstr ""
 
 #. module: document
-#: help:document.directory,resource_find_all:0
-msgid "If true, all attachments that match this resource will  be located. If false, only ones that have this as parent."
+#: view:document.directory:document.view_document_directory_form
+msgid "Contents"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-#: model:ir.actions.act_window,name:document.action_document_directory_form
-#: model:ir.ui.menu,name:document.menu_document_directories
-msgid "Directories"
+#: field:document.directory,dctx_ids:0
+msgid "Context fields"
 msgstr ""
 
 #. module: document
-#: model:ir.model,name:document.model_report_document_user
-msgid "Files details by Users"
+#: field:document.configuration,create_uid:0
+#: field:document.directory.content,create_uid:0
+#: field:document.directory.content.type,create_uid:0
+#: field:document.directory.dctx,create_uid:0
+#: field:document.storage,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: document
-#: field:document.directory,resource_find_all:0
-msgid "Find all resources"
+#: field:document.configuration,create_date:0
+#: field:document.directory.content,create_date:0
+#: field:document.directory.content.type,create_date:0
+#: field:document.directory.dctx,create_date:0
+#: field:document.storage,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: document
-#: selection:document.directory,type:0
-msgid "Folders per resource"
+#: field:document.directory,create_uid:0
+msgid "Creator"
 msgstr ""
 
 #. module: document
-#: field:document.directory.content,suffix:0
-msgid "Suffix"
+#: field:document.directory,create_date:0
+#: field:report.document.user,create_date:0
+msgid "Date Created"
 msgstr ""
 
 #. module: document
-#: field:report.document.user,change_date:0
-msgid "Modified Date"
+#: field:document.directory,write_date:0
+msgid "Date Modified"
 msgstr ""
 
 #. module: document
-#: view:document.configuration:0
-msgid "Knowledge Application Configuration"
+#: selection:report.document.user,month:0
+msgid "December"
 msgstr ""
 
 #. module: document
-#: view:ir.attachment:0
-#: field:ir.attachment,partner_id:0
-msgid "Partner"
+#: view:document.directory:document.view_document_directory_form
+msgid "Define words in the context, for all child directories and files"
 msgstr ""
 
 #. module: document
-#: model:ir.actions.act_window,name:document.act_res_partner_document
-#: model:ir.actions.act_window,name:document.zoom_directory
-msgid "Related Documents"
+#: view:document.directory:document.view_document_directory_form
+msgid "Definition"
 msgstr ""
 
 #. module: document
-#: model:ir.actions.act_window,help:document.action_document_file_form
-msgid "<p class=\"oe_view_nocontent_create\">\n"
-"            Click to create a new document. \n"
-"          </p><p>\n"
-"            The Documents repository gives you access to all attachments, such\n"
-"            as mails, project documents, invoices etc.\n"
-"          </p>\n"
-"        "
+#: view:document.directory:document.view_document_directory_form
+#: view:document.directory:document.view_document_directory_tree
+#: model:ir.actions.act_window,name:document.action_document_directory_form
+#: model:ir.ui.menu,name:document.menu_document_directories
+msgid "Directories"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document.py:326
-#: code:addons/document/document.py:331
-#: code:addons/document/document.py:336
-#, python-format
-msgid "ValidateError"
+#: model:ir.actions.act_window,name:document.action_document_directory_tree
+#: model:ir.ui.menu,name:document.menu_document_directories_tree
+msgid "Directories' Structure"
 msgstr ""
 
 #. module: document
-#: model:ir.model,name:document.model_ir_actions_report_xml
-msgid "ir.actions.report.xml"
+#: field:document.directory.content,directory_id:0
+#: field:document.directory.dctx,dir_id:0
+#: model:ir.actions.act_window,name:document.action_document_file_directory_form
+#: view:ir.attachment:document.view_attach_filter_inherit2
+#: field:ir.attachment,parent_id:0
+#: model:ir.model,name:document.model_document_directory
+#: field:report.document.user,directory:0
+msgid "Directory"
 msgstr ""
 
 #. module: document
-#: model:ir.actions.act_window,name:document.action_document_file_form
-#: model:ir.ui.menu,name:document.menu_document_doc
-#: model:ir.ui.menu,name:document.menu_document_files
-msgid "Documents"
+#: model:ir.model,name:document.model_document_configuration
+msgid "Directory Configuration"
 msgstr ""
 
 #. module: document
-#: field:document.directory,ressource_type_id:0
-msgid "Resource model"
+#: model:ir.model,name:document.model_document_directory_content
+msgid "Directory Content"
 msgstr ""
 
 #. module: document
-#: field:report.document.file,file_size:0
-#: field:report.document.user,file_size:0
-msgid "File Size"
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
 msgstr ""
 
 #. module: document
-#: field:document.directory.content.type,name:0
-#: field:ir.attachment,file_type:0
-msgid "Content Type"
+#: model:ir.model,name:document.model_document_directory_dctx
+msgid "Directory Dynamic Context"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-#: field:document.directory,type:0
-msgid "Type"
+#: view:document.directory:document.view_document_directory_form
+#: field:report.document.user,type:0
+msgid "Directory Type"
 msgstr ""
 
 #. module: document
-#: sql_constraint:ir.attachment:0
-msgid "The filename must be unique in a directory !"
+#: sql_constraint:document.directory:0
+msgid "Directory cannot be parent of itself!"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document.py:110
-#: code:addons/document/document.py:296
+#: code:addons/document/document.py:347
 #, python-format
-msgid "%s (copy)"
+msgid "Directory name contains special characters!"
 msgstr ""
 
 #. module: document
-#: help:document.directory,ressource_type_id:0
-msgid "Select an object here and there will be one folder per record of that resource."
+#: code:addons/document/document.py:337
+#: code:addons/document/document.py:342
+#, python-format
+msgid "Directory name must be unique!"
 msgstr ""
 
 #. module: document
-#: help:document.directory,domain:0
-msgid "Use a domain if you want to apply an automatic filter on visible resources."
+#: view:document.directory:document.view_document_directory_filter
+msgid "Document Directory"
 msgstr ""
 
 #. module: document
-#: constraint:document.directory:0
-msgid "Error! You cannot create recursive directories."
+#: model:ir.ui.menu,name:document.menu_document_management_configuration
+msgid "Document Management"
 msgstr ""
 
 #. module: document
-#: field:document.directory,resource_field:0
-msgid "Name field"
+#: field:document.directory.content,extension:0
+msgid "Document Type"
 msgstr ""
 
 #. module: document
-#: field:document.directory,dctx_ids:0
-msgid "Context fields"
+#: model:ir.actions.act_window,name:document.action_document_file_form
+msgid "Documents"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-#: field:report.document.user,type:0
-msgid "Directory Type"
+#: field:document.directory,domain:0
+msgid "Domain"
 msgstr ""
 
 #. module: document
-#: field:document.directory.content,report_id:0
-msgid "Report"
+#: view:document.directory:document.view_document_directory_form
+msgid "Dynamic context"
 msgstr ""
 
 #. module: document
-#: selection:report.document.user,month:0
-msgid "July"
+#: help:document.directory,type:0
+msgid "Each directory can either have the type Static or be linked to another resource. A static directory, as with Operating Systems, is the classic directory that can contain a set of files. The directories linked to systems resources automatically possess sub-directories for each of resource types defined in the parent directory."
 msgstr ""
 
 #. module: document
-#: field:document.directory.content.type,code:0
-msgid "Extension"
+#: code:addons/document/document.py:573
+#, python-format
+msgid "Error at doc write!"
 msgstr ""
 
 #. module: document
-#: field:document.directory,content_ids:0
-msgid "Virtual Files"
+#: constraint:document.directory:0
+msgid "Error! You cannot create recursive directories."
 msgstr ""
 
 #. module: document
-#: code:addons/document/document.py:562
-#, python-format
-msgid "Error at doc write!"
+#: field:document.directory.dctx,expr:0
+msgid "Expression"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-msgid "Generated Files"
+#: field:document.directory.content.type,code:0
+msgid "Extension"
 msgstr ""
 
 #. module: document
-#: view:document.configuration:0
-msgid "When executing this wizard, it will configure your directories automatically according to modules installed."
+#: selection:report.document.user,month:0
+msgid "February"
 msgstr ""
 
 #. module: document
-#: field:document.directory.content,directory_id:0
-#: field:document.directory.dctx,dir_id:0
-#: model:ir.actions.act_window,name:document.action_document_file_directory_form
-#: view:ir.attachment:0
-#: field:ir.attachment,parent_id:0
-#: model:ir.model,name:document.model_document_directory
-#: field:report.document.user,directory:0
-msgid "Directory"
+#: field:document.directory.dctx,field:0
+msgid "Field"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-msgid "Security"
+#: help:document.directory,resource_field:0
+msgid "Field to be used as name on resource directories. If empty, the \"name\" will be used."
 msgstr ""
 
 #. module: document
-#: field:document.directory,write_uid:0
-#: field:ir.attachment,write_uid:0
-msgid "Last Modification User"
+#: view:document.directory:document.view_document_directory_form
+msgid "Fields"
 msgstr ""
 
 #. module: document
-#: model:ir.actions.act_window,name:document.action_view_files_by_user_graph
-#: view:report.document.user:0
-msgid "Files by User"
+#: field:report.document.user,datas_fname:0
+msgid "File Name"
 msgstr ""
 
 #. module: document
-#: view:ir.attachment:0
-msgid "on"
+#: field:report.document.file,file_size:0
+#: field:report.document.user,file_size:0
+msgid "File Size"
 msgstr ""
 
 #. module: document
-#: field:document.directory,domain:0
-msgid "Domain"
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:document.view_size_month
+#: view:report.document.file:document.view_size_month_tree
+msgid "File Size by Month"
 msgstr ""
 
 #. module: document
-#: field:document.directory,write_date:0
-#: field:ir.attachment,write_date:0
-msgid "Date Modified"
+#: field:document.directory,file_ids:0
+#: view:report.document.user:document.view_document_user_form
+#: view:report.document.user:document.view_document_user_tree
+msgid "Files"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:document.view_files_by_month_graph
+#: view:report.document.user:document.view_files_by_month_tree
+msgid "Files by Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_user_graph
+#: view:report.document.user:document.view_files_by_user_graph
+msgid "Files by User"
 msgstr ""
 
 #. module: document
@@ -359,210 +380,220 @@ msgid "Files details by Directory"
 msgstr ""
 
 #. module: document
-#: view:report.document.user:0
-msgid "All users files"
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
 msgstr ""
 
 #. module: document
-#: model:ir.actions.act_window,name:document.action_view_size_month
-#: view:report.document.file:0
-msgid "File Size by Month"
+#: view:ir.attachment:document.view_attach_filter_inherit0
+msgid "Filter on my documents"
 msgstr ""
 
 #. module: document
-#: selection:report.document.user,month:0
-msgid "December"
+#: field:document.directory,resource_find_all:0
+msgid "Find all resources"
 msgstr ""
 
 #. module: document
 #: selection:document.directory,type:0
-msgid "Static Directory"
+msgid "Folders per resource"
 msgstr ""
 
 #. module: document
-#: field:report.document.file,month:0
-#: field:report.document.user,month:0
-msgid "Month"
+#: view:document.directory:document.view_document_directory_form
+msgid "For each entry here, virtual files will appear in this folder."
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-msgid "Define words in the context, for all child directories and files"
+#: view:document.directory:document.view_document_directory_form
+msgid "Generated Files"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-msgid "Static"
+#: view:document.directory:document.view_document_directory_filter
+msgid "Group By"
 msgstr ""
 
 #. module: document
-#: field:report.document.user,user:0
-msgid "unknown"
+#: field:document.directory,group_ids:0
+msgid "Groups"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-#: field:document.directory,user_id:0
-#: view:ir.attachment:0
-#: field:ir.attachment,user_id:0
-#: field:report.document.user,user_id:0
-msgid "Owner"
+#: field:document.configuration,id:0
+#: field:document.directory,id:0
+#: field:document.directory.content,id:0
+#: field:document.directory.content.type,id:0
+#: field:document.directory.dctx,id:0
+#: field:document.storage,id:0
+#: field:report.document.file,id:0
+#: field:report.document.user,id:0
+msgid "ID"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-msgid "PDF Report"
+#: help:document.directory,resource_find_all:0
+msgid "If true, all attachments that match this resource will  be located. If false, only ones that have this as parent."
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-msgid "Contents"
+#: help:document.directory,ressource_parent_type_id:0
+msgid "If you put an object here, this directory template will appear bellow all of these objects. Such directories are \"attached\" to the specific model or record, just like attachments. Don't put a parent directory if you select a parent model."
 msgstr ""
 
 #. module: document
-#: field:document.directory,create_date:0
-#: field:report.document.user,create_date:0
-msgid "Date Created"
+#: field:document.directory.content,include_name:0
+msgid "Include Record Name"
 msgstr ""
 
 #. module: document
-#: help:document.directory.content,include_name:0
-msgid "Check this field if you want that the name of the file to contain the record name.\n"
-"If set, the directory will have to be a resource one."
+#: view:ir.attachment:document.view_document_file_form
+#: field:ir.attachment,index_content:0
+msgid "Indexed Content"
 msgstr ""
 
 #. module: document
-#: view:document.configuration:0
-#: model:ir.actions.act_window,name:document.action_config_auto_directory
-msgid "Configure Directories"
+#: selection:report.document.user,month:0
+msgid "January"
 msgstr ""
 
 #. module: document
-#: field:document.directory.content,include_name:0
-msgid "Include Record Name"
+#: selection:report.document.user,month:0
+msgid "July"
 msgstr ""
 
 #. module: document
-#: field:ir.actions.report.xml,model_id:0
-msgid "Model Id"
+#: selection:report.document.user,month:0
+msgid "June"
 msgstr ""
 
 #. module: document
-#: help:document.directory,ressource_tree:0
-msgid "Check this if you want to use the same tree structure as the object selected in the system."
+#: view:document.configuration:document.view_auto_config_form
+msgid "Knowledge Application Configuration"
 msgstr ""
 
 #. module: document
-#: help:document.directory,ressource_id:0
-msgid "Along with Parent Model, this ID attaches this folder to a specific record of Parent Model."
+#: field:document.directory,write_uid:0
+msgid "Last Modification User"
 msgstr ""
 
 #. module: document
-#. openerp-web
-#: code:addons/document/static/src/js/document.js:6
-#, python-format
-msgid "Attachment(s)"
+#: field:document.configuration,write_uid:0
+#: field:document.directory.content,write_uid:0
+#: field:document.directory.content.type,write_uid:0
+#: field:document.directory.dctx,write_uid:0
+#: field:document.storage,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: document
-#: selection:report.document.user,month:0
-msgid "August"
+#: field:document.configuration,write_date:0
+#: field:document.directory.content,write_date:0
+#: field:document.directory.content.type,write_date:0
+#: field:document.directory.dctx,write_date:0
+#: field:document.storage,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
+#: selection:report.document.user,month:0
+msgid "March"
 msgstr ""
 
 #. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
+#: selection:report.document.user,month:0
+msgid "May"
 msgstr ""
 
 #. module: document
-#: selection:report.document.user,month:0
-msgid "June"
+#: field:document.directory.content.type,mimetype:0
+msgid "Mime Type"
 msgstr ""
 
 #. module: document
-#: field:document.directory,group_ids:0
-msgid "Groups"
+#: field:ir.actions.report.xml,model_id:0
+msgid "Model Id"
 msgstr ""
 
 #. module: document
-#: field:document.directory.content.type,active:0
-msgid "Active"
+#: view:ir.attachment:document.view_document_file_form
+msgid "Modification"
 msgstr ""
 
 #. module: document
-#: selection:report.document.user,month:0
-msgid "November"
+#: field:report.document.user,change_date:0
+msgid "Modified Date"
 msgstr ""
 
 #. module: document
-#: help:document.directory,ressource_parent_type_id:0
-msgid "If you put an object here, this directory template will appear bellow all of these objects. Such directories are \"attached\" to the specific model or record, just like attachments. Don't put a parent directory if you select a parent model."
+#: field:report.document.file,month:0
+#: field:report.document.user,month:0
+msgid "Month"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-msgid "Definition"
+#: view:ir.attachment:document.view_attach_filter_inherit0
+msgid "My Document(s)"
 msgstr ""
 
 #. module: document
-#: selection:report.document.user,month:0
-msgid "October"
+#: field:document.directory,name:0
+msgid "Name"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-msgid "Seq."
+#: field:document.directory,resource_field:0
+msgid "Name field"
 msgstr ""
 
 #. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
+#: selection:report.document.user,month:0
+msgid "November"
 msgstr ""
 
 #. module: document
 #: selection:report.document.user,month:0
-msgid "January"
+msgid "October"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-msgid "Document Directory"
+#: view:document.configuration:document.view_auto_config_form
+msgid "Odoo's Document Management System supports mapping virtual folders with documents. The virtual folder of a document can be used to manage the files attached to the document, or to print and download any report. This tool will create directories automatically according to modules installed."
 msgstr ""
 
 #. module: document
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
+#: view:document.directory:document.view_document_directory_form
+msgid "Only members of these groups will have access to this directory and its files."
 msgstr ""
 
 #. module: document
-#: view:ir.attachment:0
-msgid "Attachments"
+#: view:document.directory:document.view_document_directory_filter
+#: field:document.directory,user_id:0
+#: view:ir.attachment:document.view_attach_filter_inherit2
+#: field:ir.attachment,user_id:0
+#: field:report.document.user,user_id:0
+msgid "Owner"
 msgstr ""
 
 #. module: document
-#: field:document.directory,create_uid:0
-msgid "Creator"
+#: view:document.directory:document.view_document_directory_form
+msgid "PDF Report"
 msgstr ""
 
 #. module: document
-#: view:document.configuration:0
-msgid "OpenERP's Document Management System supports mapping virtual folders with documents. The virtual folder of a document can be used to manage the files attached to the document, or to print and download any report. This tool will create directories automatically according to modules installed."
+#: field:document.directory,parent_id:0
+msgid "Parent Directory"
 msgstr ""
 
 #. module: document
-#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
-#: view:report.document.user:0
-msgid "Files by Month"
+#: field:document.directory,ressource_parent_type_id:0
+msgid "Parent Model"
 msgstr ""
 
 #. module: document
-#: selection:report.document.user,month:0
-msgid "September"
+#: view:ir.attachment:document.view_attach_filter_inherit2
+#: field:ir.attachment,partner_id:0
+msgid "Partner"
 msgstr ""
 
 #. module: document
@@ -571,137 +602,138 @@ msgid "Prefix"
 msgstr ""
 
 #. module: document
-#: field:document.directory,child_ids:0
-msgid "Children"
+#: model:ir.actions.act_window,name:document.act_res_partner_document
+#: model:ir.actions.act_window,name:document.zoom_directory
+msgid "Related Documents"
 msgstr ""
 
 #. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
+#: field:document.directory.content,report_id:0
+msgid "Report"
 msgstr ""
 
 #. module: document
-#: field:document.directory.dctx,field:0
-msgid "Field"
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
 msgstr ""
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_dctx
-msgid "Directory Dynamic Context"
+#: field:document.directory,ressource_type_id:0
+msgid "Resource model"
 msgstr ""
 
 #. module: document
-#: field:document.directory,ressource_parent_type_id:0
-msgid "Parent Model"
+#: view:document.directory:document.view_document_directory_filter
+msgid "Resources"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-msgid "These groups, however, do NOT apply to children directories, which must define their own groups."
+#: view:document.directory:document.view_document_directory_filter
+msgid "Search Document Directory"
 msgstr ""
 
 #. module: document
-#: selection:report.document.user,month:0
-msgid "May"
+#: view:document.directory:document.view_document_directory_form
+msgid "Security"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-msgid "For each entry here, virtual files will appear in this folder."
+#: help:document.directory,ressource_type_id:0
+msgid "Select an object here and there will be one folder per record of that resource."
 msgstr ""
 
 #. module: document
-#: model:ir.model,name:document.model_ir_attachment
-msgid "ir.attachment"
+#: selection:report.document.user,month:0
+msgid "September"
 msgstr ""
 
 #. module: document
-#: view:report.document.user:0
-msgid "Users File"
+#: view:document.directory:document.view_document_directory_form
+msgid "Seq."
 msgstr ""
 
 #. module: document
-#: model:ir.model,name:document.model_document_configuration
-msgid "Directory Configuration"
+#: field:document.directory.content,sequence:0
+msgid "Sequence"
 msgstr ""
 
 #. module: document
-#: help:document.directory,type:0
-msgid "Each directory can either have the type Static or be linked to another resource. A static directory, as with Operating Systems, is the classic directory that can contain a set of files. The directories linked to systems resources automatically possess sub-directories for each of resource types defined in the parent directory."
+#: view:document.directory:document.view_document_directory_filter
+msgid "Static"
 msgstr ""
 
 #. module: document
-#: selection:report.document.user,month:0
-msgid "February"
+#: selection:document.directory,type:0
+msgid "Static Directory"
 msgstr ""
 
 #. module: document
-#: field:document.directory,name:0
-msgid "Name"
+#: model:ir.model,name:document.model_document_storage
+msgid "Storage Media"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-msgid "Fields"
+#: field:document.directory.content,suffix:0
+msgid "Suffix"
 msgstr ""
 
 #. module: document
-#: selection:report.document.user,month:0
-msgid "April"
+#: sql_constraint:document.directory:0
+msgid "The directory name must be unique !"
 msgstr ""
 
 #. module: document
-#: field:report.document.file,nbr:0
-#: field:report.document.user,nbr:0
-msgid "# of Files"
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
 msgstr ""
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-msgid "Only members of these groups will have access to this directory and its files."
+#: view:document.directory:document.view_document_directory_form
+msgid "These groups, however, do NOT apply to children directories, which must define their own groups."
 msgstr ""
 
 #. module: document
-#. openerp-web
-#: code:addons/document/static/src/js/document.js:17
-#, python-format
-msgid "%s (%s)"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
 msgstr ""
 
 #. module: document
-#: field:document.directory.content,sequence:0
-msgid "Sequence"
+#: view:document.directory:document.view_document_directory_filter
+#: field:document.directory,type:0
+msgid "Type"
 msgstr ""
 
 #. module: document
-#: field:document.directory.content,name:0
-msgid "Content Name"
+#: help:document.directory,domain:0
+msgid "Use a domain if you want to apply an automatic filter on visible resources."
 msgstr ""
 
 #. module: document
-#: field:report.document.user,datas_fname:0
-msgid "File Name"
+#: view:report.document.user:document.view_report_document_user_search
+msgid "Users File"
 msgstr ""
 
 #. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
+#: code:addons/document/document.py:337
+#: code:addons/document/document.py:342
+#: code:addons/document/document.py:347
+#, python-format
+msgid "ValidateError"
 msgstr ""
 
 #. module: document
-#: view:document.configuration:0
-msgid "res_config_contents"
+#: field:document.directory,content_ids:0
+msgid "Virtual Files"
 msgstr ""
 
 #. module: document
-#: model:ir.actions.act_window,name:document.action_document_directory_tree
-#: model:ir.ui.menu,name:document.menu_document_directories_tree
-msgid "Directories' Structure"
+#: view:document.configuration:document.view_auto_config_form
+msgid "When executing this wizard, it will configure your directories automatically according to modules installed."
 msgstr ""
 
 #. module: document
@@ -710,12 +742,12 @@ msgid "Year"
 msgstr ""
 
 #. module: document
-#: model:ir.model,name:document.model_document_storage
-msgid "Storage Media"
+#: view:document.configuration:document.view_auto_config_form
+msgid "res_config_contents"
 msgstr ""
 
 #. module: document
-#: field:document.directory.content,extension:0
-msgid "Document Type"
+#: field:report.document.user,user:0
+msgid "unknown"
 msgstr ""
 
diff --git a/addons/document/static/src/js/document.js b/addons/document/static/src/js/document.js
index e4bce2da76e..5b353d5b0dd 100644
--- a/addons/document/static/src/js/document.js
+++ b/addons/document/static/src/js/document.js
@@ -3,8 +3,10 @@ openerp.document = function (instance) {
     instance.web.Sidebar.include({
         init : function(){
             this._super.apply(this, arguments);
-            this.sections.splice(1, 0, { 'name' : 'files', 'label' : _t('Attachment(s)'), });
-            this.items['files'] = [];
+            if (this.getParent().view_type == "form"){
+                this.sections.splice(1, 0, { 'name' : 'files', 'label' : _t('Attachment(s)'), });
+                this.items['files'] = [];
+            }
         },
         on_attachments_loaded: function(attachments) {
             //to display number in name if more then one attachment which has same name.