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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-02-06 22:09:44 +05:30
committed by GitHub
parent 28cbce4356
commit 08a6f4e6d3
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1655,11 +1655,7 @@
"idx": 105, "idx": 105,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2024-11-26 12:42:06.872527",
=======
"modified": "2025-02-06 16:02:20.320877", "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",
@@ -1737,4 +1733,4 @@
"title_field": "customer_name", "title_field": "customer_name",
"track_changes": 1, "track_changes": 1,
"track_seen": 1 "track_seen": 1
} }