nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-19 09:35:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: the project document timed out while opening

Browse Source 
(cherry picked from commit 33d03b1542)

# Conflicts:
#	erpnext/selling/doctype/sales_order/sales_order.json
This commit is contained in:
Rohit Waghchaure
2025-02-06 16:04:51 +05:30
committed by Mergify
parent e422ae16e5
commit 28cbce4356
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/doctype/sales_invoice/sales_invoice.json
View File

@@ -299,7 +299,8 @@
"oldfieldname": "project_name", "oldfieldname": "project_name",
"oldfieldtype": "Link", "oldfieldtype": "Link",
"options": "Project", "options": "Project",
"print_hide": 1 "print_hide": 1,
"search_index": 1
}, },
{ {
"default": "0", "default": "0",
@@ -2186,7 +2187,7 @@
"link_fieldname": "consolidated_invoice" "link_fieldname": "consolidated_invoice"
} }
], ],
"modified": "2025-01-14 11:38:30.446370", "modified": "2025-02-06 15:59:54.636202",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice", "name": "Sales Invoice",

2
erpnext/projects/doctype/project/project.py
View File

@@ -86,8 +86,6 @@ class Project(Document):
), ),
) )
self.update_costing()
def before_print(self, settings=None): def before_print(self, settings=None):
self.onload() self.onload()

7
erpnext/selling/doctype/sales_order/sales_order.json
View File

@@ -1151,7 +1151,8 @@
"label": "Project", "label": "Project",
"oldfieldname": "project", "oldfieldname": "project",
"oldfieldtype": "Link", "oldfieldtype": "Link",
"options": "Project" "options": "Project",
"search_index": 1
}, },
{ {
"fieldname": "party_account_currency", "fieldname": "party_account_currency",
@@ -1654,7 +1655,11 @@
"idx": 105, "idx": 105,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2024-11-26 12:42:06.872527", "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", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Sales Order", "name": "Sales Order",