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

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2026-02-06 12:00:47 +05:30
committed by GitHub
parent f56c6f93a1
commit 4847a76cb8
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2307,11 +2307,7 @@
"link_fieldname": "consolidated_invoice" "link_fieldname": "consolidated_invoice"
} }
], ],
<<<<<<< HEAD
"modified": "2026-02-03 14:09:44.347133",
=======
"modified": "2026-02-05 20:43:44.732805", "modified": "2026-02-05 20:43:44.732805",
>>>>>>> 5fb5b7b30e (fix: do not show update stock flag unneccessarily)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice", "name": "Sales Invoice",