From 879c275398224af4813e8002a9f9261820766583 Mon Sep 17 00:00:00 2001
From: "pawan.sharma" <pawan.sharma@sunarctechnologies.com>
Date: Fri, 11 Mar 2022 12:33:44 +0530
Subject: [PATCH 1/2] change cost string to Budgeted

---
 cor_custom/views/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cor_custom/views/project_view.xml b/cor_custom/views/project_view.xml
index 90f1eb4..8fe2c23 100755
--- a/cor_custom/views/project_view.xml
+++ b/cor_custom/views/project_view.xml
@@ -81,7 +81,7 @@
                             <field name="currency_id" invisible="1"/>
                             <field name="budgeted_qty"
                                    attrs="{'readonly': [('parent.project_type', '=', 'hours_no_limit')]}"/>
-                            <field name="cost"/>
+                            <field name="cost" string="Budgeted"/>
                             <!--<field name="timesheet_product_id"
                                    attrs="{'column_invisible': [('parent.sale_order_id', '!=', False)]}"/>-->
                             <!--<field name="budgeted_uom"

From e7be0427e1be6453f340fd41a7266b377c3b354b Mon Sep 17 00:00:00 2001
From: "pawan.sharma" <pawan.sharma@sunarctechnologies.com>
Date: Fri, 11 Mar 2022 14:21:29 +0530
Subject: [PATCH 2/2] profit amount calculation changes(CR)

---
 cor_custom/models/project.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/cor_custom/models/project.py b/cor_custom/models/project.py
index 1dcbf9d..2d34933 100755
--- a/cor_custom/models/project.py
+++ b/cor_custom/models/project.py
@@ -134,10 +134,15 @@ class Project(models.Model):
             record.timesheet_hour = timesheet_hour
             total_exp = record.consultant_cost + record.expenses_amt
             record.total_expenses = total_exp
-            profit_amt = record.budgeted_revenue - total_exp
-            record.profit_amt = profit_amt
-            if record.profit_amt > 0 and record.budgeted_revenue > 0:
-                record.profit_per = (record.profit_amt / record.budgeted_revenue) * 100
+            #record.profit_amt = record.budgeted_revenue - total_exp
+            # if record.profit_amt > 0 and record.budgeted_revenue > 0:
+            #     record.profit_per = (record.profit_amt / record.budgeted_revenue) * 100
+
+            ##### CR Changes
+            record.profit_amt = record.actual_revenue - record.consultant_cost
+            if record.profit_amt > 0:
+                record.profit_per = (record.profit_amt / record.actual_revenue) * 100
+            ########################
             if record.project_type == 'hours_in_consultant' and record.budgeted_hours > 0.0:
                 record.hourly_rate = (record.budgeted_revenue / record.budgeted_hours)
             # if record.project_type == 'hours_no_limit' and record.budgeted_hours2 > 0.0: