Added calendar gantt and search view in project_long-term

[odoo/odoo.git] / addons / project / project_view.xml

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 73249f5..bab890a 100644 (file)
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -25,7 +25,7 @@
                         <page string="Administration">
                             <group col="2" colspan="2">
                                 <separator colspan="2" string="Scheduling"/>
-                                 <field name="priority"/>
+                                <field name="priority"/>
                                 <field name="active" select="2"/>
                             </group>
                             <group col="2" colspan="2">
@@ -402,8 +402,7 @@
             <field name="arch" type="xml">
                <search string="Task Edition">
                     <group col="20" colspan="4">
-                        <filter string="TODO" domain="[('state','in',('open','draft'))]" help="Draft and Open Tasks" icon="terp-project" default="1"/>
-                        <filter string="Current" domain="[('state','in',('open','draft','pending'))]" help="Draft, Open and Pending Tasks" icon="terp-project" default="1"/>
+                        <filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft, Open and Pending Tasks" icon="terp-project" default="1"/>
                         <filter string="In Progress" domain="[('state','=','open')]" help="Open Tasks" icon="terp-project"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-project"/>
                         <separator orientation="vertical"/>
@@ -411,7 +410,8 @@
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
                         <field name="project_id" select="1" widget="selection" default="context.get('project_id', False)">
-                             <filter domain="[('manager_id','=',False)]" help="Unassigned Project" icon="terp-project"/>
+                             <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-project"/>
+                             <filter domain="[('project_id','=',False)]" help="Tasks not assigned to a project" icon="terp-project"/>
                         </field>
                         <field name="user_id" select="1" widget="selection">
                             <filter domain="[('user_id','=',uid)]" help="My Tasks" icon="gtk-execute" default="1"/>
@@ -607,12 +607,40 @@
             </field>
        </record>
 
+        <record id="view_project_message_search" model="ir.ui.view">
+           <field name="name">project.message.search</field>
+           <field name="model">project.message</field>
+           <field name="type">search</field>
+           <field name="arch" type="xml">
+               <search string="Messages">
+                   <group col="20" colspan="4">
+                       <filter domain="[('date','&gt;=',time.strftime('%%Y-%%m-01'))]" icon="terp-project" string="This Month" />
+                       <filter domain="[('date', '=', time.strftime('%%Y-%%m-%%d'))]" icon="terp-project" string="Today" />
+                          
+                          <separator orientation="vertical"/>
+                          <field name="subject"/>
+                          <field name="project_id" select="1" widget="selection"/>
+                          <field name="user_id" select="1" widget="selection">
+                              <filter domain="[('user_id','=',uid)]" help="My Message" icon="gtk-execute" default="1"/>
+                          </field>
+                   </group>
+                   <newline/>
+                   <group expand="1" string="Group By..." colspan="4" col="20">                    
+                       <filter string="Project" icon="terp-project" domain="[]" context="{'group_by':'project_id'}"/>
+                       <filter string="User" icon="terp-project" domain="[]" context="{'group_by':'user_id'}"/>
+                       <filter string="Date" icon="terp-project" domain="[]" context="{'group_by':'date'}"/>
+                   </group>
+               </search>
+           </field>
+        </record>
+
         <record id="action_view_project_messages_tree" model="ir.actions.act_window">
             <field name="name">Messages</field>
             <field name="res_model">project.message</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_project_message_tree"/>
+            <field name="search_view_id" ref="view_project_message_search"/>
        </record>
 
         <!--<menuitem id="menu_message_main" name="Message" parent="base.menu_main_pm"/>-->