From 805eab03c44cde601c2ccb026268b98983a8fce4 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Tue, 5 Jun 2012 12:50:03 +0530 Subject: [PATCH 01/12] [IMP] project:improved view of dashboard and remove unnecessary code bzr revid: tpa@tinyerp.com-20120605072003-2bbg02ixcygbie2g --- addons/project/board_project_view.xml | 51 ++------------------------- 1 file changed, 3 insertions(+), 48 deletions(-) diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml index a4b302f33f2..619ec1264d9 100644 --- a/addons/project/board_project_view.xml +++ b/addons/project/board_project_view.xml @@ -23,26 +23,6 @@ - - project.task.delegated.tree - project.task - tree - - - - - - - - - - - - - - - - My Open Tasks project.task @@ -52,24 +32,6 @@ - - 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)] - - - board.project.form board.board @@ -79,7 +41,6 @@ - @@ -100,17 +61,11 @@ - - + /> From 239939bda7f5590afbecf561f210296f6b27ef0e Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Tue, 5 Jun 2012 12:59:42 +0530 Subject: [PATCH 02/12] [IMP] project_scrum:improved view of dashboard and remove unnecessary code bzr revid: tpa@tinyerp.com-20120605072942-e0yg7ee1j9ldoqds --- addons/project/board_project_view.xml | 2 +- .../board_project_scrum_view.xml | 105 +----------------- 2 files changed, 7 insertions(+), 100 deletions(-) diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml index 619ec1264d9..2f82c58c730 100644 --- a/addons/project/board_project_view.xml +++ b/addons/project/board_project_view.xml @@ -40,7 +40,7 @@
- + diff --git a/addons/project_scrum/board_project_scrum_view.xml b/addons/project_scrum/board_project_scrum_view.xml index 08e3fd1bb25..311a79db725 100644 --- a/addons/project_scrum/board_project_scrum_view.xml +++ b/addons/project_scrum/board_project_scrum_view.xml @@ -1,103 +1,7 @@ - - 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 @@ -111,6 +15,7 @@ + My Sprint project.scrum.sprint @@ -119,16 +24,18 @@ ['|',('product_owner_id','=',uid),('scrum_master_id','=',uid)] - + + board.my.scrum.sprint.form.inherit board.board form - + + From 9dd9fe31d02fd30172e1ddd4a141a3a47c61a5ea Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Tue, 5 Jun 2012 14:19:52 +0530 Subject: [PATCH 03/12] [IMP] project_issue:improved view of dashboard and remove unnecessary code bzr revid: tpa@tinyerp.com-20120605084952-yr2o58zydsodn69v --- .../board_project_issue_view.xml | 78 +++---------------- 1 file changed, 10 insertions(+), 68 deletions(-) diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml index b6e1f8a5d99..0f6450133fa 100644 --- a/addons/project_issue/board_project_issue_view.xml +++ b/addons/project_issue/board_project_issue_view.xml @@ -1,34 +1,6 @@ - - - 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 @@ -51,40 +23,7 @@ - - board.project.issue.form - board.board - form - -
- - - - - - - - - - -
-
-
- - - Project Issue Dashboard - board.board - form - form - menu - - - - - - + Project Issue Board Tree project.issue tree @@ -105,6 +44,7 @@ + My Project Issues project.issue @@ -113,7 +53,8 @@ [('state','not in',('cancel','done')),('user_id','=',uid)] - + + my.open.project.issue.graph project.issue.report graph @@ -124,6 +65,7 @@ + My Open Project issues project.issue.report @@ -133,20 +75,20 @@ {'default_user_id': uid} - + + board.my.project.issue.form.inherit board.board form - - + + - + -
From a17455a6228f439b2955193eda282e3eb61c059e Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Tue, 5 Jun 2012 14:45:43 +0530 Subject: [PATCH 04/12] [IMP] project_planning:improved view of dashboard and remove unnecessary code bzr revid: tpa@tinyerp.com-20120605091543-h8ao8yodg0ulajzh --- .../board_project_planning_view.xml | 75 +++++++++++++++++- .../project_planning_view.xml | 77 ------------------- 2 files changed, 72 insertions(+), 80 deletions(-) diff --git a/addons/project_planning/board_project_planning_view.xml b/addons/project_planning/board_project_planning_view.xml index db29a7f067a..09d6c711abf 100644 --- a/addons/project_planning/board_project_planning_view.xml +++ b/addons/project_planning/board_project_planning_view.xml @@ -2,15 +2,84 @@ + + 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 - - - - - From 181fcd68be1598110fdf286a22ee32a68025efb4 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Tue, 5 Jun 2012 15:01:59 +0530 Subject: [PATCH 05/12] [IMP] project:remove unnecessary code bzr revid: tpa@tinyerp.com-20120605093159-6t6pyyyls74wtbur --- addons/project/__openerp__.py | 1 - addons/project/board_project_manager_view.xml | 24 ------------------- addons/project/board_project_view.xml | 1 - 3 files changed, 26 deletions(-) delete mode 100644 addons/project/board_project_manager_view.xml 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 2f82c58c730..a3067fb21d1 100644 --- a/addons/project/board_project_view.xml +++ b/addons/project/board_project_view.xml @@ -61,7 +61,6 @@ Date: Tue, 5 Jun 2012 15:04:51 +0530 Subject: [PATCH 06/12] [IMP] project_scrum:remove unnecessary code bzr revid: tpa@tinyerp.com-20120605093451-8ly1xxuxf48y4p62 --- addons/project_scrum/__openerp__.py | 1 - .../board_project_scrum_view.xml | 41 ------------------- 2 files changed, 42 deletions(-) delete mode 100644 addons/project_scrum/board_project_scrum_view.xml 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 311a79db725..00000000000 --- a/addons/project_scrum/board_project_scrum_view.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - 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 - - - - - - - - - - From 77ad73e7f04083db86e087e6d5af9119b21889b3 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Tue, 5 Jun 2012 15:07:50 +0530 Subject: [PATCH 07/12] [IMP] project_issue:remove unnecessary code bzr revid: tpa@tinyerp.com-20120605093750-m3ykr7wjod3r48pi --- .../board_project_issue_view.xml | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml index 0f6450133fa..84cf36f1412 100644 --- a/addons/project_issue/board_project_issue_view.xml +++ b/addons/project_issue/board_project_issue_view.xml @@ -1,27 +1,6 @@ - - project.issue.report.graph - project.issue.report - graph - - - - - - - - - - - Project Issue - project.issue.report - form - graph - [] - - Project Issue Board Tree @@ -85,9 +64,6 @@ - - - From e0c7b8f7d0d99f7ccc3e27a90e977823c29e7dcd Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Tue, 5 Jun 2012 15:11:39 +0530 Subject: [PATCH 08/12] [IMP] project_planning:improved view of dashboard. bzr revid: tpa@tinyerp.com-20120605094139-3svmgimgqhme04xb --- addons/project_planning/board_project_planning_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/project_planning/board_project_planning_view.xml b/addons/project_planning/board_project_planning_view.xml index 09d6c711abf..1a010086401 100644 --- a/addons/project_planning/board_project_planning_view.xml +++ b/addons/project_planning/board_project_planning_view.xml @@ -77,8 +77,8 @@ form - - + +
From fdad0d44f49322fc3257450ae7809408c329ef46 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Tue, 5 Jun 2012 15:16:16 +0530 Subject: [PATCH 09/12] [IMP] improved code bzr revid: tpa@tinyerp.com-20120605094616-2kheuaepxyqolxpj --- addons/project/board_project_view.xml | 1 - addons/project_planning/board_project_planning_view.xml | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml index a3067fb21d1..fdc93821303 100644 --- a/addons/project/board_project_view.xml +++ b/addons/project/board_project_view.xml @@ -2,7 +2,6 @@ - project.task.tree project.task diff --git a/addons/project_planning/board_project_planning_view.xml b/addons/project_planning/board_project_planning_view.xml index 1a010086401..7a6d17592fc 100644 --- a/addons/project_planning/board_project_planning_view.xml +++ b/addons/project_planning/board_project_planning_view.xml @@ -15,7 +15,6 @@ - report.account.analytic.planning.stat.tree report_account_analytic.planning.stat @@ -77,9 +76,9 @@ form - - - + + + From 521a0e1a66ca3a8d4cbcbfd2a30d5c390d2204a1 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Tue, 5 Jun 2012 17:56:54 +0530 Subject: [PATCH 10/12] [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 @@ + + 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,11 +58,11 @@ - My Open Tasks + My Tasks project.task form tree,form - [('user_id','=',uid),('state','=','open')] + [('user_id','=',uid),('state','not in',('cancel','done'))] @@ -42,7 +77,7 @@ - + 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 @@ - - 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')] - - @@ -205,69 +171,6 @@ - - - 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 - - - - - - - - From c5709c39b1c13bebc2f7c1620b25b4ebf2e39ca2 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Tue, 5 Jun 2012 17:57:45 +0530 Subject: [PATCH 11/12] [IMP] project: improved code. bzr revid: tpa@tinyerp.com-20120605122745-digl0ttu2fb4nb5v --- addons/project/report/project_report_view.xml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml index 56158252f3a..659e5bd0651 100644 --- a/addons/project/report/project_report_view.xml +++ b/addons/project/report/project_report_view.xml @@ -156,21 +156,5 @@ - - - - - tree - - - - - - - graph - - - - From b2a3c8e30cb36ca8b92868bfe08fdd285d6d5415 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Wed, 6 Jun 2012 10:54:45 +0530 Subject: [PATCH 12/12] [IMP] project_issue:remove unnecessary code bzr revid: tpa@tinyerp.com-20120606052445-c1cobmsei2bpb03r --- .../board_project_issue_view.xml | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml index 84cf36f1412..cedcd85d4fc 100644 --- a/addons/project_issue/board_project_issue_view.xml +++ b/addons/project_issue/board_project_issue_view.xml @@ -33,28 +33,6 @@ - - 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