From 4f5639cb6aa272056addf973232945e695731d4c Mon Sep 17 00:00:00 2001
From: Pawan Kumar <pawan.sharma@sunarctechnologies.com>
Date: Wed, 24 Feb 2021 20:09:09 +0530
Subject: [PATCH 1/2] remove conflict

---
 project_report/report/project_budget_hrs_analysis.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project_report/report/project_budget_hrs_analysis.py b/project_report/report/project_budget_hrs_analysis.py
index f71a2f6..de52b0e 100755
--- a/project_report/report/project_budget_hrs_analysis.py
+++ b/project_report/report/project_budget_hrs_analysis.py
@@ -21,7 +21,7 @@ class BudgetHrsAnalysis(models.Model):
     partner_id = fields.Many2one('res.partner', string='Client', readonly=True)
     employee_id = fields.Many2one('hr.employee', string='Consultant', readonly=True)
     hours_type = fields.Char(string="Hours Type", readonly=True)
-    hours = fields.Float("Timeline", digits=(16, 2), readonly=True, group_operator="sum")
+    hours = fields.Float("Number of Hours", digits=(16, 2), readonly=True, group_operator="sum")
     pricing_type = fields.Selection([
         ('fixed_rate', 'Fixed rate'),
         ('employee_rate', 'Consultant rate')

From d35031f50e61bab3cfbc6d509e35d5a4ba26f387 Mon Sep 17 00:00:00 2001
From: Pawan Kumar <pawan.sharma@sunarctechnologies.com>
Date: Wed, 24 Feb 2021 23:38:16 +0530
Subject: [PATCH 2/2] add code for project and sub-project

---
 cor_custom/views/project_view.xml |  1 +
 sub_project/models/sub_project.py | 12 ++++++++
 sub_project/views/sub_project.xml | 48 +++++++++++++++++++++++++++----
 3 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/cor_custom/views/project_view.xml b/cor_custom/views/project_view.xml
index e016fd7..7aa811f 100755
--- a/cor_custom/views/project_view.xml
+++ b/cor_custom/views/project_view.xml
@@ -189,6 +189,7 @@
         <field name="view_mode">tree,kanban,form</field>
         <field name="view_id" ref="project.view_project"/>
         <field name="search_view_id" ref="project.view_project_project_filter"/>
+        <field name="domain">[('is_sub_project', '=', False)]</field>
         <field name="target">main</field>
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
diff --git a/sub_project/models/sub_project.py b/sub_project/models/sub_project.py
index ea1c067..19964f4 100755
--- a/sub_project/models/sub_project.py
+++ b/sub_project/models/sub_project.py
@@ -8,6 +8,18 @@ class SubProject(models.Model):
     is_sub_project = fields.Boolean("Is Sub Project")
     sub_project = fields.Many2many('project.project', 'project_subproject_rel', 'project_id', 'id',
                                    domain="[('is_sub_project', '=', True)]", string='Sub Project')
+    parent_project = fields.Many2one('project.project', string='Parent Project')
+
+    @api.depends('sub_project')
+    def onchange_parent_project_sub_project(self):
+        for record in self:
+            if record.sub_project:
+                print('111111111', record.sub_project)
+                for rec in record.sub_project:
+                    print('2222222', rec, record.id, record._origin.id)
+                    #print('2222222AAAAAAAAAAAA', rec.parent_project)
+                    #rec.write({'parent_project' : record._origin.id})
+                    # print('3333333', rec.parent_project)
 
 
 class InheritProjectTask(models.Model):
diff --git a/sub_project/views/sub_project.xml b/sub_project/views/sub_project.xml
index ef752ef..aa352ca 100755
--- a/sub_project/views/sub_project.xml
+++ b/sub_project/views/sub_project.xml
@@ -11,8 +11,12 @@
                     <xpath expr="//field[@name='privacy_visibility']" position="after">
                         <field name="is_sub_project"/>
                     </xpath>
+                    <xpath expr="//field[@name='privacy_visibility']" position="after">
+                        <field name="parent_project" attrs="{'invisible': [('is_sub_project', '=', False)]}"/>
+                    </xpath>
                     <xpath expr="//page[@name='settings']" position="after">
-                        <page name="sub_project" string="Sub Project" attrs="{'invisible': [('is_sub_project', '=', True)]}">
+                        <page name="sub_project" string="Sub Project"
+                              attrs="{'invisible': [('is_sub_project', '=', True)]}">
                             <!--<group>
                                 <field name="is_sub_project"/>
                             </group>-->
@@ -38,12 +42,46 @@
             </field>
         </record>
 
+        <!--<record id="inherit_view_sub_project_tree" model="ir.ui.view">
+            <field name="name">project.project.tree.inherit</field>
+            <field name="model">project.project</field>
+            <field name="inherit_id" ref="project.view_project"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='partner_id']" position="after">
+                </xpath>
+            </field>
+        </record>-->
+
+        <record id="view_sub_project" model="ir.ui.view">
+            <field name="name">project.sub.project.tree</field>
+            <field name="model">project.project</field>
+            <field name="arch" type="xml">
+                <tree decoration-muted="active == False" string="Projects" delete="0" multi_edit="1" sample="1">
+                    <field name="sequence" optional="show" widget="handle"/>
+                    <field name="message_needaction" invisible="1"/>
+                    <field name="active" invisible="1"/>
+                    <field name="name" string="Name" class="font-weight-bold"/>
+                    <field name="user_id" optional="show" string="Project Manager" widget="many2one_avatar_user"/>
+                    <field name="partner_id" optional="show" string="Customer"/>
+                    <!-- custom field -->
+                    <field name="parent_project"/>
+                    <!-- -->
+                    <field name="analytic_account_id" optional="hide"/>
+                    <field name="privacy_visibility" optional="hide"/>
+                    <field name="subtask_project_id" optional="hide"/>
+                    <field name="label_tasks" optional="hide"/>
+                    <field name="company_id" optional="show"  groups="base.group_multi_company"/>
+                </tree>
+            </field>
+        </record>
+
         <!-- SUB PROJECT VIEW-->
         <record id="action_sub_project" model="ir.actions.act_window">
             <field name="name">Sub Project</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">project.project</field>
             <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_sub_project"/>
             <!--<field name="search_view_id" ref="sale_order_view_search_inherit_sale"/>-->
             <field name="context">{'default_is_sub_project': True}</field>
             <field name="domain">[('is_sub_project', '=', True)]</field>
@@ -55,10 +93,10 @@
         </record>
 
         <menuitem id="menu_sub_project"
-            name="Sub Project"
-            action="action_sub_project"
-            parent="project.menu_main_pm"
-            sequence="2"/>
+                  name="Sub Project"
+                  action="action_sub_project"
+                  parent="project.menu_main_pm"
+                  sequence="2"/>
 
     </data>
 </odoo>
\ No newline at end of file