From fba0a0032826b6f9be55faf5d73ccca67c33dcac Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Sat, 16 Oct 2010 16:13:47 +0530
Subject: [PATCH 1/2] [IMP] project: improved tasks analysis

bzr revid: jas@tinyerp.com-20101016104347-h2355o7drlzs9h2w
---
 addons/project/report/project_report_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index eb781690c1b..94f9ce9d745 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -149,7 +149,7 @@
             <field name="help">Get detailed analysis by task</field>
         </record>
 
-        <menuitem id="menu_tasks_config" name="Tasks" parent="project.menu_definitions" sequence="1" groups="base.group_system,group_project_finance_user"/>
+        <menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="base.menu_project_report" groups="project.group_project_manager,project.group_project_finance_user"/>
 
    <!-- Views and action for project dashboard -->
    <record id="view_project_vs_remaining_hours_tree" model="ir.ui.view">

From e9336e5e03a4a03cca6bc4411249cf97422031ac Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Mon, 18 Oct 2010 12:06:11 +0530
Subject: [PATCH 2/2] [IMP] document : improved search view

bzr revid: jas@tinyerp.com-20101018063611-v7ls2kptyrwagfqv
---
 addons/document/document.py       |  3 +-
 addons/document/document_view.xml | 53 ++++++++++++++++++++-----------
 2 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/addons/document/document.py b/addons/document/document.py
index 92a00f3222c..552fdf235df 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -90,7 +90,7 @@ class document_file(osv.osv):
         'partner_id':fields.many2one('res.partner', 'Partner', select=1),
         'file_size': fields.integer('File Size', required=True),
         'file_type': fields.char('Content Type', size=128),
-
+        'company_id': fields.many2one('res.company', 'Company'),
         # fields used for file storage
         'store_fname': fields.char('Stored Filename', size=200),
     }
@@ -101,6 +101,7 @@ 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 e5719705ebe..9b20a6ef048 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -278,41 +278,56 @@
         </field>
     </record>
 
-    <record id="view_attach_filter_inherit0" model="ir.ui.view">
-            <field name="name">IR Attachment0</field>
+       <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">
-                <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 name="index_content"/>
+                <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>
-            </field>
-    </record>
+         </record>
 
+      <record id="view_attach_filter_inherit0" 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">
+                <xpath expr="/search/group/field[@name='type']" position="replace">
+                	<field name="parent_id" />
+				</xpath>
+				<xpath expr="/search/group/field[@name='datas_fname']" position="replace">
+                    <field name="user_id">
+                   		<filter icon="terp-personal"
+                        domain="[('user_id','=',uid)]"
+                        help="Filter on my documents" />
+                 	</field>
+                </xpath>
+                <xpath expr="/search/group/filter[@string='Creator']" position="replace">
+                	<filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+				</xpath>
+           </field>
+        </record>
 
-    <record id="view_attach_filter_inherit2" model="ir.ui.view">
-
+        <record id="view_attach_filter_inherit1" 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="replace">
-                    <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                    <filter string="Partner" icon="terp-partner" domain="[]"
-
+                <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="Company" icon="terp-personal" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                  </filter>
             </field>
-    </record>
+         </record>
 
 
     <record model="ir.ui.view" id="view_document_file_tree">