diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 7c169bfa1cc..3acdcec82f4 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -34,6 +34,7 @@ + diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 6973002be23..b83efbc4996 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -487,7 +487,6 @@ project_issue() class project(osv.osv): _inherit = "project.project" _columns = { - 'resource_calendar_id' : fields.many2one('resource.calendar', 'Working Time', help="Timetable working hours to adjust the gantt diagram report", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}), 'project_escalation_id' : fields.many2one('project.project','Project Escalation', help='If any issue is escalated from the current Project, it will be listed under the project selected here.', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}), 'reply_to' : fields.char('Reply-To Email Address', size=256) } diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 6fc872580a2..51440e1cbff 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -398,19 +398,6 @@ # Project # ------------------------------------------------------ - - Project Resource Calendar View - project.project - form - - - - - - - - - project.project.form.inherited project.project diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py index 31522d63ea2..f4b8ce34ad0 100644 --- a/addons/project_long_term/__openerp__.py +++ b/addons/project_long_term/__openerp__.py @@ -26,7 +26,7 @@ "website": "http://www.openerp.com", "category": "Project Management", "images": ["images/project_phase_form.jpeg","images/project_phases.jpeg", "images/resources_allocation.jpeg"], - "depends": ["resource", "project"], + "depends": ["project"], "description": """ Long Term Project management module that tracks planning, scheduling, resources allocation. =========================================================================================== diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index cdeb0a0d63d..37a9e8f154b 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -273,23 +273,6 @@ - # ------------------------------------------------------ - # Project - # ------------------------------------------------------ - - - Project Resource Calendar View - project.project - form - - - - - - - - - # ------------------------------------------------------ # Project Task # ------------------------------------------------------