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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2026-03-02 14:38:55 +05:30
committed by GitHub
parent b4a5bbc7e2
commit bf44f466ad
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1740,11 +1740,7 @@
"idx": 105, "idx": 105,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2026-02-10 11:55:52.796522",
=======
"modified": "2026-03-02 00:42:18.834823", "modified": "2026-03-02 00:42:18.834823",
>>>>>>> 9538a9870c (fix(accounts): add transaction time field)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Sales Order", "name": "Sales Order",