summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJigar Amin - OpenERP <jam@tinyerp.com>2012-06-06 11:11:12 +0530
committerJigar Amin - OpenERP <jam@tinyerp.com>2012-06-06 11:11:12 +0530
commitbc840ae2dd3fc25d15f91bb785fc99b13a4cfc6a (patch)
tree3e47b034663be2e2f3a486a5d3a01a01c9747c52
parent65e82ed51ad8326de83d26e99406b56256079a33 (diff)
parentb2a3c8e30cb36ca8b92868bfe08fdd285d6d5415 (diff)
[MERGE] lp:~openerp-dev/openobject-addons/trunk-review-dashboards-project-tpa
bzr revid: jam@tinyerp.com-20120606054112-sf53t600c2p7cdh2
-rw-r--r--addons/project/__openerp__.py1
-rw-r--r--addons/project/board_project_manager_view.xml24
-rw-r--r--addons/project/board_project_view.xml94
-rw-r--r--addons/project/report/project_report_view.xml113
-rw-r--r--addons/project_issue/board_project_issue_view.xml116
-rw-r--r--addons/project_planning/board_project_planning_view.xml74
-rw-r--r--addons/project_planning/project_planning_view.xml77
-rw-r--r--addons/project_scrum/__openerp__.py1
-rw-r--r--addons/project_scrum/board_project_scrum_view.xml134
9 files changed, 118 insertions, 516 deletions
diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index 2c53fc2a28a..2c38b2e56c1 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -54,7 +54,6 @@ Dashboard for project members that includes:
"res_partner_view.xml",
"report/project_report_view.xml",
"board_project_view.xml",
- 'board_project_manager_view.xml',
'report/project_cumulative.xml',
'res_config_view.xml',
],
diff --git a/addons/project/board_project_manager_view.xml b/addons/project/board_project_manager_view.xml
deleted file mode 100644
index d9340eefb3a..00000000000
--- a/addons/project/board_project_manager_view.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
- <data>
-
- <!-- Board for project managers -->
-
- <act_window
- id="act_my_project"
- name="My projects"
- res_model="project.project"
- domain="&quot;[('user_id', '=', uid)]&quot;"
- view_mode="tree,form"
- view_type="form"/>
-
- <act_window
- id="act_my_account"
- name="My accounts to invoice"
- res_model="account.analytic.account"
- domain="&quot;[('user_id','=',uid),('state','&lt;&gt;','close')]&quot;"
- view_mode="tree,form"
- view_type="form"/>
-
- </data>
-</openerp>
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index a4b302f33f2..6b95ad81621 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -2,7 +2,41 @@
<openerp>
<data>
- <!-- My task -->
+ <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,50 +57,12 @@
</field>
</record>
- <record id="view_delegated_task_tree" model="ir.ui.view">
- <field name="name">project.task.delegated.tree</field>
- <field name="model">project.task</field>
- <field name="type">tree</field>
- <field eval="99" name="priority"/>
- <field name="arch" type="xml">
- <tree colors="red:date_deadline&lt;current_date" string="My Delegated Tasks">
- <field name="name"/>
- <field name="project_id"/>
- <field name="delegated_user_id"/>
- <field name="date_deadline"/>
- <field name="total_hours" widget="float_time"/>
- <field name="progress" widget="progressbar"/>
- <field name="stage_id" invisible="context.get('set_visible',False)"/>
- <field name="state" invisible="context.get('set_visible',False)" groups="base.group_no_one"/>
- </tree>
- </field>
- </record>
-
-
<record id="my_open_tasks_action" model="ir.actions.act_window">
- <field name="name">My Open 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="view_id" ref="view_task_tree"/>
- </record>
-
- <record id="action_view_delegate_task_tree" model="ir.actions.act_window">
- <field name="name">My Delegated 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">[('parent_ids.user_id','=',uid),('state', 'in', ('draft','open','pending'))]</field>
- <field name="view_id" ref="view_delegated_task_tree"/>
- </record>
-
- <record id="action_view_task_tree_deadline" model="ir.actions.act_window">
- <field name="name">My Task's Deadlines</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'),('date_deadline','&lt;&gt;',False)]</field>
+ <field name="domain">[('user_id','=',uid),('state','not in',('cancel','done'))]</field>
<field name="view_id" ref="view_task_tree"/>
</record>
@@ -78,11 +74,10 @@
<form string="My Board" layout="manual">
<board style="2-1">
<column>
- <action name="%(my_open_tasks_action)d" string="My Open Tasks" creatable="true"/>
- <action name="%(action_view_delegate_task_tree)d" string="My Delegated Tasks"/>
+ <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>
@@ -100,17 +95,10 @@
<menuitem
id="menu_project_dashboard"
- name="Project"
- sequence="20"
+ sequence="15"
parent="base.menu_reporting_dashboard"
- />
-
- <menuitem
action="open_board_project"
- icon="terp-graph"
- id="menu_board_project"
- parent="menu_project_dashboard"
- sequence="1"/>
+ />
</data>
</openerp>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 240176f7941..659e5bd0651 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -156,118 +156,5 @@
<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"/>
- <field name="view_mode">tree</field>
- <field name="view_id" ref="view_project_vs_remaining_hours_tree"/>
-
- <field name="act_window_id" ref="action_project_vs_remaining_hours_graph"/>
- </record>
- <record id="open_view_project_vs_remaining_hours_graph" model="ir.actions.act_window.view">
- <field eval="1" name="sequence"/>
- <field name="view_mode">graph</field>
- <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>
diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index b6e1f8a5d99..cedcd85d4fc 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -2,89 +2,7 @@
<openerp>
<data>
- <record id="action_view_current_project_issue_tree" model="ir.actions.act_window">
- <field name="name">Project issues</field>
- <field name="res_model">project.issue</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- <field name="domain">[('state','in',['draft','open'])]</field>
- <field name="view_id" ref="project_issue.project_issue_tree_view"/>
- </record>
-
- <record id="action_view_pending_project_issue_tree" model="ir.actions.act_window">
- <field name="name">Project issues</field>
- <field name="res_model">project.issue</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- <field name="domain">[('state','=','pending')]</field>
- <field name="view_id" ref="project_issue.project_issue_tree_view"/>
- </record>
-
- <record id="action_project_issue_graph_state" model="ir.actions.act_window">
- <field name="name">Project Issue</field>
- <field name="res_model">project.issue.report</field>
- <field name="view_type">form</field>
- <field name="view_mode">graph</field>
- <field name="domain">[]</field>
- <field name="view_id" ref="project_issue.view_project_issue_report_graph"/>
- </record>
-
- <record id="view_project_issue_graph_stage" model="ir.ui.view">
- <field name="name">project.issue.report.graph</field>
- <field name="model">project.issue.report</field>
- <field name="type">graph</field>
- <field name="arch" type="xml">
- <graph orientation="vertical" string="Project Issue" type="bar">
- <field name="stage_id"/>
- <field name="nbr" operator="+"/>
- <field group="True" name="user_id"/>
- </graph>
- </field>
- </record>
-
- <record id="action_project_issue_graph_stage" model="ir.actions.act_window">
- <field name="name">Project Issue</field>
- <field name="res_model">project.issue.report</field>
- <field name="view_type">form</field>
- <field name="view_mode">graph</field>
- <field name="domain">[]</field>
- <field name="view_id" ref="view_project_issue_graph_stage"/>
- </record>
-
- <record id="board_project_issue_form" model="ir.ui.view">
- <field name="name">board.project.issue.form</field>
- <field name="model">board.board</field>
- <field name="type">form</field>
- <field name="arch" type="xml">
- <form string="Issues Dashboard" layout="manual">
- <board style="2-1">
- <column>
- <action name="%(action_view_current_project_issue_tree)d" string="Current Issues"/>
- <action name="%(action_view_pending_project_issue_tree)d" string="Pending Issues"/>
- </column>
- <column>
- <action name="%(action_project_issue_graph_state)d" string="Issues By State" />
- <action name="%(action_project_issue_graph_stage)d" string="Issues By Stage" />
- </column>
- </board>
- </form>
- </field>
- </record>
-
- <record id="open_board_project_issue" model="ir.actions.act_window">
- <field name="name">Project Issue Dashboard</field>
- <field name="res_model">board.board</field>
- <field name="view_type">form</field>
- <field name="view_mode">form</field>
- <field name="usage">menu</field>
- <field name="view_id" ref="board_project_issue_form"/>
- </record>
- <menuitem id="menu_dashboard_project_issue" name="Project Issue Dashboard" parent="project.menu_project_dashboard"
- icon="terp-graph"
- action="open_board_project_issue"/>
-
- <!-- For Project Dashboard -->
- <record model="ir.ui.view" id="project_issue_board_tree_view">
+ <record model="ir.ui.view" id="project_issue_board_tree_view">
<field name="name">Project Issue Board Tree</field>
<field name="model">project.issue</field>
<field name="type">tree</field>
@@ -105,6 +23,7 @@
</tree>
</field>
</record>
+
<record id="action_view_my_project_issue_tree" model="ir.actions.act_window">
<field name="name">My Project Issues</field>
<field name="res_model">project.issue</field>
@@ -113,40 +32,17 @@
<field name="domain">[('state','not in',('cancel','done')),('user_id','=',uid)]</field>
<field name="view_id" ref="project_issue_board_tree_view"/>
</record>
- <record id="view_my_open_project_issue_graph" model="ir.ui.view">
- <field name="name">my.open.project.issue.graph</field>
- <field name="model">project.issue.report</field>
- <field name="type">graph</field>
- <field name="arch" type="xml">
- <graph orientation="vertical" string="My Open Project Issue" type="bar">
- <field name="creation_date"/>
- <field name="nbr" operator="+"/>
- </graph>
- </field>
- </record>
- <record id="action_view_my_open_project_issue_tree" model="ir.actions.act_window">
- <field name="name">My Open Project issues</field>
- <field name="res_model">project.issue.report</field>
- <field name="view_type">form</field>
- <field name="view_mode">graph,tree,form,</field>
- <field name="domain">[('state','=','open'),('user_id','=',uid)]</field>
- <field name="context">{'default_user_id': uid}</field>
- <field name="view_id" ref="view_my_open_project_issue_graph"/>
- </record>
- <record id="board_my_project_issue_form" model="ir.ui.view">
+
+ <record id="board_my_project_issue_form" model="ir.ui.view">
<field name="name">board.my.project.issue.form.inherit</field>
<field name="model">board.board</field>
<field name="type">form</field>
<field name="inherit_id" ref="project.board_project_form"/>
<field name="arch" type="xml">
- <xpath expr="/form/board/column/action[@string='My Delegated Tasks']" position="after">
- <action name="%(action_view_my_project_issue_tree)d" string="My Issues" creatable="true"/>
- </xpath>
- <xpath expr="/form/board/column/action[@string='My Remaining Hours by Project']" position="after">
- <action name="%(action_view_my_open_project_issue_tree)d" string="My Open Issues by Creation Date"/>
+ <xpath expr="/form/board/column/action[@string='My Tasks']" position="after">
+ <action name="%(action_view_my_project_issue_tree)d" string="My Issues"/>
</xpath>
</field>
</record>
-
</data>
</openerp>
diff --git a/addons/project_planning/board_project_planning_view.xml b/addons/project_planning/board_project_planning_view.xml
index db29a7f067a..3b71e62298b 100644
--- a/addons/project_planning/board_project_planning_view.xml
+++ b/addons/project_planning/board_project_planning_view.xml
@@ -2,15 +2,83 @@
<openerp>
<data>
+ <record id="account_analytic_planning_stat_view_form" model="ir.ui.view">
+ <field name="name">report.account.analytic.planning.stat.form</field>
+ <field name="model">report_account_analytic.planning.stat</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <form string="Planning statistics">
+ <field name="planning_id" select="1" />
+ <field name="user_id" select="1" />
+ <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
+ </form>
+ </field>
+ </record>
+
+ <record id="account_analytic_planning_stat_view_tree" model="ir.ui.view">
+ <field name="name">report.account.analytic.planning.stat.tree</field>
+ <field name="model">report_account_analytic.planning.stat</field>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <tree string="Planning statistics">
+ <field name="planning_id" />
+ <field name="user_id" />
+ <field name="manager_id" />
+ <field name="account_id" groups="analytic.group_analytic_accounting"/>
+ <field name="sum_amount" />
+ <field name="sum_amount_real" />
+ <field name="sum_amount_tasks" />
+ </tree>
+ </field>
+ </record>
+
+ <record id="account_analytic_planning_stat_view_graph" model="ir.ui.view">
+ <field name="name">report.account.analytic.planning.stat.graph</field>
+ <field name="model">report_account_analytic.planning.stat</field>
+ <field name="type">graph</field>
+ <field name="arch" type="xml">
+ <graph string="Planning statistics" type="line">
+ <field name="account_id" groups="analytic.group_analytic_accounting"/>
+ <field name="sum_amount" operator="+" />
+ <field name="sum_amount_real" operator="+" />
+ <field name="sum_amount_tasks" operator="+" />
+ </graph>
+ </field>
+ </record>
+
+ <record id="account_analytic_planning_stat_view_search" model="ir.ui.view">
+ <field name="name">report_account_analytic.planning.stat.search</field>
+ <field name="model">report_account_analytic.planning.stat</field>
+ <field name="type">search</field>
+ <field name="arch" type="xml">
+ <search string="Planning statistics">
+ <group>
+ <field name="planning_id"/>
+ <field name="user_id"/>
+ <field name="account_id" groups="analytic.group_analytic_accounting"/>
+ </group>
+ </search>
+ </field>
+ </record>
+
+
+ <record id="action_account_analytic_planning_stat_form" model="ir.actions.act_window">
+ <field name="name">Planning Statistics</field>
+ <field name="res_model">report_account_analytic.planning.stat</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">graph,tree</field>
+ <field name="search_view_id" ref="account_analytic_planning_stat_view_search"/>
+ </record>
+
<record id="board_project_planning_form" model="ir.ui.view">
<field name="name">board.project.planning.form</field>
<field name="model">board.board</field>
<field name="inherit_id" ref="project.board_project_form"/>
<field name="type">form</field>
<field name="arch" type="xml">
- <xpath expr="/form/board/column/action[@string='My Open Tasks']" position="after">
- <action name="%(project_planning.action_account_analytic_planning_stat_form)d" string="My Project's planning" domain="[('manager_id','=',uid),('planning_id.state','&lt;&gt;','cancel')]"/>
- </xpath>
+ <xpath expr="/form/board/column/action[@string='My Remaining Hours by Project']" position="after">
+ <action name="%(action_account_analytic_planning_stat_form)d" string="Planning Statistics"/>
+ </xpath>
</field>
</record>
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index fd65ae61b88..dc5ed8cbe17 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -217,83 +217,6 @@
<menuitem action="action_account_analytic_planning_form"
id="menu_report_account_analytic_planning" parent="base.menu_project_long_term" sequence="3" groups="project.group_project_user,project.group_project_manager"/>
- <!--
- Planning statistics
- -->
- <record id="account_analytic_planning_stat_view_form" model="ir.ui.view">
- <field name="name">report.account.analytic.planning.stat.form</field>
- <field name="model">report_account_analytic.planning.stat</field>
- <field name="type">form</field>
- <field name="arch" type="xml">
- <form string="Planning statistics">
- <field name="planning_id" select="1" />
- <field name="user_id" select="1" />
- <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
- </form>
- </field>
- </record>
-
-
- <record id="account_analytic_planning_stat_view_tree" model="ir.ui.view">
- <field name="name">report.account.analytic.planning.stat.tree</field>
- <field name="model">report_account_analytic.planning.stat</field>
- <field name="type">tree</field>
- <field name="arch" type="xml">
- <tree string="Planning statistics">
- <field name="planning_id" />
- <field name="user_id" />
- <field name="manager_id" />
- <field name="account_id" groups="analytic.group_analytic_accounting"/>
- <field name="sum_amount" />
- <field name="sum_amount_real" />
- <field name="sum_amount_tasks" />
- </tree>
- </field>
- </record>
-
- <record id="account_analytic_planning_stat_view_graph" model="ir.ui.view">
- <field name="name">report.account.analytic.planning.stat.graph</field>
- <field name="model">report_account_analytic.planning.stat</field>
- <field name="type">graph</field>
- <field name="arch" type="xml">
- <graph string="Planning statistics" type="bar">
- <field name="account_id" groups="analytic.group_analytic_accounting"/>
- <field name="sum_amount" operator="+" />
- <field name="sum_amount_real" operator="+" />
- <field name="sum_amount_tasks" operator="+" />
- </graph>
- </field>
- </record>
-
- <record id="account_analytic_planning_stat_view_search" model="ir.ui.view">
- <field name="name">report_account_analytic.planning.stat.search</field>
- <field name="model">report_account_analytic.planning.stat</field>
- <field name="type">search</field>
- <field name="arch" type="xml">
- <search string="Planning statistics">
- <group>
- <field name="planning_id"/>
- <field name="user_id"/>
- <field name="account_id" groups="analytic.group_analytic_accounting"/>
- </group>
- </search>
- </field>
- </record>
-
-
- <record id="action_account_analytic_planning_stat_form" model="ir.actions.act_window">
- <field name="name">Planning Statistics</field>
- <field name="res_model">report_account_analytic.planning.stat</field>
- <field name="view_type">form</field>
- <field name="view_mode">graph,tree</field>
- <!-- <field name="context">{"search_default_user_id":uid}</field> -->
- <field name="search_view_id" ref="account_analytic_planning_stat_view_search"/>
- </record>
-
- <menuitem action="action_account_analytic_planning_stat_form"
- icon="terp-graph"
- id="menu_board_planning"
- parent="project.menu_project_dashboard"/>
<!-- Analytic account Form -->
diff --git a/addons/project_scrum/__openerp__.py b/addons/project_scrum/__openerp__.py
index 5e6b360b2fa..ca06be6cd75 100644
--- a/addons/project_scrum/__openerp__.py
+++ b/addons/project_scrum/__openerp__.py
@@ -61,7 +61,6 @@ More information on the methodology:
'project_scrum_view.xml',
'wizard/project_scrum_backlog_sprint_view.xml',
'process/project_scrum_process.xml',
- "board_project_scrum_view.xml",
],
'demo_xml': ['project_scrum_demo.xml'],
'test': ['test/backlog_process.yml',
diff --git a/addons/project_scrum/board_project_scrum_view.xml b/addons/project_scrum/board_project_scrum_view.xml
deleted file mode 100644
index 08e3fd1bb25..00000000000
--- a/addons/project_scrum/board_project_scrum_view.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
- <data>
- <record id="view_scrum_sprint_dashboard_tree" model="ir.ui.view">
- <field name="name">project.scrum.sprint.dashboard.tree</field>
- <field name="model">project.scrum.sprint</field>
- <field name="type">tree</field>
- <field name="arch" type="xml">
- <tree string="Sprints">
- <field name="name"/>
- <field name="project_id"/>
- <field name="scrum_master_id"/>
- <field name="product_owner_id" invisible="1"/>
- <field name="date_start"/>
- <field name="progress" widget="progressbar"/>
- <field name="effective_hours" sum="Effective hours" widget="float_time"/>
- <field name="expected_hours" sum="Expected hours" widget="float_time"/>
- <field name="state"/>
- </tree>
- </field>
- </record>
- <record id="view_task_progress_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="sprint_id"/>
- <field name="effective_hours" operator="+"/>
- <field name="planned_hours" operator="+"/>
- </graph>
- </field>
- </record>
- <record id="action_view_task_progress_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>
- <field name="view_id" ref="view_task_progress_graph"/>
- </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">Sprints</field>
- <field name="res_model">project.scrum.sprint</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- <field name="view_id" ref="view_scrum_sprint_dashboard_tree"/>
- </record>
- <record id="board_project_scrum_form" model="ir.ui.view">
- <field name="name">board.project.form</field>
- <field name="model">board.board</field>
- <field name="type">form</field>
- <field name="arch" type="xml">
- <form string="My Board" layout="manual">
- <board style="2-1">
- <column>
- <action name="%(action_sprint_all_dashboard_tree)d" string="Sprints"/>
- </column>
- <column>
- <action name="%(action_view_task_progress_graph)d" string="Task Progress"/>
- <action name="%(action_view_backlog_progress_graph)d" string="Backlog Progress"/>
- </column>
- </board>
- </form>
- </field>
- </record>
- <record id="open_board_project_scrum" model="ir.actions.act_window">
- <field name="name">Scrum Dashboard</field>
- <field name="res_model">board.board</field>
- <field name="view_type">form</field>
- <field name="view_mode">form</field>
- <field name="usage">menu</field>
- <field name="view_id" ref="board_project_scrum_form"/>
- </record>
- <menuitem
- id="menu_deshboard_scurm"
- name="Scrum Dashboard" parent="project.menu_project_dashboard"
- icon="terp-graph"
- action="open_board_project_scrum"/>
-
- <!-- For Project Dashboard -->
- <record id="view_scrum_sprint_project_dashboard_tree" model="ir.ui.view">
- <field name="name">project.scrum.sprint.project.dashboard.tree</field>
- <field name="model">project.scrum.sprint</field>
- <field name="type">tree</field>
- <field name="arch" type="xml">
- <tree string="Scrum Sprint">
- <field name="name"/>
- <field name="date_start"/>
- <field name="progress" widget="progressbar"/>
- <field name="effective_hours" widget="float_time"/>
- <field name="expected_hours" widget="float_time"/>
- </tree>
- </field>
- </record>
- <record id="action_view_my_scrum_sprint_tree" model="ir.actions.act_window">
- <field name="name">My Sprint</field>
- <field name="res_model">project.scrum.sprint</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- <field name="domain">['|',('product_owner_id','=',uid),('scrum_master_id','=',uid)]</field>
- <field name="view_id" ref="view_scrum_sprint_project_dashboard_tree"/>
- </record>
- <record id="board_my_scrum_sprint_form" model="ir.ui.view">
- <field name="name">board.my.scrum.sprint.form.inherit</field>
- <field name="model">board.board</field>
- <field name="type">form</field>
- <field name="inherit_id" ref="project.board_project_form"/>
- <field name="arch" type="xml">
- <xpath expr="/form/board/column/action[@string='My Delegated Tasks']" position="after">
- <action name="%(action_view_my_scrum_sprint_tree)d" string="My Sprint"/>
- </xpath>
- </field>
- </record>
- </data>
-</openerp>