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

chore: resolve conflicts

Browse Source
This commit is contained in:
Akhil Narang
2024-05-24 11:08:53 +05:30
committed by akhilnarang
parent f1f2f6e338
commit 220ae118e8
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

@@ -1632,11 +1632,7 @@
"idx": 105, "idx": 105,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2024-03-20 16:04:43.627183",
=======
"modified": "2024-05-23 16:35:54.905804", "modified": "2024-05-23 16:35:54.905804",
>>>>>>> 0303d7dbdc (fix: add in some indices to speed up Purchase Order deletion)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Sales Order", "name": "Sales Order",
@@ -1715,4 +1711,4 @@
"title_field": "customer_name", "title_field": "customer_name",
"track_changes": 1, "track_changes": 1,
"track_seen": 1 "track_seen": 1
} }