From 521a0e1a66ca3a8d4cbcbfd2a30d5c390d2204a1 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Tue, 5 Jun 2012 17:56:54 +0530
Subject: [PATCH] [IMP] project: improved code.

bzr revid: tpa@tinyerp.com-20120605122654-aqt55mabq4ej0fwz
---
 addons/project/board_project_view.xml         | 41 +++++++-
 addons/project/report/project_report_view.xml | 97 -------------------
 2 files changed, 38 insertions(+), 100 deletions(-)

diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index fdc93821303..6b95ad81621 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -2,6 +2,41 @@
 <openerp>
     <data>
 
+		<record id="view_project_vs_remaining_hours_tree" model="ir.ui.view">
+		    <field name="name">project.vs.remaining.hour.tree</field>
+		    <field name="model">project.vs.hours</field>
+		    <field name="type">tree</field>
+		    <field name="arch" type="xml">
+		        <tree string="Remaining Hours Per Project" colors="pink:state=='draft';blue:state=='pending';black:state=='open';red:state=='cancelled';grey:state=='close';yellow:state=='template'">
+		            <field name="project"/>
+		            <field name="remaining_hours"/>
+		            <field name="state"/>
+		        </tree>
+		    </field>
+		</record>
+
+		<record id="view_project_vs_remaining_hours_graph" model="ir.ui.view">
+		     <field name="name">project.vs.remaining.hour.graph</field>
+		     <field name="model">project.vs.hours</field>
+		     <field name="type">graph</field>
+		     <field name="arch" type="xml">
+		         <graph string="Project vs remaining hours" type="bar">
+		             <field name="project"/>
+		             <field name="state" group="True"/>
+		             <field name="remaining_hours" operator="+"/>
+		         </graph>
+		     </field>
+		</record>
+
+		<record id="action_project_vs_remaining_hours_graph" model="ir.actions.act_window">
+		    <field name="name">Remaining Hours Per Project</field>
+		    <field name="res_model">project.vs.hours</field>
+		    <field name="view_type">form</field>
+		    <field name="view_mode">graph,tree</field>
+		    <field name="domain">[('user_id','=',uid),('state','not in',('cancel','done'))]</field>
+		    <field name="view_id" ref="view_project_vs_remaining_hours_graph"/>
+		</record>
+
         <record id="view_task_tree" model="ir.ui.view">
             <field name="name">project.task.tree</field>
             <field name="model">project.task</field>
@@ -23,11 +58,11 @@
         </record>
 
         <record id="my_open_tasks_action" model="ir.actions.act_window">
-            <field name="name">My Open Tasks</field>
+            <field name="name">My Tasks</field>
             <field name="res_model">project.task</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('user_id','=',uid),('state','=','open')]</field>
+            <field name="domain">[('user_id','=',uid),('state','not in',('cancel','done'))]</field>
             <field name="view_id" ref="view_task_tree"/>
         </record>
 
@@ -42,7 +77,7 @@
                             <action name="%(my_open_tasks_action)d" string="My Tasks" creatable="true"/>
                         </column>
                         <column>
-                            <action name="%(project.action_project_vs_remaining_hours_graph)d" string="My Remaining Hours by Project"/>
+                            <action name="%(action_project_vs_remaining_hours_graph)d" string="My Remaining Hours by Project"/>
                         </column>
                     </board>
                 </form>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 240176f7941..56158252f3a 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -157,40 +157,6 @@
         <menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="project_report_task"/>
 
    <!-- Views and action for project dashboard -->
-   <record id="view_project_vs_remaining_hours_tree" model="ir.ui.view">
-        <field name="name">project.vs.remaining.hour.tree</field>
-        <field name="model">project.vs.hours</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Remaining Hours Per Project" colors="pink:state=='draft';blue:state=='pending';black:state=='open';red:state=='cancelled';grey:state=='close';yellow:state=='template'">
-                <field name="project"/>
-                <field name="remaining_hours"/>
-                <field name="state"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="view_project_vs_remaining_hours_graph" model="ir.ui.view">
-         <field name="name">project.vs.remaining.hour.graph</field>
-         <field name="model">project.vs.hours</field>
-         <field name="type">graph</field>
-         <field name="arch" type="xml">
-             <graph string="Project vs remaining hours" type="bar">
-                 <field name="project"/>
-                 <field name="state" group="True"/>
-                 <field name="remaining_hours" operator="+"/>
-             </graph>
-         </field>
-    </record>
-
-    <record id="action_project_vs_remaining_hours_graph" model="ir.actions.act_window">
-        <field name="name">Remaining Hours Per Project</field>
-        <field name="res_model">project.vs.hours</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">graph,tree</field>
-        <field name="domain">[('user_id','=',uid),('state','=','open')]</field>
-        <field name="view_id" ref="view_project_vs_remaining_hours_graph"/>
-    </record>
 
     <record id="open_view_project_vs_remaining_hours_tree" model="ir.actions.act_window.view">
             <field eval="2" name="sequence"/>
@@ -205,69 +171,6 @@
             <field name="view_id" ref="view_project_vs_remaining_hours_graph"/>
             <field name="act_window_id" ref="action_project_vs_remaining_hours_graph"/>
    </record>
-    <!-- Views and action for project issue dashboard -->
-    <record id="view_task_by_days_tree" model="ir.ui.view">
-        <field name="name">task.by.days.tree</field>
-        <field name="model">task.by.days</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Task By Days" >
-                <field name="day"/>
-                <field name="total_task"/>
-                <field name="state" groups="base.group_no_one"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="view_task_by_days_graph" model="ir.ui.view">
-         <field name="name">task.by.days.graph</field>
-         <field name="model">task.by.days</field>
-         <field name="type">graph</field>
-         <field name="arch" type="xml">
-             <graph string="Task By Days" type="bar">
-                 <field name="day"/>
-                 <field name="state" group="True"/>
-                 <field name="project_id" group="True"/>
-                 <field name="total_task" operator="+"/>
-             </graph>
-         </field>
-    </record>
-
-    <record id="action_task_by_days_graph" model="ir.actions.act_window">
-        <field name="name">Task By Days</field>
-        <field name="res_model">task.by.days</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">graph,tree</field>
-        <field name="domain">[('day','&lt;=',time.strftime('%Y-%m-%d')),('day','&gt;=', time.strftime('%Y-%m-%d', time.localtime(time.time()-(15*24*3600))))]</field>
-        <field name="view_id" ref="view_task_by_days_graph"/>
-    </record>
-
-    <!-- Views and action for project  dashboard -->
-   <record id="view_project_vs_planned_total_hours_tree" model="ir.ui.view">
-        <field name="name">project.vs.planned.total.hour.tree</field>
-        <field name="model">project.vs.hours</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Project vs Planned and Total Hours" colors="pink:state=='draft';blue:state=='pending';black:state=='open';red:state=='cancelled';grey:state=='close';yellow:state=='template'">
-                <field name="project"/>
-                <field name="planned_hours"/>
-                <field name="total_hours"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="view_project_vs_planned_total_hours_graph" model="ir.ui.view">
-         <field name="name">project.vs.planned.total.hour.graph</field>
-         <field name="model">project.vs.hours</field>
-         <field name="type">graph</field>
-         <field name="arch" type="xml">
-             <graph string="Project vs Planned and Total Hours" type="bar">
-                 <field name="project"/>
-                 <field name="planned_hours" operator="+"/>
-                 <field name="total_hours" operator="+"/>
-             </graph>
-         </field>
-    </record>
 
     </data>
 </openerp>