fix: the project document timed out while opening

(cherry picked from commit 33d03b1) # Conflicts: # erpnext/selling/doctype/sales_order/sales_order.json
frappe · Feb 6, 2025 · 28cbce4 · 28cbce4
1 parent e422ae1
commit 28cbce4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git 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
@@ -86,8 +86,6 @@ def onload(self):
 			),
 		)
 
-		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
@@ -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",
-Original file line number
+Diff line change
@@ Expand Up / @@ -86,8 +86,6 @@ def onload(self): @@
     			),
     		)
-    		self.update_costing()
     	def before_print(self, settings=None):
     		self.onload()
@@ Expand Down @@