diff --git a/addons/board_project/__terp__.py b/addons/board_project/__terp__.py index a73163fbd2e..20098b9d83f 100644 --- a/addons/board_project/__terp__.py +++ b/addons/board_project/__terp__.py @@ -3,7 +3,14 @@ "version":"1.0", "author":"Tiny", "category":"Board", - "depends":["project","report_timesheet","board","report_analytic_line"], + "depends":[ + "project", + "report_timesheet", + "board", + "report_analytic_line", + "report_task", + "hr_timesheet_sheet" + ], "demo_xml":["board_project_demo.xml"], "update_xml":["board_project_view.xml", "board_project_manager_view.xml"], "description": """ diff --git a/addons/board_project/board_project_manager_view.xml b/addons/board_project/board_project_manager_view.xml index c39865efef2..e0f71ed516e 100644 --- a/addons/board_project/board_project_manager_view.xml +++ b/addons/board_project/board_project_manager_view.xml @@ -26,6 +26,37 @@ view_id="view_account_analytic_simplified" id="act_my_account"/> + + Pipeline of tasks + report.task.user.pipeline.open + form + graph,tree + [('task_state','<>','cancelled'),('task_state','<>','done')] + + + + hr.timesheet.sheet.tree.simplified.board + hr_timesheet_sheet.sheet + tree + + + + + + + + + + + + + Timesheets + hr_timesheet_sheet.sheet + [('state','<>','done')] + form + + + board.project.manager.form @@ -48,13 +79,11 @@ height="150" colspan="4"/> - @@ -64,6 +93,13 @@ icon="gtk-ok" type="action" colspan="4"/> +