diff --git a/addons/board_project/__terp__.py b/addons/board_project/__terp__.py index b6ab4ba25b7..f934c7d3bc5 100644 --- a/addons/board_project/__terp__.py +++ b/addons/board_project/__terp__.py @@ -38,9 +38,10 @@ This module implements a dashboard for project member that includes: 'project_planning', 'hr_timesheet_sheet', 'project_issue', - 'resource' + 'resource', + 'scrum' ], - 'update_xml': ['board_project_view.xml', 'board_project_manager_view.xml'], + 'update_xml': ['board_project_view.xml', 'board_project_manager_view.xml','board_project_issue_view.xml','board_scrum_view.xml'], 'demo_xml': ['board_project_demo.xml'], 'installable': True, 'active': False, diff --git a/addons/board_project/board_project_issue_view.xml b/addons/board_project/board_project_issue_view.xml new file mode 100644 index 00000000000..074adceef80 --- /dev/null +++ b/addons/board_project/board_project_issue_view.xml @@ -0,0 +1,45 @@ + + + + + + Project issues + project.issue + form + tree,form + [('create_date', '>=', time.strftime('%Y-%m-%d 00:00:00')),('create_date', '<=', time.strftime('%Y-%m-%d 23:59:59'))] + + + + + board.project.issue.form + board.board + form + +
+ + + + + + + + +
+
+
+ + + Project Issue Dashboard + board.board + form + form + menu + + + +
+
diff --git a/addons/board_project/board_project_view.xml b/addons/board_project/board_project_view.xml index fc79b0f9304..700f65e6dec 100644 --- a/addons/board_project/board_project_view.xml +++ b/addons/board_project/board_project_view.xml @@ -47,6 +47,14 @@ [('user_id','=',uid),('state','=','open')] + + My Pending Tasks + project.task + form + tree,form + [('user_id','=',uid),('state','=','pending')] + + My Task's Deadlines project.task @@ -91,13 +99,12 @@
- - - - + + + - - + +
diff --git a/addons/board_project/board_scrum_view.xml b/addons/board_project/board_scrum_view.xml new file mode 100644 index 00000000000..b07e565563d --- /dev/null +++ b/addons/board_project/board_scrum_view.xml @@ -0,0 +1,38 @@ + + + + + Sprints List + scrum.sprint + form + tree,form + + + + board.project.form + board.board + form + +
+ + + + + +
+
+
+ + Project Dashboard + board.board + form + form + menu + + + +
+
diff --git a/addons/project/project_wizard.xml b/addons/project/project_wizard.xml index 934fa57ee9c..c7200ace05b 100644 --- a/addons/project/project_wizard.xml +++ b/addons/project/project_wizard.xml @@ -1,7 +1,7 @@ - + + + project.vs.remaining.hour.tree + project.vs.remaining.hours + tree + + + + + + + + + + + project.vs.remaining.hour.graph + project.vs.remaining.hours + graph + + + + + + + + + + Project and remaining hours + project.vs.remaining.hours + form + graph,tree + + + + + 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 + + + + + + task.by.days.vs.planned.hours.tree + task.by.days.vs.planned.hours + tree + + + + + + + + + + task.by.days.vs.planned.hours.graph + task.by.days.vs.planned.hours + graph + + + + + + + + + + Task By Days vs Planned Hours + task.by.days.vs.planned.hours + form + graph,tree + + diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py index ef1e002ae78..3f3c97fc5e0 100644 --- a/addons/project_issue/report/project_issue_report.py +++ b/addons/project_issue/report/project_issue_report.py @@ -35,7 +35,7 @@ class project_issue_report(osv.osv): c.priority as priority, c.project_id as project_id, c.type_id as type_id, - count(*) as nbr, + count(*) as nbr, to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close from project_issue c @@ -49,4 +49,5 @@ class project_issue_report(osv.osv): project_issue_report() + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml index 2f7886670c2..52b6f336d58 100644 --- a/addons/project_issue/report/project_issue_report_view.xml +++ b/addons/project_issue/report/project_issue_report_view.xml @@ -117,5 +117,7 @@ + +