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 b82367b..bab890a 100644 (file)
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -25,7 +25,6 @@
                         <page string="Administration">
                             <group col="2" colspan="2">
                                 <separator colspan="2" string="Scheduling"/>
-                                <field name="resource_calendar_id"/>
                                 <field name="priority"/>
                                 <field name="active" select="2"/>
                             </group>
@@ -247,7 +246,7 @@
                                 name="planned_hours"
                                 widget="float_time"
                                 attrs="{'readonly':[('state','!=','draft')]}"
-                                on_change="onchange_planned(project_id,user_id,planned_hours,effective_hours,date_start,occupation_rate)"/>
+                                on_change="onchange_planned(planned_hours, effective_hours)"/>
                                 <field name="remaining_hours" select="2" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" colspan="2"/>
                                 <button name="%(action_config_compute_remaining)d" string="Review" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit"/>
                             </group>
@@ -304,7 +303,6 @@
                                 <separator string="Dates" colspan="2"/>
                                 <field name="date_start"/>
                                 <field name="date_end"/>
-                                <field name="occupation_rate"/>
                             </group>
                             <separator string="Miscelleanous" colspan="4"/>
                             <field name="partner_id" select="2"/>
@@ -331,7 +329,7 @@
                 <tree colors="grey:state in ('cancelled','done');blue:remaining_hours&lt;0;red:bool(date_deadline) and (date_deadline&lt;current_date) and (state in ('draft','open'));black:state not in ('cancelled','done')" string="Tasks">
                     <field name="sequence" invisible="1"/>
                     <field name="name"/>
-                    <field name="planned_hours" widget="float_time" on_change="onchange_planned(planned_hours)" invisible="not context.get('set_visible',False)"/>
+                    <field name="planned_hours" widget="float_time" on_change="onchange_planned(planned_hours, effective_hours)" invisible="not context.get('set_visible',False)"/>
                     <field name="project_id" icon="gtk-indent" domain="['|',('user_id','=',uid),('members','=',uid)]"/>
                     <field name="user_id"/>
                     <field name="delegated_user_id" invisible="context.get('show_delegated', True)"/>
@@ -412,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"/>
@@ -608,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"/>-->