diff options
| author | Mustufa Rangwala <mra@mra-laptop> | 2010-07-30 18:50:24 +0530 |
|---|---|---|
| committer | Mustufa Rangwala <mra@mra-laptop> | 2010-07-30 18:50:24 +0530 |
| commit | 2152922daa9ff43c369ae6dfdcfd1c97fe3d85de (patch) | |
| tree | ff2c765df75cfa21886939d0d7f11630cf707c3f /addons/project_long_term | |
| parent | d5154cb1bf2e814f635aa3cffaaba8d153570836 (diff) | |
| parent | ac56c74c8cbb3293ac937849c7f6b905b69fbd30 (diff) | |
Merge with main branch
bzr revid: mra@mra-laptop-20100730132024-kq94ju89uywdvu7x
Diffstat (limited to 'addons/project_long_term')
| -rw-r--r-- | addons/project_long_term/project_long_term.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index 03b8ae8edc8..f4ae126ee67 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -190,6 +190,8 @@ class project_phase(osv.osv): return super(project_phase, self).write(cr, uid, ids, vals, context=context) # Consider calendar and efficiency if the phase is performed by a resource # otherwise consider the project's working calendar + if isinstance(ids, (int, long)): + ids = [ids] phase = self.browse(cr, uid, ids[0], context=context) calendar_id = phase.project_id.resource_calendar_id and phase.project_id.resource_calendar_id.id or False resource_id = resource_obj.search(cr, uid, [('user_id', '=', phase.responsible_id.id)],context=context) @@ -246,7 +248,7 @@ class project_resource_allocation(osv.osv): _rec_name = 'resource_id' _columns = { 'resource_id': fields.many2one('resource.resource', 'Resource', required=True), - 'phase_id': fields.many2one('project.phase', 'Project Phase', required=True), + 'phase_id': fields.many2one('project.phase', 'Project Phase', ondelete='cascade', required=True), 'phase_id_date_start': fields.related('phase_id', 'date_start', type='date', string='Starting Date of the phase'), 'phase_id_date_end': fields.related('phase_id', 'date_end', type='date', string='Ending Date of the phase'), 'useability': fields.float('Usability', help="Usability of this resource for this project phase in percentage (=50%)"), |
