[IMP] project_long_term: improve gantt view

bzr revid: hmo@tinyerp.com-20101014102654-e3wkawf339sc9ido

2 files changed, 31 insertions, 29 deletions

diff --git a/addons/document/document.py b/addons/document/document.py
index 6c2a6b6aff5..92a00f3222c 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -88,7 +88,6 @@ class document_file(osv.osv):
         'parent_id': fields.many2one('document.directory', 'Directory', select=1, required=True),
         'index_content': fields.text('Indexed Content'),
         'partner_id':fields.many2one('res.partner', 'Partner', select=1),
-        'company_id': fields.many2one('res.company', 'Company'),
         'file_size': fields.integer('File Size', required=True),
         'file_type': fields.char('Content Type', size=128),
 
@@ -102,7 +101,6 @@ class document_file(osv.osv):
         return dirobj._get_root_directory(cr, uid, context)
 
     _defaults = {
-        'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'ir.attachment', context=c),
         'user_id': lambda self, cr, uid, ctx:uid,
         'file_size': lambda self, cr, uid, ctx:0,
         'parent_id': __get_def_directory
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index b978cd222db..eeb2a879cb6 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -277,38 +277,42 @@
             </form>
         </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="create_uid" position="replace">
+                    <field name="user_id">
+                            <filter icon="terp-personal"
+                                domain="[('user_id','=',uid)]"
+                                help="Filter on my documents" />
+                        </field>
+                    <field name="parent_id" />
+                </field>
+            </field>
+    </record>
+
+        
 
-    <record id="view_attach_filter" model="ir.ui.view">
-            <field name="name">IR Attachment</field>
+    <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">
-             <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 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...">
-                    <filter string="Partner" icon="terp-personal" domain="[]"
+                <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="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>
-         </record>
+                    
+                 </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 +323,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 +338,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"/>