[MERGE]

bzr revid: uco@tinyerp.com-20101230060753-wujam7otb5f13f0z

3 files changed, 13 insertions, 9 deletions

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index df5e78894fd..cff66049d3b 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -311,13 +311,14 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="base.view_attachment_search"/>
             <field name="arch" type="xml">
+                <xpath expr="/search/group[@string='Group By...']" position="attributes">
+                    <attribute name="groups">base.group_extended</attribute>
+                </xpath>
                 <filter string="Owner" position="replace">
                     <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                    <filter string="Partner" icon="terp-partner" domain="[]"
-
-                       context="{'group_by':'partner_id'}"  groups="base.group_extended"/>
+                    <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                     <filter string="Directory" icon="terp-folder-green" domain="[]" context="{'group_by':'parent_id'}"/>
-                 </filter>
+                </filter>
             </field>
     </record>
 
diff --git a/addons/document/i18n/de.po b/addons/document/i18n/de.po
index 0fdc92c3c35..6b983b0d71a 100644
--- a/addons/document/i18n/de.po
+++ b/addons/document/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-30 16:28+0000\n"
+"PO-Revision-Date: 2010-12-28 12:38+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:47+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
@@ -221,7 +221,7 @@ msgstr "Änderungsdatum"
 #. module: document
 #: view:document.configuration:0
 msgid "Knowledge Application Configuration"
-msgstr ""
+msgstr "Konfiguration Knowledge"
 
 #. module: document
 #: view:ir.attachment:0
@@ -274,7 +274,7 @@ msgstr "Speicher"
 #. module: document
 #: view:document.configuration:0
 msgid "Configure Resource Directory"
-msgstr ""
+msgstr "Konfiguration Datenverzeichnis"
 
 #. module: document
 #: field:ir.attachment,file_size:0
@@ -609,6 +609,8 @@ msgid ""
 "Along with Parent Model, this ID attaches this folder to a specific record "
 "of Parent Model."
 msgstr ""
+"Parallel zur Eltern-Kind Beziehung wird durch diese ID ein spezieller "
+"Datensatz erstellt."
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -708,7 +710,7 @@ msgstr "Integrierte Dokumentenverwaltung"
 #. module: document
 #: view:document.configuration:0
 msgid "Choose the following Resouces to auto directory configuration."
-msgstr ""
+msgstr "Wählen Sie die folgenden Ressourcen für eine automatische Anbindung."
 
 #. module: document
 #: view:ir.attachment:0
diff --git a/addons/document/security/ir.model.access.csv b/addons/document/security/ir.model.access.csv
index d7aba7cbde7..0422edba24e 100644
--- a/addons/document/security/ir.model.access.csv
+++ b/addons/document/security/ir.model.access.csv
@@ -25,3 +25,4 @@
 "access_report_document_file_group_system","report.document.file group system","model_report_document_file","base.group_system",1,0,0,0
 "access_report_document_wall_group_document_manager","report.document.wall document manager","model_report_document_wall","base.group_system",1,0,0,0
 "access_report_document_wall_group_system","report.document.wall group system","model_report_document_wall","base.group_system",1,0,0,0
+"access_report_document_user_knowledgeuser","report.document.user knowledgeuser","document.model_report_document_user","base.group_document_user",1,0,0,0