nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 18:59:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2026-03-03 21:09:03 +05:30
committed by GitHub
parent 90169a39bb
commit 3581906033
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
View File

@@ -350,11 +350,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2026-01-05 14:27:33.329810",
=======
"modified": "2026-03-01 23:38:48.079274", "modified": "2026-03-01 23:38:48.079274",
>>>>>>> 49d363b174 (fix: handle html email template separately in RFQ to avoid jinja context error)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Request for Quotation", "name": "Request for Quotation",