From 4fa85c3e57165b8165b333c9b794e7f6f683577c Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Tue, 19 Apr 2011 11:50:38 +0530
Subject: [PATCH 1/2] [FIX] project: Parent project field should display the
 views of project not analytic account.

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

bzr revid: uco@tinyerp.com-20110419062038-atx62scqlb26r6pv
---
 addons/project/project.py       | 1 +
 addons/project/project_data.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 134364d8b1a..f5e39d1484b 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -128,6 +128,7 @@ class project(osv.osv):
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the project without removing it."),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of Projects."),
         'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', help="Link this project to an analytic account if you need financial management on projects. It enables you to connect projects with budgets, planning, cost and revenue analysis, timesheets on projects, etc.", ondelete="cascade", required=True),
+        'parent_id': fields.many2one('project.project', 'Parent Project'),
         'priority': fields.integer('Sequence', help="Gives the sequence order when displaying the list of projects"),
         'warn_manager': fields.boolean('Warn Manager', help="If you check this field, the project manager will receive a request each time a task is completed by his team.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
 
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index a2df2e2e76c..059334215db 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -20,7 +20,7 @@
 		Resource: project.project
 		-->
 
-        <record id="all_projects_account" model="account.analytic.account">
+        <record id="all_projects_account" model="project.project">
             <field name="name">Projects</field>
             <field name="code">3</field>
         </record>

From 25eb9fe41503f43f082e86aa7841ee78e1fdcc60 Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Mon, 25 Apr 2011 10:43:25 +0530
Subject: [PATCH 2/2] [FIX] project: Label name changed for Parent project.

bzr revid: uco@tinyerp.com-20110425051325-2goe21h2z2vswb0a
---
 addons/project/project.py       | 1 -
 addons/project/project_data.xml | 2 +-
 addons/project/project_view.xml | 6 +++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index de214b197a5..7fbe39219a8 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -128,7 +128,6 @@ class project(osv.osv):
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the project without removing it."),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of Projects."),
         'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', help="Link this project to an analytic account if you need financial management on projects. It enables you to connect projects with budgets, planning, cost and revenue analysis, timesheets on projects, etc.", ondelete="cascade", required=True),
-        'parent_id': fields.many2one('project.project', 'Parent Project'),
         'priority': fields.integer('Sequence', help="Gives the sequence order when displaying the list of projects"),
         'warn_manager': fields.boolean('Warn Manager', help="If you check this field, the project manager will receive a request each time a task is completed by his team.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
 
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index 059334215db..a2df2e2e76c 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -20,7 +20,7 @@
 		Resource: project.project
 		-->
 
-        <record id="all_projects_account" model="project.project">
+        <record id="all_projects_account" model="account.analytic.account">
             <field name="name">Projects</field>
             <field name="code">3</field>
         </record>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index bce4ba6f2f4..fe8d660be7f 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -21,7 +21,7 @@
                 <form string="Project">
                     <group colspan="6" col="6">
                         <field name="name" string="Project Name" select="1"/>
-                        <field name="parent_id" string="Parent Project" domain="[('id','!=',active_id)]" context="{'current_model': 'project.project'}"/>
+                        <field name="parent_id" string="Parent" domain="[('id','!=',active_id)]" context="{'current_model': 'project.project'}"/>
                         <field name="user_id" string="Project Manager" select="1" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
                         <field name="date_start" string="Start Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
                         <field name="date" string="End Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
@@ -122,7 +122,7 @@
                         <filter string="Manager" name="Manager"  icon="terp-personal" domain = "[]" context="{'group_by':'user_id'}"/>
                         <filter string="Partner" name="Partner" icon="terp-partner" domain = "[]" context="{'group_by':'partner_id'}"/>
                          <separator orientation="vertical"/>
-                        <filter string="Parent" name="Parent"  help="Parent Project" icon="terp-folder-blue" domain = "[]" context="{'group_by':'parent_id'}"/>
+                        <filter string="Parent" name="Parent"  help="Parent" icon="terp-folder-blue" domain = "[]" context="{'group_by':'parent_id'}"/>
                     </group>
                </search>
             </field>
@@ -140,7 +140,7 @@
                     <field name="name" string="Project Name"/>
                     <field name="user_id" string="Project Manager"/>
                     <field name="partner_id" string="Partner"/>
-                    <field name="parent_id" string="Parent Project" invisible="1"/>
+                    <field name="parent_id" string="Parent" invisible="1"/>
                     <field name="planned_hours" widget="float_time"/>
                     <field name="total_hours" widget="float_time"/>
                     <field name="effective_hours" widget="float_time"/>