diff options
| author | Mustufa Rangwala <mra@mra-laptop> | 2010-08-03 16:11:03 +0530 |
|---|---|---|
| committer | Mustufa Rangwala <mra@mra-laptop> | 2010-08-03 16:11:03 +0530 |
| commit | 33fe71b3c26297e972aa2c9efbb4d5bbd1afa084 (patch) | |
| tree | f4dd801b4b9ecb045e1c4efae481e92253cb44c5 /addons/project_long_term | |
| parent | 9dd1fbbc921aa565ae1373db6b42b458a829d5f8 (diff) | |
| parent | b5312fae416685251161ca6395d8418f28269e86 (diff) | |
[MERGE]
bzr revid: mra@mra-laptop-20100729133412-5nk5owm6sk35yn6b
bzr revid: mra@mra-laptop-20100730042929-xru8tw97ll2m9qc1
bzr revid: mra@mra-laptop-20100730092416-jxdt1is2l1jdzrab
bzr revid: mra@mra-laptop-20100802045251-03rfeaqd2171ulon
bzr revid: mra@mra-laptop-20100802100148-0cyvy8xmuuqylpeu
bzr revid: mra@mra-laptop-20100802131422-1fbvuro1wbb4ifmq
bzr revid: mra@mra-laptop-20100803044141-t644gw1vzumiiaa7
bzr revid: mra@mra-laptop-20100803045654-ibpq3m9q4whse8f9
bzr revid: mra@mra-laptop-20100803104103-hxesh5clp8nfuval
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%)"), |