[IMP] Project & project_gtd: Usebility changes

bzr revid: mra@mra-laptop-20100813050755-jdh1ggmf70ut7z3h

diff --git a/addons/project/project.py b/addons/project/project.py
index f978583..a70e72c 100644 (file)
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -283,7 +283,7 @@ class project(osv.osv):
             res_id = result[0]
             form_view_id = data_obj._get_id(cr, uid, 'project', 'edit_project')
             form_view = data_obj.read(cr, uid, form_view_id, ['res_id'])
-            tree_view_id = data_obj._get_id(cr, uid, 'project', 'view_project_list')
+            tree_view_id = data_obj._get_id(cr, uid, 'project', 'view_project')
             tree_view = data_obj.read(cr, uid, tree_view_id, ['res_id'])
             search_view_id = data_obj._get_id(cr, uid, 'project', 'view_project_project_filter')
             search_view = data_obj.read(cr, uid, search_view_id, ['res_id'])

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 82b8871..8505bc2 100644 (file)
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -62,7 +62,7 @@
                         </page>
                         <page groups="base.group_extended" string="Partner Info">
                             <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1"/>
-                            <field domain="[('partner_id','=',partner_id)]" name="contact_id"/>
+                            <field domain="[('partner_id','=',partner_id)]" name="contact_id" string="Contact Address"/>
                             <field name="warn_customer"/>
                             <newline/>
                             <separator colspan="2" string="Mail Header"/>
@@ -91,24 +91,6 @@
             </field>
         </record>
 
-        <record id="view_project_list" model="ir.ui.view">
-            <field name="name">project.project.list</field>
-            <field name="model">project.project</field>
-            <field name="type">tree</field>
-            <field name="priority" eval="5"/>
-            <field name="arch" type="xml">
-                <tree colors="blue:state in ('pending');black:state in ('open','template','close');gray:state in ('cancelled') " string="Projects">
-                    <field name="complete_name" string="Project Name"/>
-                    <field name="user_id" string="Project Manager"/>
-                    <field name="partner_id" string="Partner"/>
-                    <field name="parent_id" invisible="1"/>
-                    <field name="effective_hours" widget="float_time"/>
-                    <field name="total_hours" widget="float_time"/>
-                    <field name="state"/>
-                </tree>
-            </field>
-        </record>
-
        <record id="view_project_project_filter" model="ir.ui.view">
             <field name="name">project.project.select</field>
             <field name="model">project.project</field>
@@ -119,7 +101,7 @@
                        <filter icon="terp-check" string="Current" name="Current" domain="[('state', 'in',('open','pending'))]" help="Open and Pending Projects" default="1"/>
                        <separator orientation="vertical"/>
                        <filter icon="terp-personal" string="Manager" name="Manager" domain="[('user_id', '=', uid)]" help="Projects in which I am a manager."/>
-                       <filter icon="terp-personal-" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member." default="1"/>
+                       <filter icon="terp-personal+" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member." default="1"/>
                        <separator orientation="vertical"/>
                        <field name="name" string="Project Name"/>
                        <field name="user_id" string="Project Manager" default="1"/>
@@ -127,9 +109,10 @@
                    </group>
                    <newline />
                     <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
-                       <filter string="Parent" name="Parent"  icon="terp-personal" domain = "[]" context="{'group_by':'parent_id'}"/>
-                        <filter string="Users" name="Users"  icon="terp-personal" domain = "[]" context="{'group_by':'user_id'}"/>
+                        <filter string="User" name="Users"  icon="terp-personal" domain = "[]" context="{'group_by':'user_id'}"/>
                         <filter string="Partner" name="Partner"  icon="terp-personal" domain = "[]" context="{'group_by':'partner_id'}"/>
+                         <separator orientation="vertical"/>
+                        <filter string="Parent" name="Parent"  icon="terp-folder-blue" domain = "[]" context="{'group_by':'parent_id'}"/>
                     </group>
                </search>
             </field>
@@ -418,6 +401,7 @@
                         <filter string="Current" domain="[('state','in',('open','draft'))]"  name="current" help="Draft, Open and Pending Tasks" icon="terp-check" default="1"/>
                         <filter string="In Progress" domain="[('state','=','open')]" help="Open Tasks" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
+                        <separator orientation="vertical"/>
                                                <filter name="edit"  
                                string="Edit" context="{'set_editable':True,'seq_visible': True}"
                                icon="gtk-execute"
@@ -427,22 +411,24 @@
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
                         <field name="project_id" select="1">
-                             <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-blue"/>
+                             <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/>
                         </field>
                         <field name="user_id" select="1">
-                            <filter domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="gtk-execute" separator="1"/>
+                            <filter domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal" separator="1"/>
                         </field>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="20">
                         <filter string="Users" name="group_user_id" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="Project" name="group_project_id" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="Stage" name="group_stage_id" icon="terp-stage" domain="[]" context="{'group_by':'type_id'}"/>
                         <filter string="State" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
+                        <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}"/>
+                        <filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_end'}"/>
                         <filter string="Deadline" icon="terp-gnome-cpu-frequency-applet+" domain="[]" context="{'group_by':'date_deadline'}"/>
-                        <filter string="Start Date" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'date_start'}"/>
-                        <filter string="End Date" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'date_end'}"/>
                     </group>
                 </search>
             </field>

diff --git a/addons/project_gtd/project_gtd_demo.xml b/addons/project_gtd/project_gtd_demo.xml
index 0f2a4d0..a2d3cf6 100644 (file)
--- a/addons/project_gtd/project_gtd_demo.xml
+++ b/addons/project_gtd/project_gtd_demo.xml
@@ -21,15 +21,15 @@
 
     <record model="project.gtd.timebox" id="timebox_daily">
         <field name="name">Today</field>
-        <field name="icon">terp-hr</field>
+        <field name="icon">terp-go-today</field>
     </record>
     <record model="project.gtd.timebox" id="timebox_weekly">
         <field name="name">This Week</field>
-        <field name="icon">terp-partner</field>
+        <field name="icon">terp-go-week</field>
     </record>
     <record model="project.gtd.timebox" id="timebox_monthly">
         <field name="name">This Month</field>
-        <field name="icon">terp-product</field>
+        <field name="icon">terp-go-month</field>
     </record>
     <record model="project.gtd.timebox" id="timebox_lt">
         <field name="name">Long Term</field>