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 @@ - - - - - - - - - - - - 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 @@ - + + project.vs.remaining.hour.tree + project.vs.hours + tree + + + + + + + + + + + project.vs.remaining.hour.graph + project.vs.hours + graph + + + + + + + + + + + Remaining Hours Per Project + project.vs.hours + form + graph,tree + [('user_id','=',uid),('state','not in',('cancel','done'))] + + + project.task.tree project.task @@ -23,50 +57,12 @@ - - project.task.delegated.tree - project.task - tree - - - - - - - - - - - - - - - - - My Open Tasks + My Tasks project.task form tree,form - [('user_id','=',uid),('state','=','open')] - - - - - My Delegated Tasks - project.task - form - tree,form - [('parent_ids.user_id','=',uid),('state', 'in', ('draft','open','pending'))] - - - - - My Task's Deadlines - project.task - form - tree,form - [('user_id','=',uid),('state','=','open'),('date_deadline','<>',False)] + [('user_id','=',uid),('state','not in',('cancel','done'))] @@ -78,11 +74,10 @@
- - + - +
@@ -100,17 +95,10 @@ - - + />
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 @@ - - - project.vs.remaining.hour.tree - project.vs.hours - tree - - - - - - - - - - - project.vs.remaining.hour.graph - project.vs.hours - graph - - - - - - - - - - - Remaining Hours Per Project - project.vs.hours - form - graph,tree - [('user_id','=',uid),('state','=','open')] - - - - - - tree - - - - - - - graph - - - - - - task.by.days.tree - task.by.days - tree - - - - - - - - - - - task.by.days.graph - task.by.days - graph - - - - - - - - - - - - Task By Days - task.by.days - form - graph,tree - [('day','<=',time.strftime('%Y-%m-%d')),('day','>=', time.strftime('%Y-%m-%d', time.localtime(time.time()-(15*24*3600))))] - - - - - - project.vs.planned.total.hour.tree - project.vs.hours - tree - - - - - - - - - - - project.vs.planned.total.hour.graph - project.vs.hours - graph - - - - - - - - - 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 @@ - - Project issues - project.issue - form - tree,form - [('state','in',['draft','open'])] - - - - - Project issues - project.issue - form - tree,form - [('state','=','pending')] - - - - - Project Issue - project.issue.report - form - graph - [] - - - - - project.issue.report.graph - project.issue.report - graph - - - - - - - - - - - Project Issue - project.issue.report - form - graph - [] - - - - - board.project.issue.form - board.board - form - -
- - - - - - - - - - -
-
-
- - - Project Issue Dashboard - board.board - form - form - menu - - - - - - + Project Issue Board Tree project.issue tree @@ -105,6 +23,7 @@ + My Project Issues project.issue @@ -113,40 +32,17 @@ [('state','not in',('cancel','done')),('user_id','=',uid)] - - my.open.project.issue.graph - project.issue.report - graph - - - - - - - - - My Open Project issues - project.issue.report - form - graph,tree,form, - [('state','=','open'),('user_id','=',uid)] - {'default_user_id': uid} - - - + + board.my.project.issue.form.inherit board.board form - - - - - + + -
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 @@ + + report.account.analytic.planning.stat.form + report_account_analytic.planning.stat + form + +
+ + + + + +
+ + + report.account.analytic.planning.stat.tree + report_account_analytic.planning.stat + tree + + + + + + + + + + + + + + + report.account.analytic.planning.stat.graph + report_account_analytic.planning.stat + graph + + + + + + + + + + + + report_account_analytic.planning.stat.search + report_account_analytic.planning.stat + search + + + + + + + + + + + + + + Planning Statistics + report_account_analytic.planning.stat + form + graph,tree + + + board.project.planning.form board.board form - - - + + + 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 @@ - - - report.account.analytic.planning.stat.form - report_account_analytic.planning.stat - form - -
- - - - - -
- - - - report.account.analytic.planning.stat.tree - report_account_analytic.planning.stat - tree - - - - - - - - - - - - - - - report.account.analytic.planning.stat.graph - report_account_analytic.planning.stat - graph - - - - - - - - - - - - report_account_analytic.planning.stat.search - report_account_analytic.planning.stat - search - - - - - - - - - - - - - - Planning Statistics - report_account_analytic.planning.stat - form - graph,tree - - - - - 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 @@ - - - - - project.scrum.sprint.dashboard.tree - project.scrum.sprint - tree - - - - - - - - - - - - - - - - project.task.graph - project.task - graph - - - - - - - - - - Task Progress - project.task - form - graph - - - - - project.scrum.sprint.graph - project.scrum.product.backlog - graph - - - - - - - - - - Backlog Progress - project.scrum.product.backlog - form - graph - - - Sprints - project.scrum.sprint - form - tree,form - - - - board.project.form - board.board - form - -
- - - - - - - - - -
-
-
- - Scrum Dashboard - board.board - form - form - menu - - - - - - - project.scrum.sprint.project.dashboard.tree - project.scrum.sprint - tree - - - - - - - - - - - - My Sprint - project.scrum.sprint - form - tree,form - ['|',('product_owner_id','=',uid),('scrum_master_id','=',uid)] - - - - board.my.scrum.sprint.form.inherit - board.board - form - - - - - - - -
-