diff --git a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json index 5f9b87a0d25c57fc99720fbb8bc22dc53aabb159..541c5ae87717a21a898c013e914ebcb1015fdd55 100644 --- a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json +++ b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json @@ -37,7 +37,7 @@ "capacity_planning_for_days", "mins_between_operations", "other_settings_section", - "set_op_cost_and_scrape_from_sub_assemblies", + "set_op_cost_and_scrap_from_sub_assemblies", "column_break_23", "make_serial_no_batch_from_work_order" ], @@ -202,13 +202,6 @@ "fieldtype": "Check", "label": "Allow Excess Material Transfer" }, - { - "default": "0", - "description": "In the case of 'Use Multi-Level BOM' in a work order, if the user wishes to add sub-assembly costs to Finished Goods items without using a job card as well the scrap items, then this option needs to be enable.", - "fieldname": "set_op_cost_and_scrape_from_sub_assemblies", - "fieldtype": "Check", - "label": "Set Operating Cost / Scrap Items From Sub-assemblies" - }, { "default": "0", "depends_on": "eval: doc.material_consumption", @@ -243,13 +236,20 @@ "fieldname": "validate_components_quantities_per_bom", "fieldtype": "Check", "label": "Validate Components and Quantities Per BOM" + }, + { + "default": "0", + "description": "To include sub-assembly costs and scrap items in Finished Goods on a work order without using a job card, when the 'Use Multi-Level BOM' option is enabled.", + "fieldname": "set_op_cost_and_scrap_from_sub_assemblies", + "fieldtype": "Check", + "label": "Set Operating Cost / Scrap Items From Sub-assemblies" } ], "icon": "icon-wrench", "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2025-01-09 16:02:23.326763", + "modified": "2025-01-13 12:07:03.089977", "modified_by": "Administrator", "module": "Manufacturing", "name": "Manufacturing Settings", diff --git a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.py b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.py index cb2916c8ac599ec3e9ac4730caa7734379900135..04aebf23743a84c2539616d62c004f1e5c0dbd77 100644 --- a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.py +++ b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.py @@ -34,7 +34,7 @@ class ManufacturingSettings(Document): mins_between_operations: DF.Int overproduction_percentage_for_sales_order: DF.Percent overproduction_percentage_for_work_order: DF.Percent - set_op_cost_and_scrape_from_sub_assemblies: DF.Check + set_op_cost_and_scrap_from_sub_assemblies: DF.Check update_bom_costs_automatically: DF.Check validate_components_quantities_per_bom: DF.Check # end: auto-generated types diff --git a/erpnext/manufacturing/doctype/work_order/test_work_order.py b/erpnext/manufacturing/doctype/work_order/test_work_order.py index 09e09d18fb5e2ea65789444b0b7142fc795aa443..3c3cf1323a5b3ef502e463c999cf8e31a400aabf 100644 --- a/erpnext/manufacturing/doctype/work_order/test_work_order.py +++ b/erpnext/manufacturing/doctype/work_order/test_work_order.py @@ -2096,7 +2096,7 @@ class TestWorkOrder(IntegrationTestCase): def test_op_cost_and_scrap_based_on_sub_assemblies(self): # Make Sub Assembly BOM 1 - frappe.db.set_single_value("Manufacturing Settings", "set_op_cost_and_scrape_from_sub_assemblies", 1) + frappe.db.set_single_value("Manufacturing Settings", "set_op_cost_and_scrap_from_sub_assemblies", 1) items = { "Test Final FG Item": 0, @@ -2137,7 +2137,7 @@ class TestWorkOrder(IntegrationTestCase): for row in se_doc.additional_costs: self.assertEqual(row.amount, 3000) - frappe.db.set_single_value("Manufacturing Settings", "set_op_cost_and_scrape_from_sub_assemblies", 0) + frappe.db.set_single_value("Manufacturing Settings", "set_op_cost_and_scrap_from_sub_assemblies", 0) @IntegrationTestCase.change_settings( "Manufacturing Settings", {"material_consumption": 1, "get_rm_cost_from_consumption_entry": 1} diff --git a/erpnext/patches.txt b/erpnext/patches.txt index c1155d79ed888220b37bd9a9df7c8fe3c7b41a2f..d27ca5a3a8bbbaa92f93d579efbbe9fe0ab17d61 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -433,4 +433,5 @@ erpnext.patches.v15_0.update_cc_in_process_statement_of_accounts erpnext.patches.v15_0.migrate_old_item_wise_tax_detail_data_format erpnext.patches.v15_0.refactor_closing_stock_balance #5 erpnext.patches.v15_0.set_is_exchange_gain_loss_in_payment_entry_deductions -erpnext.patches.v15_0.update_asset_status_to_work_in_progress \ No newline at end of file +erpnext.patches.v15_0.update_asset_status_to_work_in_progress +erpnext.patches.v15_0.migrate_checkbox_to_select_for_reconciliation_effect diff --git a/erpnext/patches/v15_0/rename_manufacturing_settings_field.py b/erpnext/patches/v15_0/rename_manufacturing_settings_field.py new file mode 100644 index 0000000000000000000000000000000000000000..af178753a738fce68aff9eedddc0e8c935b4f811 --- /dev/null +++ b/erpnext/patches/v15_0/rename_manufacturing_settings_field.py @@ -0,0 +1,9 @@ +from frappe.model.utils.rename_field import rename_field + + +def execute(): + rename_field( + "Manufacturing Settings", + "set_op_cost_and_scrape_from_sub_assemblies", + "set_op_cost_and_scrap_from_sub_assemblies", + ) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index e87dad0bb25f4ed21255b06baa09cc6a5592f279..f66b7804c382b62a453b3193800688aacb677d89 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -2063,7 +2063,7 @@ class StockEntry(StockController): from erpnext.manufacturing.doctype.bom.bom import get_bom_items_as_dict if ( - frappe.db.get_single_value("Manufacturing Settings", "set_op_cost_and_scrape_from_sub_assemblies") + frappe.db.get_single_value("Manufacturing Settings", "set_op_cost_and_scrap_from_sub_assemblies") and self.work_order and frappe.get_cached_value("Work Order", self.work_order, "use_multi_level_bom") ): @@ -2870,7 +2870,7 @@ def get_operating_cost_per_unit(work_order=None, bom_no=None): if ( bom_no and frappe.db.get_single_value( - "Manufacturing Settings", "set_op_cost_and_scrape_from_sub_assemblies" + "Manufacturing Settings", "set_op_cost_and_scrap_from_sub_assemblies" ) and frappe.get_cached_value("Work Order", work_order, "use_multi_level_bom") ):