[Merge] Merge with trunk addons

bzr revid: vir@tinyerp.com-20100602082332-bq3vbck48iyd4thx

1 files changed, 56 insertions, 31 deletions

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 720ab6de69f..fd424ad7d52 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -118,7 +118,7 @@
     <record model="ir.ui.view" id="view_document_directory_tree">
         <field name="name">document.directory</field>
         <field name="model">document.directory</field>
-        <field name="type">tree</field>        
+        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Directories" toolbar="1">
                 <field name="name"/>
@@ -179,71 +179,96 @@
             <form string="Documents">
                 <group colspan="4" col="6">
                     <field name="name" select="1" />
-                    <field name="title" select="1"/>
-                    <field name="partner_id"/>
-                    <field name="user_id"/>
-                    <field name="parent_id"/>
+                    <field name="type"/>
+                     <field name="parent_id"/>
                 </group>
                 <notebook colspan="4">
                 <page string="Attachment">
                     <group col="2" colspan="2">
                         <separator string="Data" colspan="2"/>
+                        <group col="2" colspan="2" attrs="{'invisible':[('type','=','url')]}">
                         <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"/>
+                        </group>
+
                     </group>
+
+
                     <group col="2" colspan="2">
-                        <separator string="Attached To" colspan="2"/>
-                        <field name="res_model" readonly="1"/>
-                        <field name="res_id" readonly="1"/>
+                        <separator string="Relation" colspan="2"/>
+                         <field name="res_name" readonly="1"/>
+                         <field name="partner_id"/>
+                          <field name="user_id"/>
                     </group>
-                    <separator string="Preview" colspan="4"/>
-                    <field
-                        name="preview"
-                        widget="image"
-                        readonly="1"
-                        nolabel="1"
-                        colspan="4"
-                        img_height="400"
-                        img_width="800"/>
-
-                </page><page string="Indexed Content">
-                    <field name="index_content" nolabel="1" colspan="4" select="1"/>
-                </page><page string="Security">
-                    <field name="group_ids" colspan="4" nolabel="1"/>
-                </page><page string="Others Info">
-                    <group colspan="4" col="4">
-                        <separator string="File Information" colspan="4"/>
-                        <field name="file_size" readonly="1"/>
-                        <newline/>
+                    <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"/>
+                        </group>
                     </group>
 
-                </page><page string="Notes">
+                </page>
+                <page string="Security">
+                    <field name="group_ids" colspan="4" nolabel="1"/>
+                </page>
+
+                <page string="Notes">
                     <field colspan="4" name="description" nolabel="1"/>
                 </page>
                 </notebook>
             </form>
         </field>
     </record>
+
+    <record id="view_attach_filter" model="ir.ui.view">
+            <field name="name">IR Attachment</field>
+            <field name="model">ir.attachment</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+             <search string="IR Attachment">
+             <filter icon="gtk-media-rewind" string="Recent"
+                    help="less 1 month modified/created attachments"
+                    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="user_id" widget="selection">
+                    <filter icon="terp-partner"
+                        domain="[('user_id','=', False)]"
+                        help="Filter on my Attachment" />
+                    </field>
+                    <field name="partner_id" widget="selection"/>
+                    <newline/>
+                 <group expand="1" string="Group By...">
+                    <filter string="Partner" icon="terp-partner" domain="[]"
+                       context="{'group_by':'partner_id'}" />
+                    <filter string="Directory" icon="gtk-open" domain="[]" context="{'group_by':'parent_id'}"/>
+                 </group>
+              </search>
+             </field>
+         </record>
     <record model="ir.ui.view" id="view_document_file_tree">
         <field name="name">ir.attachment</field>
         <field name="model">ir.attachment</field>
         <field name="type">tree</field>
         <field name="priority" eval="1"/>
         <field name="arch" type="xml">
-            <tree string="Documents">
+            <tree colors="blue:type in ('url')" string="Documents">
                 <field name="name"/>
-                <field name="title" />
-                <field name="partner_id"/>
+                <field name="type"/>
                 <field name="datas_fname"/>
                 <field name="user_id"/>
                 <field name="create_date"/>
                 <field name="write_date"/>
             </tree>
+
         </field>
     </record>