diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index a1b3bf19782..bcb57881e0e 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -391,7 +391,7 @@ - + diff --git a/addons/project/static/src/img/bug.png b/addons/project_issue/static/src/img/bug.png similarity index 100% rename from addons/project/static/src/img/bug.png rename to addons/project_issue/static/src/img/bug.png diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index 13efe602f79..b92449699a8 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -215,10 +215,59 @@ project_user_allocation() class project(osv.osv): _inherit = "project.project" + + def _open_phase(self, cr, uid, ids, field_name, arg, context=None): + open_phase={} + phase_pool=self.pool.get('project.phase') + for id in ids: + phase_ids = phase_pool.search(cr, uid, [('project_id', '=', id)]) + open_phase[id] = len(phase_ids) + return open_phase + _columns = { 'phase_ids': fields.one2many('project.phase', 'project_id', "Project Phases"), - 'phase' : fields.boolean('Phase',help = "If you check this field Phases are appears in kanban view") + 'phases' : fields.boolean('Phase',help = "If you check this field Phases are appears in kanban view"), + 'open_phases' : fields.function(_open_phase , type='integer',string="Open Phases"), + } + + def open_phase(self, cr, uid, ids, context=None): + #Open the View for the Tasks for the project + """ + This opens Tasks views + @return :Dictionary value for task view + """ + if context is None: + context = {} + value = {} + data_obj = self.pool.get('ir.model.data') + for project in self.browse(cr, uid, ids, context=context): + # Get Task views + tree_view = data_obj.get_object_reference(cr, uid, 'project_long_term', 'view_project_phase_list') + form_view = data_obj.get_object_reference(cr, uid, 'project_long_term', 'view_project_phase_form') + calander_view = data_obj.get_object_reference(cr, uid, 'project_long_term', 'view_project_phase_calendar') + search_view = data_obj.get_object_reference(cr, uid, 'project_long_term', 'view_project_phase_search') + context.update({ + #'search_default_user_id': uid, + 'search_default_project_id':project.id, + #'search_default_open':1, + }) + value = { + 'name': _('Phase'), + 'context': context, + 'view_type': 'form', + 'view_mode': 'form,tree', + 'res_model': 'project.phase', + 'view_id': False, + 'domain':[('project_id','in',ids)], + 'context': context, + 'views': [(tree_view and tree_view[1] or False, 'tree'),(calander_view and calander_view[1] or False, 'calendar'),(form_view and form_view[1] or False, 'form')], + 'type': 'ir.actions.act_window', + 'search_view_id': search_view and search_view[1] or False, + 'nodestroy': True + } + return value + 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 7044fe7e635..b297be4c2c8 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -105,10 +105,28 @@ - + + + + project.project.kanban.inherited + project.project + kanban + + + + + + + + + + + + + project.phase.form project.phase diff --git a/addons/project_long_term/static/src/img/phases_icon.jpg b/addons/project_long_term/static/src/img/phases_icon.jpg new file mode 100644 index 00000000000..df58a827b11 Binary files /dev/null and b/addons/project_long_term/static/src/img/phases_icon.jpg differ