From b56f0a0fdd6495ca588a7ca1b6b77848cef5356d Mon Sep 17 00:00:00 2001
From: "rch(OpenERP)" <>
Date: Wed, 30 Jun 2010 15:48:58 +0530
Subject: [PATCH] [IMP]:Project Dashboard
bzr revid: jni@tinyerp.com-20100630101858-erd9gf31ce4fvw4q
---
addons/project/report/project_report.py | 28 +------------------
addons/project/report/project_report_view.xml | 10 +++----
addons/project/security/ir.model.access.csv | 1 -
3 files changed, 6 insertions(+), 33 deletions(-)
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index b115b576859..ff8d2b2dfc1 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -104,7 +104,7 @@ class report_project_task_user(osv.osv):
(extract('epoch' from (t.date_deadline-t.date_end)))/(3600*24) as delay_endings_days
from project_task t
- group by
+ group by
t.id,
remaining_hours,
t.effective_hours,
@@ -203,31 +203,5 @@ class task_by_days(osv.osv):
""")
task_by_days()
-class task_by_days_vs_planned_hours(osv.osv):
- _name = "task.by.days.vs.planned.hours"
- _description = "Task By Days vs Planned Hours"
- _auto = False
- _columns = {
- 'day': fields.char('Day', size=128, required=True),
- 'planned_hour': fields.float('Planned Hours', readonly=True),
- 'project_id':fields.many2one('project.project','Project')
- }
- _order = 'day desc'
- def init(self, cr):
- tools.sql.drop_view_if_exists(cr, 'task_by_days_vs_planned_hours')
- cr.execute("""
- create or replace view task_by_days_vs_planned_hours as (
- select
- min(pt.id) as id,
- to_char(pt.create_date, 'YYYY-MM-DD') as day,
- sum(planned_hours) as planned_hour,
- pt.project_id
- from
- project_task as pt
- group by
- to_char(pt.create_date, 'YYYY-MM-DD'),pt.project_id
- )
- """)
-task_by_days_vs_planned_hours()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 92edbc78d77..9a047fbdd0f 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -221,24 +221,24 @@
task.by.days.vs.planned.hours.tree
- task.by.days.vs.planned.hours
+ report.project.task.user
tree
-
+
task.by.days.vs.planned.hours.graph
- task.by.days.vs.planned.hours
+ report.project.task.user
graph
-
+
@@ -246,7 +246,7 @@
Task By Days vs Planned Hours
- task.by.days.vs.planned.hours
+ report.project.task.user
form
graph,tree
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index bb675c4fe90..99ff1ea3629 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -12,7 +12,6 @@
"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_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
"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