diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py index 97a68188715..3120eb9b1d1 100644 --- a/addons/project/report/project_report.py +++ b/addons/project/report/project_report.py @@ -128,16 +128,19 @@ class project_vs_remaining_hours(osv.osv): min(pt.id) as id, a.name as project, sum(pt.remaining_hours) as remaining_hours, - a.state + a.state, + pu.uid from project_task as pt, project_project as p, - account_analytic_account as a + account_analytic_account as a, + project_user_rel as pu where pt.project_id=p.id and - p.category_id = a.id + p.category_id = a.id and + pu.project_id=p.id group by - a.name,a.state + a.name,a.state,pu.uid ) """) project_vs_remaining_hours() @@ -165,8 +168,6 @@ class task_by_days(osv.osv): pt.project_id from project_task as pt - where - (to_date(to_char(pt.create_date, 'YYYY-MM-dd'),'YYYY-MM-dd') > (CURRENT_DATE-15)) group by to_char(pt.create_date, 'YYYY-MM-DD'),pt.state,pt.project_id ) diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml index db6b3b57118..e913f07048d 100644 --- a/addons/project/report/project_report_view.xml +++ b/addons/project/report/project_report_view.xml @@ -124,6 +124,7 @@ project.vs.remaining.hours form graph,tree + [('uid','=',uid)] @@ -159,7 +160,7 @@ 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))))] + [('day','<=',time.strftime('%Y-%m-%d')),('day','>=', time.strftime('%Y-%m-%d', time.localtime(time.time()-(15*24*3600))))] diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv index abedc99cfd6..f31c6f0401f 100644 --- a/addons/project/security/ir.model.access.csv +++ b/addons/project/security/ir.model.access.csv @@ -14,3 +14,6 @@ "access_project_message","project.message","model_project_message","project.group_project_user",1,0,0,0 "access_project_installer","project.installer","model_project_installer","project.group_project_user",1,0,0,0 "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_task_by_days_vs_planned_hours","task.by.days.vs.planned.hour","model_task_by_days_vs_planned_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