nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-24 15:39:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-07-15 15:03:41 +05:30
committed by GitHub
parent 4b6444e93b
commit 9aeb08f968
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/stock/doctype/serial_no/serial_no.json
View File

@@ -282,11 +282,7 @@
"icon": "fa fa-barcode", "icon": "fa fa-barcode",
"idx": 1, "idx": 1,
"links": [], "links": [],
<<<<<<< HEAD "modified": "2025-07-15 13:40:21.938700",
"modified": "2025-01-15 16:22:49.873889",
=======
"modified": "2025-07-15 13:36:21.938700",
>>>>>>> e073075834 (fix: system was allowing credit notes with serial numbers for any customer)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Serial No", "name": "Serial No",