diff options
| author | sbh (Open ERP) <sbh@tinyerp.com> | 2010-03-09 10:47:11 +0530 |
|---|---|---|
| committer | sbh (Open ERP) <sbh@tinyerp.com> | 2010-03-09 10:47:11 +0530 |
| commit | f38cd9e4d700b98f39c8faa3d8ea0ec0a0969b67 (patch) | |
| tree | 6c22b2019d8948cb00dc6bb59f0aa093fca46766 /addons/project | |
| parent | 248eabc2ca2f7a8a2acef5d5d4d5b5d1c1789d2e (diff) | |
| parent | 580056846894762244a813553f397c51d59ab803 (diff) | |
Merge
bzr revid: sbh@tinyerp.com-20100309051711-cpxuempzg840hwdu
Diffstat (limited to 'addons/project')
| -rw-r--r-- | addons/project/project.py | 2 | ||||
| -rw-r--r-- | addons/project/security/project_security.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/project/project.py b/addons/project/project.py index 7a412bfecfe..e9c11cc605c 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -299,7 +299,7 @@ class task(osv.osv): 'remaining_hours': fields.float('Remaining Hours', digits=(16,4), help="Total remaining time, can be re-estimated periodically by the assignee of the task."), 'total_hours': fields.function(_hours_get, method=True, string='Total Hours', multi='hours', store=True, help="Computed as: Time Spent + Remaining Time."), 'progress': fields.function(_hours_get, method=True, string='Progress (%)', multi='hours', store=True, help="Computed as: Time Spent / Total Time."), - 'delay_hours': fields.function(_hours_get, method=True, string='Delay Hours', multi='hours', store=True, help="Computed as: Total Time - Estimated Time. It gives the difference of the time estimated by the project manager and the real time to close the task."), + 'delay_hours': fields.function(_hours_get, method=True, string='Delay Hours', multi='hours', store=True, help="Computed as difference of the time estimated by the project manager and the real time to close the task."), 'user_id': fields.many2one('res.users', 'Assigned to'), 'delegated_user_id': fields.related('child_ids','user_id',type='many2one', relation='res.users', string='Delegated To'), diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml index 75bc18922eb..7c34807517a 100644 --- a/addons/project/security/project_security.xml +++ b/addons/project/security/project_security.xml @@ -42,7 +42,7 @@ <field name="global" eval="True"/> </record> <record model="ir.rule" id="task_visibility_rule"> - <field name="domain_force">['|','|',('user_id','=',user.id),('project_id.members','=',user.id),('project_id.user_id','=',user.id)]</field> + <field name="domain_force">['|','|','|',('user_id','=',False),('user_id','=',user.id),('project_id.members','=',user.id),('project_id.user_id','=',user.id)]</field> <field name="rule_group" ref="task_visibility_rule_group"/> </record> |