[IMP]: document: [task-786] Review ir_attachment object,apply changes in base/ir and document module

bzr revid: ksa@tinyerp.co.in-20100527111423-m2b3wrx02jcuxvy9

1 files changed, 29 insertions, 35 deletions

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index e796523f0af..fd424ad7d52 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -179,27 +179,31 @@
             <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>
                     <group col="4" colspan="4">
-                    <separator string="File Information" colspan="4"/>
-                        <field name="file_size" readonly="1"/>
-                        <newline/>
                         <separator string="History" colspan="4"/>
                         <group col="4" colspan="4">
                         <field name="create_uid"/>
@@ -210,15 +214,6 @@
                         <field name="write_date"/>
                         </group>
                     </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="Security">
@@ -239,24 +234,23 @@
             <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'}"/>
-                     <separator orientation="vertical"/>
-                    <field name="user_id" widget="selection">
-                        <filter icon="terp-partner"
-                        domain="[('user_id','=', False)]"
-                        help="Owner" />
-                    </field>
-                    <field name="partner_id" widget="selection">
-                        <filter icon="terp-partner"
-                        domain="[('partner_id','=', False)]"
-                        help="Partner"/>
-                    </field>
                  </group>
-
-
               </search>
              </field>
          </record>
@@ -266,15 +260,15 @@
         <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>