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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-01-15 18:17:04 +05:30
committed by GitHub
parent d956051e69
commit e2d711540f
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -272,11 +272,7 @@
"icon": "fa fa-barcode", "icon": "fa fa-barcode",
"idx": 1, "idx": 1,
"links": [], "links": [],
<<<<<<< HEAD "modified": "2025-01-15 16:22:49.873889",
"modified": "2023-12-17 10:52:55.767839",
=======
"modified": "2025-01-15 15:22:49.873889",
>>>>>>> 9607b16dcf (fix: status of the serial no for the raw materials)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Serial No", "name": "Serial No",
@@ -320,4 +316,4 @@
"sort_order": "DESC", "sort_order": "DESC",
"states": [], "states": [],
"track_changes": 1 "track_changes": 1
} }