Merge lp:~vauxoo/addons-vauxoo/7.0-user_story-effective_hours-dev-saul into lp:addons-vauxoo/7.0

Proposed by Saul Gonzalez
Status: Merged
Merged at revision: 1020
Proposed branch: lp:~vauxoo/addons-vauxoo/7.0-user_story-effective_hours-dev-saul
Merge into: lp:addons-vauxoo/7.0
Diff against target: 12 lines (+1/-1)
1 file modified
user_story/model/user_story.py (+1/-1)
To merge this branch: bzr merge lp:~vauxoo/addons-vauxoo/7.0-user_story-effective_hours-dev-saul
Reviewer Review Type Date Requested Status
Saul Gonzalez Pending
Review via email: mp+221304@code.launchpad.net

Description of the change

[FIX] effective_hours functional field modified

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'user_story/model/user_story.py'
2--- user_story/model/user_story.py 2014-05-09 21:51:34 +0000
3+++ user_story/model/user_story.py 2014-05-28 23:24:14 +0000
4@@ -227,7 +227,7 @@
5 'effective_hours': fields.function(_hours_get, string='Hours Spent', help="Computed using the sum of the task work done.",
6 store = {
7 _name: (lambda s, c, u, ids, cx={}: ids, ['task_ids'], 10),
8- 'project.task': (_get_user_story_from_pt, ['work_ids'], 10),
9+ 'project.task': (_get_user_story_from_pt, ['work_ids','userstory_id'], 10),
10 'project.task.work': (_get_user_story_from_ptw, ['hours'], 10),
11 }),
12 }