From 28cbce435667880ea7168b090e1b48f7d5b51cc4 Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Thu, 6 Feb 2025 16:04:51 +0530
Subject: [PATCH 1/2] fix: the project document timed out while opening

(cherry picked from commit 33d03b1542207c595c5e4abd5a874c96041462a2)

# Conflicts:
#	erpnext/selling/doctype/sales_order/sales_order.json
---
 erpnext/accounts/doctype/sales_invoice/sales_invoice.json | 5 +++--
 erpnext/projects/doctype/project/project.py               | 2 --
 erpnext/selling/doctype/sales_order/sales_order.json      | 7 ++++++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index 4c6d9a85aa1..4183cc21ab8 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -299,7 +299,8 @@
    "oldfieldname": "project_name",
    "oldfieldtype": "Link",
    "options": "Project",
-   "print_hide": 1
+   "print_hide": 1,
+   "search_index": 1
   },
   {
    "default": "0",
@@ -2186,7 +2187,7 @@
    "link_fieldname": "consolidated_invoice"
   }
  ],
- "modified": "2025-01-14 11:38:30.446370",
+ "modified": "2025-02-06 15:59:54.636202",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sales Invoice",
diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py
index 5253cd0eae5..4ed8ffc0077 100644
--- a/erpnext/projects/doctype/project/project.py
+++ b/erpnext/projects/doctype/project/project.py
@@ -86,8 +86,6 @@ class Project(Document):
 			),
 		)
 
-		self.update_costing()
-
 	def before_print(self, settings=None):
 		self.onload()
 
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index 1525b9632de..3e89689024f 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -1151,7 +1151,8 @@
    "label": "Project",
    "oldfieldname": "project",
    "oldfieldtype": "Link",
-   "options": "Project"
+   "options": "Project",
+   "search_index": 1
   },
   {
    "fieldname": "party_account_currency",
@@ -1654,7 +1655,11 @@
  "idx": 105,
  "is_submittable": 1,
  "links": [],
+<<<<<<< HEAD
  "modified": "2024-11-26 12:42:06.872527",
+=======
+ "modified": "2025-02-06 16:02:20.320877",
+>>>>>>> 33d03b1542 (fix: the project document timed out while opening)
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Sales Order",

From 08a6f4e6d352de785a31a4c31b3dc074fffd5310 Mon Sep 17 00:00:00 2001
From: rohitwaghchaure <rohitw1991@gmail.com>
Date: Thu, 6 Feb 2025 22:09:44 +0530
Subject: [PATCH 2/2] chore: fix conflicts

---
 erpnext/selling/doctype/sales_order/sales_order.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index 3e89689024f..4db7bf6f003 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -1655,11 +1655,7 @@
  "idx": 105,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2024-11-26 12:42:06.872527",
-=======
  "modified": "2025-02-06 16:02:20.320877",
->>>>>>> 33d03b1542 (fix: the project document timed out while opening)
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Sales Order",
@@ -1737,4 +1733,4 @@
  "title_field": "customer_name",
  "track_changes": 1,
  "track_seen": 1
-}
\ No newline at end of file
+}