Turkesh Patel (openERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-review-dashboards-project-tpa into
lp:~openerp-dev/openobject-addons/trunk-review-dashboards.
Requested reviews:
Jigar Amin (OpenERP) (jam-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-review-dashboards-project-tpa/+merge/108714
improved view of project dashboard and remove unnecessary code from following
modules
-project
-project_issue
-project_planning
-project_scrum
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-review-dashboards-project-tpa/+merge/108714
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-review-dashboards.
=== modified file 'project/__openerp__.py'
--- project/__openerp__.py 2012-05-29 14:06:18 +0000
+++ project/__openerp__.py 2012-06-05 10:22:19 +0000
@@ -54,7 +54,6 @@
"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',
],
=== removed file 'project/board_project_manager_view.xml'
--- project/board_project_manager_view.xml 2011-12-19 16:54:40 +0000
+++ project/board_project_manager_view.xml 1970-01-01 00:00:00 +0000
@@ -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=""[('user_id', '=', uid)]""
- view_mode="tree,form"
- view_type="form"/>
-
- <act_window
- id="act_my_account"
- name="My accounts to invoice"
- res_model="account.analytic.account"
- domain=""[('user_id','=',uid),('state','<>','close')]""
- view_mode="tree,form"
- view_type="form"/>
-
- </data>
-</openerp>
=== modified file 'project/board_project_view.xml'
--- project/board_project_view.xml 2012-06-01 11:38:16 +0000
+++ project/board_project_view.xml 2012-06-05 10:22:19 +0000
@@ -2,7 +2,6 @@
<openerp>
<data>
- <!-- My task -->
<record id="view_task_tree" model="ir.ui.view">
<field name="name">project.task.tree</field>
<field name="model">project.task</field>
@@ -23,26 +22,6 @@
</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<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>
@@ -52,24 +31,6 @@
<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="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','<>',False)]</field>
- <field name="view_id" ref="view_task_tree"/>
- </record>
-
<record id="board_project_form" model="ir.ui.view">
<field name="name">board.project.form</field>
<field name="model">board.board</field>
@@ -78,8 +39,7 @@
<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"/>
@@ -100,17 +60,10 @@
<menuitem
id="menu_project_dashboard"
- name="Project"
- sequence="20"
+ sequence="15"
parent="base.menu_reporting_dashboard"
+ action="open_board_project"
/>
- <menuitem
- action="open_board_project"
- icon="terp-graph"
- id="menu_board_project"
- parent="menu_project_dashboard"
- sequence="1"/>
-
</data>
</openerp>
=== modified file 'project_issue/board_project_issue_view.xml'
--- project_issue/board_project_issue_view.xml 2012-06-01 11:38:16 +0000
+++ project_issue/board_project_issue_view.xml 2012-06-05 10:22:19 +0000
@@ -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,7 +32,8 @@
<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">
+
+ <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>
@@ -124,6 +44,7 @@
</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>
@@ -133,20 +54,17 @@
<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>
=== modified file 'project_planning/board_project_planning_view.xml'
--- project_planning/board_project_planning_view.xml 2011-11-15 07:24:20 +0000
+++ project_planning/board_project_planning_view.xml 2012-06-05 10:22:19 +0000
@@ -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="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="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','<>','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>
=== modified file 'project_planning/project_planning_view.xml'
--- project_planning/project_planning_view.xml 2012-06-04 12:11:39 +0000
+++ project_planning/project_planning_view.xml 2012-06-05 10:22:19 +0000
@@ -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 -->
=== modified file 'project_scrum/__openerp__.py'
--- project_scrum/__openerp__.py 2012-05-18 05:26:05 +0000
+++ project_scrum/__openerp__.py 2012-06-05 10:22:19 +0000
@@ -61,7 +61,6 @@
'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',
=== removed file 'project_scrum/board_project_scrum_view.xml'
--- project_scrum/board_project_scrum_view.xml 2012-05-23 11:00:47 +0000
+++ project_scrum/board_project_scrum_view.xml 1970-01-01 00:00:00 +0000
@@ -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>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
