nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-08 15:42:52 +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:05:59 +05:30
committed by GitHub
parent 3ed3b214c8
commit c68afbc715
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
View File

@@ -927,11 +927,7 @@
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2024-02-25 15:56:44.828634",
=======
"modified": "2024-05-23 16:36:18.970862", "modified": "2024-05-23 16:36:18.970862",
>>>>>>> 0303d7dbdc (fix: add in some indices to speed up Purchase Order deletion)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice Item", "name": "Sales Invoice Item",