diff options
| author | Frédéric van der Essen <fva@openerp.com> | 2012-09-25 16:10:57 +0200 |
|---|---|---|
| committer | Frédéric van der Essen <fva@openerp.com> | 2012-09-25 16:10:57 +0200 |
| commit | cf5385a5a8f4f355d8455cbc3aa436d034cce0a5 (patch) | |
| tree | e71d306b79169eb0e0305fe20c3e23b7e76a0796 /addons/project_long_term | |
| parent | ab68016f79cc58a369a10c9032d92e41e8877907 (diff) | |
| parent | 7debc08809d8836995d0e79c6299ca91bdee1dfe (diff) | |
[MERGE] from trunk
bzr revid: fva@openerp.com-20120925141057-3r9wkxo1y6y5sas9
Diffstat (limited to 'addons/project_long_term')
| -rw-r--r-- | addons/project_long_term/project_long_term.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index 2eab5fa6ac6..5b88d5209c8 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -138,7 +138,7 @@ class project_phase(osv.osv): if default is None: default = {} if not default.get('name', False): - default['name'] = self.browse(cr, uid, id, context=context).name + _(' (copy)') + default.update(name=_('%s (copy)') % (self.browse(cr, uid, id, context=context).name)) return super(project_phase, self).copy(cr, uid, id, default, context) def set_draft(self, cr, uid, ids, *args): @@ -227,7 +227,7 @@ class project(osv.osv): 'phase_ids': fields.one2many('project.phase', 'project_id', "Project Phases"), 'phase_count': fields.function(_phase_count, type='integer', string="Open Phases"), } - + def schedule_phases(self, cr, uid, ids, context=None): context = context or {} if type(ids) in (long, int,): @@ -250,7 +250,7 @@ class project(osv.osv): # Maybe it's better to update than unlink/create if it already exists ? p = getattr(project_gantt, 'Phase_%d' % (phase.id,)) - self.pool.get('project.user.allocation').unlink(cr, uid, + self.pool.get('project.user.allocation').unlink(cr, uid, [x.id for x in phase.user_ids], context=context ) |