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

chore: conflicts

Browse Source
This commit is contained in:
s-aga-r
2023-04-16 20:10:18 +05:30
parent 5d511035ec
commit 98ed6445a8
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -434,11 +434,7 @@
"icon": "fa fa-barcode", "icon": "fa fa-barcode",
"idx": 1, "idx": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2021-01-08 14:31:15.375996",
=======
"modified": "2023-04-14 15:58:46.139887", "modified": "2023-04-14 15:58:46.139887",
>>>>>>> fb3271c624 (fix: unable to change `company` for manual `Serial No` entry)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Serial No", "name": "Serial No",