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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-04-11 15:34:45 +05:30
committed by GitHub
parent 2e6ba91589
commit 00ac8597b0
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,7 +35,6 @@
"show_barcode_field", "show_barcode_field",
"clean_description_html", "clean_description_html",
"allow_internal_transfer_at_arms_length_price", "allow_internal_transfer_at_arms_length_price",
<<<<<<< HEAD
"quality_inspection_settings_section", "quality_inspection_settings_section",
"action_if_quality_inspection_is_not_submitted", "action_if_quality_inspection_is_not_submitted",
"column_break_23", "column_break_23",
@@ -47,8 +46,6 @@
"auto_reserve_stock_for_sales_order_on_purchase", "auto_reserve_stock_for_sales_order_on_purchase",
"serial_and_batch_reservation_section", "serial_and_batch_reservation_section",
"auto_reserve_serial_and_batch", "auto_reserve_serial_and_batch",
=======
>>>>>>> 8eaa2afeb7 (feat: Allow to Make Quality Inspection after Purchase / Delivery)
"serial_and_batch_item_settings_tab", "serial_and_batch_item_settings_tab",
"section_break_7", "section_break_7",
"allow_existing_serial_no", "allow_existing_serial_no",