odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[fix] problem in projects, the dashboard crashes 

bzr revid: nicolas.vanhoren@openerp.com-20111013151822-neo7d726yx6uno40
This commit is contained in:
niv-openerp 2011-10-13 17:18:22 +02:00
parent f6a1313ec2
commit e67d4a7911
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/project/report/project_report.py
View File

@ -128,6 +128,7 @@ class project_vs_hours(osv.osv):
_columns = {
'project': fields.char('Project', size=128, required=True),
'remaining_hours': fields.float('Remaining Hours', readonly=True),
'user_id': fields.many2one('res.users', 'Assigned To', 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)
@ -140,7 +141,7 @@ class project_vs_hours(osv.osv):
CREATE or REPLACE view project_vs_hours as (
select
min(pt.id) as id,
aaa.user_id as uid,
aaa.user_id as user_id,
aaa.name as project,
aaa.state,
sum(pt.remaining_hours) as remaining_hours,
@ -154,7 +155,7 @@ class project_vs_hours(osv.osv):
UNION All
SELECT
min(pt.id) as id,
pur.uid as uid,
pur.uid as user_id,
aaa.name as project,
aaa.state,
sum(pt.remaining_hours) as remaining_hours,

4
addons/project/report/project_report_view.xml
View File

@ -184,7 +184,7 @@
<field name="res_model">project.vs.hours</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="domain">[('uid','=',uid),('state','=','open')]</field>
<field name="domain">[('user_id','=',uid),('state','=','open')]</field>
<field name="view_id" ref="view_project_vs_remaining_hours_graph"/>
</record>
@ -272,7 +272,7 @@
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="context">{}</field>
<field name="domain">[('uid','=',uid),('state','=','open')]</field>
<field name="domain">[('user_id','=',uid),('state','=','open')]</field>
<field name="view_id" ref="view_project_vs_planned_total_hours_graph"/>
</record>