From 7e7cb6c131347f2d4a232c009ae966c1ae6b4a7f Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 17 Nov 2011 11:45:03 +0530
Subject: [PATCH 1/2] [FIX]project: add resource_calendar_id field in
 project.project

lp bug: https://launchpad.net/bugs/884208 fixed

bzr revid: kjo@tinyerp.com-20111117061503-4bos5thfpdfubkp0
---
 addons/project/project_view.xml                  |  1 +
 addons/project_issue/project_issue.py            |  1 -
 addons/project_issue/project_issue_view.xml      | 14 --------------
 .../project_long_term/project_long_term_view.xml | 16 ----------------
 4 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index d85481a6e5e..b21e7d270d0 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -34,6 +34,7 @@
                                 <separator colspan="2" string="Performance"/>
                                 <field name="planned_hours" widget="float_time"/>
                                 <field name="effective_hours" widget="float_time" />
+                                <field name="resource_calendar_id"/>
                             </group>
                             <group col="2" colspan="2" name="misc">
                                 <separator colspan="4" string="Miscelleanous"/>
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 0833cab7441..595c9bd7b0c 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -480,7 +480,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 a54ae14737d..03e1ee44b7e 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -396,20 +396,6 @@
     # ------------------------------------------------------
     # Project
     # ------------------------------------------------------
-
-        <record id="project.view_project_resource_form1" model="ir.ui.view">
-            <field name="name">Project Resource Calendar View</field>
-            <field name="model">project.project</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="project.edit_project"/>
-            <field name="arch" type="xml">
-                <field name="priority" position="after">
-                    <field name="resource_calendar_id"/>
-                </field>
-
-            </field>
-       </record>
-
         <record id="view_project_form_inherited" model="ir.ui.view">
             <field name="name">project.project.form.inherited</field>
             <field name="model">project.project</field>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index cdeb0a0d63d..277efe0f31c 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -273,22 +273,6 @@
         </record>
 
 
-    # ------------------------------------------------------
-    # Project
-    # ------------------------------------------------------
-
-        <record id="project.view_project_user_form1" model="ir.ui.view">
-            <field name="name">Project Resource Calendar View</field>
-            <field name="model">project.project</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="project.edit_project"/>
-            <field name="arch" type="xml">
-                <field name="effective_hours" position="after">
-                    <field name="resource_calendar_id"/>
-                </field>
-
-            </field>
-       </record>
 
     # ------------------------------------------------------
     # Project Task

From 5dff2820493ac820191d54c71284d63ac9c56018 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 17 Nov 2011 12:56:51 +0530
Subject: [PATCH 2/2] [FIX]project_long_term: remove dependency of resource
 module

bzr revid: kjo@tinyerp.com-20111117072651-74x5v5jh27g1g4ms
---
 addons/project_long_term/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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.
 ===========================================================================================