[IMP] document: imporved search view for Document

bzr revid: jas@tinyerp.com-20101014054000-mr0h707ba2odbt5t

1 files changed, 47 insertions, 18 deletions

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index b978cd222db..699918c47e9 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -278,37 +278,66 @@
         </field>
     </record>
 
-    <record id="view_attach_filter" model="ir.ui.view">
+         <record id="view_attach_filter_inherit" model="ir.ui.view">
             <field name="name">IR Attachment</field>
             <field name="model">ir.attachment</field>
             <field name="type">search</field>
+            <field name="inherit_id" ref="base.view_attachment_search"/>
             <field name="arch" type="xml">
-             <search string="Document">
-             <filter icon="terp-go-month" string="Month"
-                    domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
-                />
-                 <separator orientation="vertical"/>
-                 <field name="name"/>
-                 <field name="parent_id" />
-                 <field name="user_id">
+                <filter string="Binary" position="after">
+                    <filter icon="terp-go-month" string="Month"
+                    domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"/>
+                </filter>
+            </field>
+         </record>
+
+        <record id="view_attach_filter_inherit0" model="ir.ui.view">
+            <field name="name">IR Attachment0</field>
+            <field name="model">ir.attachment</field>
+            <field name="type">search</field>
+            <field name="inherit_id" ref="base.view_attachment_search"/>
+            <field name="arch" type="xml">
+                <field name="type" position="replace">
+                    <field name="parent_id" />
+                </field>
+                <field name="datas_fname" position="replace">
+                   <field name="user_id">
                     <filter icon="terp-personal"
                         domain="[('user_id','=',uid)]"
                         help="Filter on my documents" />
                  </field>
-                <field name="partner_id"/>
-                <field name="company_id" groups="base.group_multi_company"/>
-                <newline/>
-                <group expand="0" string="Group By...">
+                </field>
+            </field>
+         </record>
+
+         <record id="view_attach_filter_inherit1" model="ir.ui.view">
+            <field name="name">IR Attachment1</field>
+            <field name="model">ir.attachment</field>
+            <field name="type">search</field>
+            <field name="inherit_id" ref="base.view_attachment_search"/>
+            <field name="arch" type="xml">
+                <filter string="Creator" position="replace">
+                   <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                </filter>
+            </field>
+         </record>
+
+         <record id="view_attach_filter_inherit2" model="ir.ui.view">
+            <field name="name">IR Attachment2</field>
+            <field name="model">ir.attachment</field>
+            <field name="type">search</field>
+            <field name="inherit_id" ref="base.view_attachment_search"/>
+            <field name="arch" type="xml">
+                <filter string="Owner" position="after">
                     <filter string="Partner" icon="terp-personal" domain="[]"
                        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" icon="terp-stock_symbol-selection" 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>
-              </search>
-             </field>
+                 </filter>
+            </field>
          </record>
+
     <record model="ir.ui.view" id="view_document_file_tree">
         <field name="name">ir.attachment</field>
         <field name="model">ir.attachment</field>
@@ -319,6 +348,7 @@
                 <field name="name"/>
                 <field name="parent_id" />
                 <field name="user_id"/>
+                <field name="company_id"/>
                 <field name="create_date"/>
                 <field name="write_date"/>
                 <field name="partner_id" groups="base.group_extended" />
@@ -333,7 +363,6 @@
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">ir.attachment</field>
         <field name="view_type">form</field>
-        <field name="search_view_id" ref="view_attach_filter"/>
         <field name="help">The Documents repository gives you access to all attachments, such as mails, project documents, invoices etc.</field>
     </record>
     <menuitem name="Documents" id="menu_document_doc" parent="knowledge.menu_document" sequence="0"/>