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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-02-17 21:30:15 +05:30
committed by GitHub
parent 2f7f9c0bac
commit 697fdf5bc3
1 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/stock/doctype/stock_settings/stock_settings.json
View File

@@ -469,15 +469,6 @@
"fieldname": "allow_existing_serial_no", "fieldname": "allow_existing_serial_no",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Allow existing Serial No to be Manufactured/Received again" "label": "Allow existing Serial No to be Manufactured/Received again"
<<<<<<< HEAD
=======
},
{
"default": "0",
"description": "Upon submission of the Sales Order, Work Order, or Production Plan, the system will automatically reserve the stock.",
"fieldname": "auto_reserve_stock",
"fieldtype": "Check",
"label": "Auto Reserve Stock"
}, },
{ {
"fieldname": "serial_and_batch_bundle_section", "fieldname": "serial_and_batch_bundle_section",
@@ -489,7 +480,6 @@
"fieldname": "set_serial_and_batch_bundle_naming_based_on_naming_series", "fieldname": "set_serial_and_batch_bundle_naming_based_on_naming_series",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Set Serial and Batch Bundle Naming Based on Naming Series" "label": "Set Serial and Batch Bundle Naming Based on Naming Series"
>>>>>>> fe43975cdd (fix: provision to enable naming series for SABB)
} }
], ],
"icon": "icon-cog", "icon": "icon-cog",
@@ -497,11 +487,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
<<<<<<< HEAD "modified": "2025-02-17 14:36:36.177743",
"modified": "2024-12-09 17:52:36.030456",
=======
"modified": "2025-02-17 13:36:36.177743",
>>>>>>> fe43975cdd (fix: provision to enable naming series for SABB)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Stock Settings", "name": "Stock Settings",