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

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2026-02-17 10:40:34 +05:30
committed by GitHub
parent 7677b2f573
commit 98ff54a871
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1009,15 +1009,7 @@
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
<<<<<<< HEAD
<<<<<<< HEAD
"modified": "2025-09-04 11:08:25.583561",
=======
"modified": "2026-02-15 20:50:18.580088",
>>>>>>> 4499e974a0 (chore: do not show stock details if update stock is disabled)
=======
"modified": "2026-02-15 21:08:57.341638", "modified": "2026-02-15 21:08:57.341638",
>>>>>>> cdc62e7327 (chore: do not show serial batch selector if not needed)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice Item", "name": "Sales Invoice Item",