diff options
| author | niv-openerp <nicolas.vanhoren@openerp.com> | 2011-07-04 15:50:50 +0200 |
|---|---|---|
| committer | niv-openerp <nicolas.vanhoren@openerp.com> | 2011-07-04 15:50:50 +0200 |
| commit | a00bedaca6caaaa42e1404215211d8d5f3101544 (patch) | |
| tree | 915f7e374ac28e9dc6883e5648767bf1bd842035 /addons/project_long_term | |
| parent | f418321fd434ae7fbc2f8dfe396c58a783709c6d (diff) | |
| parent | 5a823350e0268dec917db4fa8fcdf71065d5a577 (diff) | |
[merge]
bzr revid: nicolas.vanhoren@openerp.com-20110701151646-f99caze1ci8rcbwp
bzr revid: nicolas.vanhoren@openerp.com-20110704135050-fsw4m7fbr2e41oa2
Diffstat (limited to 'addons/project_long_term')
| -rw-r--r-- | addons/project_long_term/project_long_term.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index a6437819248..6c5ef7890bf 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -120,7 +120,7 @@ class project_phase(osv.osv): 'state': fields.selection([('draft', 'Draft'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True, help='If the phase is created the state \'Draft\'.\n If the phase is started, the state becomes \'In Progress\'.\n If review is needed the phase is in \'Pending\' state.\ \n If the phase is over, the states is set to \'Done\'.'), - 'total_hours': fields.function(_compute, method=True, string='Total Hours'), + 'total_hours': fields.function(_compute, string='Total Hours'), } _defaults = { 'responsible_id': lambda obj,cr,uid,context: uid, @@ -399,7 +399,7 @@ class project_resource_allocation(osv.osv): res[allocation.id] = name return res _columns = { - 'name': fields.function(get_name, method=True, type='char', size=256), + 'name': fields.function(get_name, type='char', size=256), 'resource_id': fields.many2one('resource.resource', 'Resource', required=True), 'phase_id': fields.many2one('project.phase', 'Project Phase', ondelete='cascade', required=True), 'project_id': fields.related('phase_id', 'project_id', type='many2one', relation="project.project", string='Project', store=True), |