diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index 0e7fcee25fb..11656b4bebd 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -216,25 +216,23 @@ project_user_allocation() class project(osv.osv): _inherit = "project.project" - + def _phase_count(self, cr, uid, ids, field_name, arg, context=None): res = dict.fromkeys(ids, 0) - phase_pool = self.pool.get('project.phase') - phase_ids = phase_pool.search(cr, uid, [('project_id', 'in', ids)]) - for phase in phase_pool.browse(cr, uid, phase_ids, context): + phase_ids = self.pool.get('project.phase').search(cr, uid, [('project_id', 'in', ids)]) + for phase in self.pool.get('project.phase').browse(cr, uid, phase_ids, context): res[phase.project_id.id] += 1 return res - + _columns = { 'phase_ids': fields.one2many('project.phase', 'project_id', "Project Phases"), - 'use_phases' : fields.boolean('Phase',help = "If you check this field Phases are appears in kanban view"), - 'phase_count' : fields.function(_phase_count , type='integer',string="Open Phases"), - + 'use_phases': fields.boolean('Use Phases', help="Check this field if project manages phases"), + 'phase_count': fields.function(_phase_count, type='integer', string="Open Phases"), } _defaults = { - 'use_phases' : True, + 'use_phases': True, } - + def schedule_phases(self, cr, uid, ids, context=None): context = context or {} if type(ids) in (long, int,): diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index 5747ebba5e7..b4042fc42e7 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -84,12 +84,12 @@ - + Planning of Users project.user.allocation form gantt,tree,form,calendar - {} + {} @@ -104,22 +104,21 @@ form - + - + - - - + project.project.kanban.inherited project.project @@ -131,9 +130,8 @@ - - PhasePhases() - + Phases()