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

chore: resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2022-05-02 11:16:48 +05:30
committed by GitHub
parent d9756d54ad
commit b9c326e3f6
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

@@ -1547,11 +1547,7 @@
"idx": 105, "idx": 105,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2022-04-21 08:16:48.316074",
=======
"modified": "2022-04-26 14:38:18.350207", "modified": "2022-04-26 14:38:18.350207",
>>>>>>> 82a0635c66 (fix: Consistent accounting dimensions across Sales and Purchase docs)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Sales Order", "name": "Sales Order",
@@ -1630,4 +1626,4 @@
"title_field": "customer_name", "title_field": "customer_name",
"track_changes": 1, "track_changes": 1,
"track_seen": 1 "track_seen": 1
} }