[ADD] project_scrum : added charts on Scrum Dashboard

[REM/FIX] project_planning,project : removed my button from planning statistics and change domin on projects button

bzr revid: jas@tinyerp.com-20101005130802-fcs0m27g8l9pk7o2

diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 9521d32..ea454ac 100644 (file)
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -91,7 +91,7 @@
                            <field name="project_id">
                                <filter icon="terp-folder-blue"
                                                string="My Projects"
-                                               help="My Projects" domain="[('project_id','=',uid)]"/>
+                                               help="My Projects" domain="[('project_id.user_id','=',uid)]"/>
                           </field>
 
                           <field name="user_id" widget="selection">

diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index 9363413..ff8e42e 100644 (file)
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -277,8 +277,6 @@
             <field name="arch" type="xml">
                 <search string="Planning statistics">
                     <group col="10" colspan="4">
-                        <filter icon="gtk-execute" string="My" domain="[('user_id','=',uid),('planning_id.state','&lt;&gt;','cancel')]" help="My Plannings Statistics"/>
-                        <separator orientation="vertical"/>
                         <field name="planning_id" select="1"/>
                         <field name="user_id" select="1"/>
                         <field name="account_id" select="1" groups="base.group_extended"/>
@@ -300,6 +298,10 @@
             parent="hr.menu_hr_reporting" />
         <menuitem action="action_account_analytic_planning_stat_form"
             id="menu_report_account_analytic_planning_stat" parent="next_id_85" />
+            <menuitem  action="action_account_analytic_planning_stat_form"
+                       icon="terp-graph"
+                       id="menu_board_planning"
+                       parent="project.next_id_86"/>
 
 <!--        Analytic account Form -->
 

diff --git a/addons/project_scrum/board_project_scrum_view.xml b/addons/project_scrum/board_project_scrum_view.xml
index 8b22233..5859121 100644 (file)
--- a/addons/project_scrum/board_project_scrum_view.xml
+++ b/addons/project_scrum/board_project_scrum_view.xml
@@ -26,6 +26,43 @@
                </tree>
             </field>
         </record>
+        <record id="view_project_task_graph" model="ir.ui.view">
+            <field name="name">project.task.graph</field>
+            <field name="model">project.task</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Task Progress" type="bar">
+                    <field name="project_id"/>
+                    <field name="planned_hours" operator="+"/>
+                    <field name="delay_hours" operator="+"/>
+                </graph>
+            </field>
+        </record>
+        <record id="action_view_project_task_graph" model="ir.actions.act_window">
+            <field name="name">Task Progress</field>
+            <field name="res_model">project.task</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph</field>
+        </record>
+
+        <record id="view_backlog_progress_graph" model="ir.ui.view">
+            <field name="name">project.scrum.sprint.graph</field>
+            <field name="model">project.scrum.product.backlog</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Backlog Progress" type="bar">
+                    <field name="sprint_id"/>
+                    <field name="effective_hours" operator="+"/>
+                    <field name="expected_hours" operator="+"/>
+                </graph>
+            </field>
+        </record>
+        <record id="action_view_backlog_progress_graph" model="ir.actions.act_window">
+            <field name="name">Backlog Progress</field>
+            <field name="res_model">project.scrum.product.backlog</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph</field>
+        </record>
         <record id="action_sprint_all_dashboard_tree" model="ir.actions.act_window">
             <field name="name">Sprint's List</field>
             <field name="res_model">project.scrum.sprint</field>
@@ -41,8 +78,13 @@
                 <form string="My Board">
                     <hpaned>
                         <child1>
-                                                <action colspan="4" height="220" name="%(action_sprint_all_dashboard_tree)d" string="Sprints" width="510"/>
+                                                <action colspan="4" height="220" name="%(action_sprint_all_dashboard_tree)d" string="Sprints" width="510"/>
+                             <button name="%(project_scrum.report_scrum_sprint_burndown_chart)d" string="Burndown Chart" type="action" icon="gtk-print"/>
                         </child1>
+                        <child2>
+                             <action colspan="4" height="220" name="%(action_view_project_task_graph)d" string="Task Progess" width="510"/>
+                             <action colspan="4" height="220" name="%(action_view_backlog_progress_graph)d" string="Backlog Progess" width="510"/>
+                        </child2>
                     </hpaned>
                 </form>
             </field>

diff --git a/addons/project_scrum/project_scrum.py b/addons/project_scrum/project_scrum.py
index f472369..2a4ea18 100644 (file)
--- a/addons/project_scrum/project_scrum.py
+++ b/addons/project_scrum/project_scrum.py
@@ -237,6 +237,7 @@ class project_scrum_product_backlog(osv.osv):
         return True
 
     def button_postpone(self, cr, uid, ids, context=None):
+        raise osv.except_osv(_('Warning!'), _( "Are you sure to postpone Backlog ?"))
         if context is None:
             context = {}
         for product in self.browse(cr, uid, ids, context=context):