diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index 6258c85f689..5c216e1eaad 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -23,7 +23,7 @@
-
+
My Open Tasks
project.task
@@ -32,16 +32,16 @@
[('user_id','=',uid),('state','=','open')]
-
-
- My Pending Tasks
+
+
+ My Delegated Tasks
project.task
form
tree,form
- [('user_id','=',uid),('state','=','pending')]
-
+ ['|',('parent_ids.user_id','=',uid),('user_id','=',uid)]
+
-
+
My Task's Deadlines
project.task
@@ -87,7 +87,7 @@
-
+
@@ -95,7 +95,7 @@
-
+
@@ -112,20 +112,20 @@
menu
-
+
-
+
-
+
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index a3ecf0f4ba1..e217619358c 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -122,27 +122,31 @@ class report_project_task_user(osv.osv):
report_project_task_user()
#This class is generated for project deshboard purpose
-class project_vs_remaining_hours(osv.osv):
- _name = "project.vs.remaining.hours"
- _description = " Project vs Remaining hours"
+class project_vs_hours(osv.osv):
+ _name = "project.vs.hours"
+ _description = " Project vs hours"
_auto = False
_columns = {
'project': fields.char('Project', size=128, required=True),
'remaining_hours': fields.float('Remaining Hours', readonly=True),
+ 'planned_hours': fields.float('Planned Hours', readonly=True),
+ 'total_hours': fields.float('Total Hours', readonly=True),
'state': fields.selection([('draft','Draft'),('open','Open'), ('pending','Pending'),('cancelled', 'Cancelled'),('close','Close'),('template', 'Template')], 'State', required=True, readonly=True)
}
_order = 'project desc'
def init(self, cr):
- tools.sql.drop_view_if_exists(cr, 'project_vs_remaining_hours')
+ tools.sql.drop_view_if_exists(cr, 'project_vs_hours')
cr.execute("""
- CREATE or REPLACE view project_vs_remaining_hours as (
+ CREATE or REPLACE view project_vs_hours as (
select
min(pt.id) as id,
aaa.user_id as uid,
aaa.name as project,
aaa.state,
- sum(pt.remaining_hours) as remaining_hours
+ sum(pt.remaining_hours) as remaining_hours,
+ sum(pt.planned_hours) as planned_hours,
+ sum(pt.total_hours) as total_hours
FROM project_project as pp,
account_analytic_account as aaa,
project_task as pt
@@ -154,7 +158,9 @@ class project_vs_remaining_hours(osv.osv):
pur.uid as uid,
aaa.name as project,
aaa.state,
- sum(pt.remaining_hours) as remaining_hours
+ sum(pt.remaining_hours) as remaining_hours,
+ sum(pt.planned_hours) as planned_hours,
+ sum(pt.total_hours) as total_hours
FROM project_project as pp,
project_user_rel as pur,
account_analytic_account as aaa,
@@ -164,7 +170,7 @@ class project_vs_remaining_hours(osv.osv):
)
""")
-project_vs_remaining_hours()
+project_vs_hours()
class task_by_days(osv.osv):
_name = "task.by.days"
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index f22875cee4d..09e63f43b88 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -1,7 +1,7 @@
-
+
@@ -91,7 +91,7 @@
+ help="My Projects" domain="[('project_id','=',uid)]"/>
@@ -151,7 +151,7 @@
project.vs.remaining.hour.tree
- project.vs.remaining.hours
+ project.vs.hours
tree
@@ -164,7 +164,7 @@
project.vs.remaining.hour.graph
- project.vs.remaining.hours
+ project.vs.hours
graph
@@ -177,13 +177,25 @@
Project and remaining hours
- project.vs.remaining.hours
+ project.vs.hours
form
graph,tree
- [('uid','=',uid)]
+ [('uid','=',uid),('state','=','open')]
+
+
+ tree
+
+
+
+
+
+ graph
+
+
+
task.by.days.tree
@@ -222,38 +234,51 @@
-
- task.by.days.vs.planned.hours.tree
- report.project.task.user
+
+ project.vs.planned.total.hour.tree
+ project.vs.hours
tree
-
-
-
+
+
+
+
-
- task.by.days.vs.planned.hours.graph
- report.project.task.user
+
+ project.vs.planned.total.hour.graph
+ project.vs.hours
graph
-
-
-
-
+
+
+
+
-
- Task By Days vs Planned Hours
- report.project.task.user
+
+ My projects: Planned Vs Total hours
+ project.vs.hours
form
graph,tree
-
+
+
+
+ tree
+
+
+
+
+
+ graph
+
+
+
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index 99ff1ea3629..b418b0a0dbf 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -11,7 +11,7 @@
"access_project_task_work_manager","project.task.work.manager","model_project_task_work","project.group_project_manager",1,1,1,1
"access_project_message","project.message","model_project_message","project.group_project_user",1,1,1,1
"access_report_project_task_user","report.project.task.user","model_report_project_task_user","project.group_project_manager",1,0,0,0
-"access_project_vs_remaining_hours","project.vs.remaining.hours","model_project_vs_remaining_hours","project.group_project_user",1,1,1,1
+"access_project_vs_hours","project.vs.hours","model_project_vs_hours","project.group_project_user",1,1,1,1
"access_task_by_days","task.by.days","model_task_by_days","project.group_project_user",1,1,1,1
"access_partner_task user","base.res.partner user","base.model_res_partner","project.group_project_user",1,0,0,0
"access_partner_task manager","base.res.partner manager","base.model_res_partner","project.group_project_manager",1,0,0,0