diff --git a/erpnext/locale/main.pot b/erpnext/locale/main.pot
index 21fb2c6830e..2ce76e47917 100644
--- a/erpnext/locale/main.pot
+++ b/erpnext/locale/main.pot
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ERPNext VERSION\n"
"Report-Msgid-Bugs-To: hello@frappe.io\n"
-"POT-Creation-Date: 2026-03-29 09:46+0000\n"
-"PO-Revision-Date: 2026-03-29 09:46+0000\n"
+"POT-Creation-Date: 2026-04-05 09:48+0000\n"
+"PO-Revision-Date: 2026-04-05 09:48+0000\n"
"Last-Translator: hello@frappe.io\n"
"Language-Team: hello@frappe.io\n"
"MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.16.0\n"
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1520
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1558
msgid ""
"\n"
"\t\t\tThe Batch {0} of an item {1} has negative stock in the warehouse {2}{3}.\n"
@@ -149,6 +149,11 @@ msgstr ""
msgid "% Completed"
msgstr ""
+#. Label of the cost_allocation_per (Percent) field in DocType 'BOM'
+#: erpnext/manufacturing/doctype/bom/bom.json
+msgid "% Cost Allocation"
+msgstr ""
+
#. Label of the per_delivered (Percent) field in DocType 'Pick List'
#. Label of the per_delivered (Percent) field in DocType 'Subcontracting Inward
#. Order'
@@ -157,7 +162,7 @@ msgstr ""
msgid "% Delivered"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:1000
+#: erpnext/manufacturing/doctype/bom/bom.js:1017
#, python-format
msgid "% Finished Item Quantity"
msgstr ""
@@ -969,7 +974,7 @@ msgstr ""
msgid "A - C"
msgstr ""
-#: erpnext/selling/doctype/customer/customer.py:353
+#: erpnext/selling/doctype/customer/customer.py:354
msgid "A Customer Group exists with same name please change the Customer name or rename the Customer Group"
msgstr ""
@@ -1165,7 +1170,9 @@ msgid "Acceptance Criteria Value"
msgstr ""
#. Label of the qty (Float) field in DocType 'Purchase Invoice Item'
+#. Label of the qty (Float) field in DocType 'Subcontracting Receipt Item'
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
+#: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
msgid "Accepted Qty"
msgstr ""
@@ -1177,10 +1184,8 @@ msgid "Accepted Qty in Stock UOM"
msgstr ""
#. Label of the qty (Float) field in DocType 'Purchase Receipt Item'
-#. Label of the qty (Float) field in DocType 'Subcontracting Receipt Item'
-#: erpnext/public/js/controllers/transaction.js:2919
+#: erpnext/public/js/controllers/transaction.js:2923
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
-#: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
msgid "Accepted Quantity"
msgstr ""
@@ -1848,12 +1853,12 @@ msgstr ""
msgid "Accounting Entry for Asset"
msgstr ""
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1959
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1979
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1964
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1984
msgid "Accounting Entry for LCV in Stock Entry {0}"
msgstr ""
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:873
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:910
msgid "Accounting Entry for Landed Cost Voucher for SCR {0}"
msgstr ""
@@ -1873,9 +1878,9 @@ msgstr ""
#: erpnext/controllers/stock_controller.py:727
#: erpnext/controllers/stock_controller.py:744
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:937
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1904
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1918
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:708
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1909
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1923
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:745
msgid "Accounting Entry for Stock"
msgstr ""
@@ -2513,7 +2518,7 @@ msgstr ""
msgid "Add / Edit Prices"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.js:207
+#: erpnext/accounts/report/general_ledger/general_ledger.js:208
msgid "Add Columns in Transaction Currency"
msgstr ""
@@ -2604,7 +2609,7 @@ msgid "Add Quote"
msgstr ""
#. Label of the add_raw_materials (Button) field in DocType 'BOM Operation'
-#: erpnext/manufacturing/doctype/bom/bom.js:1028
+#: erpnext/manufacturing/doctype/bom/bom.js:1045
#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
msgid "Add Raw Materials"
msgstr ""
@@ -2689,7 +2694,7 @@ msgid "Add details"
msgstr ""
#: erpnext/stock/doctype/pick_list/pick_list.js:86
-#: erpnext/stock/doctype/pick_list/pick_list.py:905
+#: erpnext/stock/doctype/pick_list/pick_list.py:932
msgid "Add items in the Item Locations table"
msgstr ""
@@ -2880,7 +2885,7 @@ msgstr ""
msgid "Additional Discount Amount (Company Currency)"
msgstr ""
-#: erpnext/controllers/taxes_and_totals.py:796
+#: erpnext/controllers/taxes_and_totals.py:833
msgid "Additional Discount Amount ({discount_amount}) cannot exceed the total before such discount ({total_before_discount})"
msgstr ""
@@ -2917,6 +2922,21 @@ msgstr ""
msgid "Additional Discount Percentage"
msgstr ""
+#. Option for the 'Type' (Select) field in DocType 'BOM Secondary Item'
+#. Option for the 'Type' (Select) field in DocType 'Job Card Secondary Item'
+#. Option for the 'Type' (Select) field in DocType 'Stock Entry Detail'
+#. Option for the 'Type' (Select) field in DocType 'Subcontracting Inward Order
+#. Secondary Item'
+#. Option for the 'Type' (Select) field in DocType 'Subcontracting Receipt
+#. Item'
+#: erpnext/manufacturing/doctype/bom_secondary_item/bom_secondary_item.json
+#: erpnext/manufacturing/doctype/job_card_secondary_item/job_card_secondary_item.json
+#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
+#: erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json
+#: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
+msgid "Additional Finished Good"
+msgstr ""
+
#. Label of the addtional_info (Section Break) field in DocType 'Journal Entry'
#. Label of the additional_info_section (Section Break) field in DocType
#. 'Purchase Invoice'
@@ -2960,7 +2980,7 @@ msgstr ""
msgid "Additional Information updated successfully."
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.js:811
+#: erpnext/manufacturing/doctype/work_order/work_order.js:812
msgid "Additional Material Transfer"
msgstr ""
@@ -2997,7 +3017,7 @@ msgstr ""
msgid "Additional information regarding the customer."
msgstr ""
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:590
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:627
msgid "Additional {0} {1} of item {2} required as per BOM to complete this transaction"
msgstr ""
@@ -3264,7 +3284,7 @@ msgstr ""
msgid "Advance amount"
msgstr ""
-#: erpnext/controllers/taxes_and_totals.py:933
+#: erpnext/controllers/taxes_and_totals.py:970
msgid "Advance amount cannot be greater than {0} {1}"
msgstr ""
@@ -3480,7 +3500,7 @@ msgstr ""
msgid "Age (Days)"
msgstr ""
-#: erpnext/stock/report/stock_ageing/stock_ageing.py:220
+#: erpnext/stock/report/stock_ageing/stock_ageing.py:221
msgid "Age ({0})"
msgstr ""
@@ -3600,7 +3620,7 @@ msgstr ""
msgid "All Activities HTML"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:369
+#: erpnext/manufacturing/doctype/bom/bom.py:390
msgid "All BOMs"
msgstr ""
@@ -3745,11 +3765,11 @@ msgstr ""
msgid "All items have already been received"
msgstr ""
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:3111
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:3136
msgid "All items have already been transferred for this Work Order."
msgstr ""
-#: erpnext/public/js/controllers/transaction.js:3028
+#: erpnext/public/js/controllers/transaction.js:3032
msgid "All items in this document already have a linked Quality Inspection."
msgstr ""
@@ -3771,7 +3791,7 @@ msgstr ""
msgid "All the items have been already returned."
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1195
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1196
msgid "All the required items (raw materials) will be fetched from BOM and populated in this table. Here you can also change the Source Warehouse for any item. And during the production, you can track transferred raw materials from this table."
msgstr ""
@@ -3978,16 +3998,6 @@ msgstr ""
msgid "Allow Lead Duplication based on Emails"
msgstr ""
-#. Label of the allow_from_dn (Check) field in DocType 'Stock Settings'
-#: erpnext/stock/doctype/stock_settings/stock_settings.json
-msgid "Allow Material Transfer from Delivery Note to Sales Invoice"
-msgstr ""
-
-#. Label of the allow_from_pr (Check) field in DocType 'Stock Settings'
-#: erpnext/stock/doctype/stock_settings/stock_settings.json
-msgid "Allow Material Transfer from Purchase Receipt to Purchase Invoice"
-msgstr ""
-
#: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:9
msgid "Allow Multiple Material Consumption"
msgstr ""
@@ -4005,8 +4015,8 @@ msgstr ""
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
#: erpnext/stock/doctype/stock_settings/stock_settings.json
-#: erpnext/stock/doctype/stock_settings/stock_settings.py:217
-#: erpnext/stock/doctype/stock_settings/stock_settings.py:229
+#: erpnext/stock/doctype/stock_settings/stock_settings.py:215
+#: erpnext/stock/doctype/stock_settings/stock_settings.py:227
msgid "Allow Negative Stock"
msgstr ""
@@ -4308,7 +4318,7 @@ msgstr ""
msgid "Allows users to submit Supplier Quotations with zero quantity. Useful when rates are fixed but the quantities are not. Eg. Rate Contracts."
msgstr ""
-#: erpnext/stock/doctype/pick_list/pick_list.py:1048
+#: erpnext/stock/doctype/pick_list/pick_list.py:1081
msgid "Already Picked"
msgstr ""
@@ -4324,10 +4334,10 @@ msgstr ""
msgid "Also you can't switch back to FIFO after setting the valuation method to Moving Average for this item."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:250
+#: erpnext/manufacturing/doctype/bom/bom.js:288
#: erpnext/manufacturing/doctype/work_order/work_order.js:165
#: erpnext/manufacturing/doctype/work_order/work_order.js:180
-#: erpnext/public/js/utils.js:567
+#: erpnext/public/js/utils.js:571
#: erpnext/stock/doctype/stock_entry/stock_entry.js:288
msgid "Alternate Item"
msgstr ""
@@ -4429,7 +4439,6 @@ msgstr ""
#. Label of the amount (Currency) field in DocType 'BOM Creator Item'
#. Label of the amount (Currency) field in DocType 'BOM Explosion Item'
#. Label of the amount (Currency) field in DocType 'BOM Item'
-#. Label of the amount (Currency) field in DocType 'BOM Scrap Item'
#. Label of the amount (Currency) field in DocType 'Work Order Item'
#. Option for the 'Margin Type' (Select) field in DocType 'Quotation Item'
#. Label of the amount (Currency) field in DocType 'Quotation Item'
@@ -4524,9 +4533,8 @@ msgstr ""
#: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json
#: erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
#: erpnext/manufacturing/doctype/bom_item/bom_item.json
-#: erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.json
#: erpnext/manufacturing/doctype/work_order_item/work_order_item.json
-#: erpnext/public/js/controllers/transaction.js:506
+#: erpnext/public/js/controllers/transaction.js:510
#: erpnext/selling/doctype/quotation/quotation.js:316
#: erpnext/selling/doctype/quotation_item/quotation_item.json
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -4757,7 +4765,7 @@ msgstr ""
msgid "Analytical Accounting"
msgstr ""
-#: erpnext/public/js/utils.js:164
+#: erpnext/public/js/utils.js:168
msgid "Annual Billing: {0}"
msgstr ""
@@ -5231,7 +5239,7 @@ msgstr ""
msgid "As there are existing submitted transactions against item {0}, you can not change the value of {1}."
msgstr ""
-#: erpnext/stock/doctype/stock_settings/stock_settings.py:242
+#: erpnext/stock/doctype/stock_settings/stock_settings.py:240
msgid "As there are reserved stock, you cannot disable {0}."
msgstr ""
@@ -5239,12 +5247,12 @@ msgstr ""
msgid "As there are sufficient Sub Assembly Items, Work Order is not required for Warehouse {0}."
msgstr ""
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1832
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1834
msgid "As there are sufficient raw materials, Material Request is not required for Warehouse {0}."
msgstr ""
-#: erpnext/stock/doctype/stock_settings/stock_settings.py:216
-#: erpnext/stock/doctype/stock_settings/stock_settings.py:228
+#: erpnext/stock/doctype/stock_settings/stock_settings.py:214
+#: erpnext/stock/doctype/stock_settings/stock_settings.py:226
msgid "As {0} is enabled, you can not enable {1}."
msgstr ""
@@ -5775,7 +5783,7 @@ msgstr ""
msgid "Asset {0} must be submitted"
msgstr ""
-#: erpnext/controllers/buying_controller.py:1030
+#: erpnext/controllers/buying_controller.py:1034
msgid "Asset {assets_link} created for {item_code}"
msgstr ""
@@ -5813,11 +5821,11 @@ msgstr ""
msgid "Assets Setup"
msgstr ""
-#: erpnext/controllers/buying_controller.py:1048
+#: erpnext/controllers/buying_controller.py:1052
msgid "Assets not created for {item_code}. You will have to create asset manually."
msgstr ""
-#: erpnext/controllers/buying_controller.py:1035
+#: erpnext/controllers/buying_controller.py:1039
msgid "Assets {assets_link} created for {item_code}"
msgstr ""
@@ -5841,11 +5849,11 @@ msgstr ""
msgid "Associate"
msgstr ""
-#: erpnext/stock/doctype/pick_list/pick_list.py:134
+#: erpnext/stock/doctype/pick_list/pick_list.py:135
msgid "At Row #{0}: The picked quantity {1} for the item {2} is greater than available stock {3} for the batch {4} in the warehouse {5}. Please restock the item."
msgstr ""
-#: erpnext/stock/doctype/pick_list/pick_list.py:159
+#: erpnext/stock/doctype/pick_list/pick_list.py:160
msgid "At Row #{0}: The picked quantity {1} for the item {2} is greater than available stock {3} in the warehouse {4}."
msgstr ""
@@ -6184,7 +6192,7 @@ msgstr ""
msgid "Auto Reserve Stock for Sales Order on Purchase"
msgstr ""
-#: erpnext/accounts/doctype/accounts_settings/accounts_settings.py:185
+#: erpnext/accounts/doctype/accounts_settings/accounts_settings.py:186
msgid "Auto Tax Settings Error"
msgstr ""
@@ -6311,10 +6319,10 @@ msgstr ""
#: erpnext/manufacturing/doctype/workstation/workstation.js:505
#: erpnext/manufacturing/report/bom_stock_analysis/bom_stock_analysis.py:118
#: erpnext/manufacturing/report/bom_stock_analysis/bom_stock_analysis.py:175
-#: erpnext/public/js/utils.js:627
+#: erpnext/public/js/utils.js:631
#: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
#: erpnext/stock/doctype/pick_list_item/pick_list_item.json
-#: erpnext/stock/report/stock_ageing/stock_ageing.py:169
+#: erpnext/stock/report/stock_ageing/stock_ageing.py:170
msgid "Available Qty"
msgstr ""
@@ -6415,8 +6423,8 @@ msgstr ""
msgid "Available-for-use Date should be after purchase date"
msgstr ""
-#: erpnext/stock/report/stock_ageing/stock_ageing.py:170
-#: erpnext/stock/report/stock_ageing/stock_ageing.py:204
+#: erpnext/stock/report/stock_ageing/stock_ageing.py:171
+#: erpnext/stock/report/stock_ageing/stock_ageing.py:205
#: erpnext/stock/report/stock_balance/stock_balance.py:590
msgid "Average Age"
msgstr ""
@@ -6548,7 +6556,7 @@ msgstr ""
msgid "BOM 1"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1760
+#: erpnext/manufacturing/doctype/bom/bom.py:1806
msgid "BOM 1 {0} and BOM 2 {1} should not be same"
msgstr ""
@@ -6693,11 +6701,6 @@ msgstr ""
msgid "BOM Rate"
msgstr ""
-#. Name of a DocType
-#: erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.json
-msgid "BOM Scrap Item"
-msgstr ""
-
#. Label of a Link in the Manufacturing Workspace
#. Name of a report
#. Label of a Workspace Sidebar Item
@@ -6707,6 +6710,19 @@ msgstr ""
msgid "BOM Search"
msgstr ""
+#. Name of a DocType
+#. Label of the bom_secondary_item (Data) field in DocType 'Stock Entry Detail'
+#: erpnext/manufacturing/doctype/bom_secondary_item/bom_secondary_item.json
+#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
+msgid "BOM Secondary Item"
+msgstr ""
+
+#. Label of the bom_secondary_item (Data) field in DocType 'Job Card Secondary
+#. Item'
+#: erpnext/manufacturing/doctype/job_card_secondary_item/job_card_secondary_item.json
+msgid "BOM Secondary Item Reference"
+msgstr ""
+
#. Name of a report
#: erpnext/manufacturing/report/bom_stock_analysis/bom_stock_analysis.json
msgid "BOM Stock Analysis"
@@ -6775,14 +6791,10 @@ msgstr ""
msgid "BOM Website Operation"
msgstr ""
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2279
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:2284
msgid "BOM and Finished Good Quantity is mandatory for Disassembly"
msgstr ""
-#: erpnext/stock/doctype/stock_entry/stock_entry.js:1343
-msgid "BOM and Manufacturing Quantity are required"
-msgstr ""
-
#. Label of the bom_and_work_order_tab (Tab Break) field in DocType
#. 'Manufacturing Settings'
#: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
@@ -6798,23 +6810,23 @@ msgstr ""
msgid "BOM recursion: {0} cannot be child of {1}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:751
+#: erpnext/manufacturing/doctype/bom/bom.py:789
msgid "BOM recursion: {1} cannot be parent or child of {0}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1494
+#: erpnext/manufacturing/doctype/bom/bom.py:1540
msgid "BOM {0} does not belong to Item {1}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1476
+#: erpnext/manufacturing/doctype/bom/bom.py:1522
msgid "BOM {0} must be active"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1479
+#: erpnext/manufacturing/doctype/bom/bom.py:1525
msgid "BOM {0} must be submitted"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:839
+#: erpnext/manufacturing/doctype/bom/bom.py:877
msgid "BOM {0} not found for the item {1}"
msgstr ""
@@ -7356,6 +7368,11 @@ msgstr ""
msgid "Base Change Amount (Company Currency)"
msgstr ""
+#. Label of the base_cost (Currency) field in DocType 'BOM Secondary Item'
+#: erpnext/manufacturing/doctype/bom_secondary_item/bom_secondary_item.json
+msgid "Base Cost (Company Currency)"
+msgstr ""
+
#. Label of the base_cost_per_unit (Float) field in DocType 'BOM Operation'
#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
msgid "Base Cost Per Unit"
@@ -7444,16 +7461,9 @@ msgstr ""
msgid "Basic Amount"
msgstr ""
-#. Label of the base_amount (Currency) field in DocType 'BOM Scrap Item'
-#: erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.json
-msgid "Basic Amount (Company Currency)"
-msgstr ""
-
#. Label of the base_rate (Currency) field in DocType 'BOM Item'
-#. Label of the base_rate (Currency) field in DocType 'BOM Scrap Item'
#. Label of the base_rate (Currency) field in DocType 'Sales Order Item'
#: erpnext/manufacturing/doctype/bom_item/bom_item.json
-#: erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.json
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
msgid "Basic Rate (Company Currency)"
msgstr ""
@@ -7544,7 +7554,7 @@ msgstr ""
#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:89
#: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:115
-#: erpnext/public/js/controllers/transaction.js:2945
+#: erpnext/public/js/controllers/transaction.js:2949
#: erpnext/public/js/utils/barcode_scanner.js:281
#: erpnext/public/js/utils/serial_no_batch_selector.js:438
#: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
@@ -7579,7 +7589,7 @@ msgstr ""
msgid "Batch No is mandatory"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:3397
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:3435
msgid "Batch No {0} does not exists"
msgstr ""
@@ -7602,7 +7612,7 @@ msgstr ""
msgid "Batch Nos"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1938
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1976
msgid "Batch Nos are created successfully"
msgstr ""
@@ -7668,12 +7678,12 @@ msgstr ""
msgid "Batch {0} is not available in warehouse {1}"
msgstr ""
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:3288
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:3320
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:290
msgid "Batch {0} of Item {1} has expired."
msgstr ""
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:3294
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:3326
msgid "Batch {0} of Item {1} is disabled."
msgstr ""
@@ -7740,7 +7750,7 @@ msgstr ""
#. Label of a Card Break in the Manufacturing Workspace
#. Label of a Link in the Manufacturing Workspace
#. Label of a Workspace Sidebar Item
-#: erpnext/manufacturing/doctype/bom/bom.py:1326
+#: erpnext/manufacturing/doctype/bom/bom.py:1372
#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
#: erpnext/stock/doctype/material_request/material_request.js:139
#: erpnext/stock/doctype/stock_entry/stock_entry.js:695
@@ -8269,7 +8279,7 @@ msgstr ""
msgid "Brokerage"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:193
+#: erpnext/manufacturing/doctype/bom/bom.js:231
msgid "Browse BOM"
msgstr ""
@@ -8577,6 +8587,21 @@ msgstr ""
msgid "By default, the Supplier Name is set as per the Supplier Name entered. If you want Suppliers to be named by a Naming Series choose the 'Naming Series' option."
msgstr ""
+#. Option for the 'Type' (Select) field in DocType 'BOM Secondary Item'
+#. Option for the 'Type' (Select) field in DocType 'Job Card Secondary Item'
+#. Option for the 'Type' (Select) field in DocType 'Stock Entry Detail'
+#. Option for the 'Type' (Select) field in DocType 'Subcontracting Inward Order
+#. Secondary Item'
+#. Option for the 'Type' (Select) field in DocType 'Subcontracting Receipt
+#. Item'
+#: erpnext/manufacturing/doctype/bom_secondary_item/bom_secondary_item.json
+#: erpnext/manufacturing/doctype/job_card_secondary_item/job_card_secondary_item.json
+#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
+#: erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json
+#: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
+msgid "By-Product"
+msgstr ""
+
#. Label of the bypass_credit_limit_check (Check) field in DocType 'Customer
#. Credit Limit'
#: erpnext/selling/doctype/customer_credit_limit/customer_credit_limit.json
@@ -8886,7 +8911,7 @@ msgstr ""
msgid "Can be approved by {0}"
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2529
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2530
msgid "Can not close Work Order. Since {0} Job Cards are in Work In Progress state."
msgstr ""
@@ -8926,7 +8951,7 @@ msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Pre
msgstr ""
#: erpnext/setup/doctype/company/company.py:207
-#: erpnext/stock/doctype/stock_settings/stock_settings.py:183
+#: erpnext/stock/doctype/stock_settings/stock_settings.py:181
msgid "Can't change the valuation method, as there are transactions against some items which do not have its own valuation method"
msgstr ""
@@ -9033,7 +9058,7 @@ msgstr ""
msgid "Cannot cancel the transaction. Reposting of item valuation on submission is not completed yet."
msgstr ""
-#: erpnext/controllers/subcontracting_inward_controller.py:587
+#: erpnext/controllers/subcontracting_inward_controller.py:592
msgid "Cannot cancel this Manufacturing Stock Entry as quantity of Finished Good produced cannot be less than quantity delivered in the linked Subcontracting Inward Order."
msgstr ""
@@ -9041,7 +9066,7 @@ msgstr ""
msgid "Cannot cancel this document as it is linked with the submitted Asset Value Adjustment {0}. Please cancel the Asset Value Adjustment to continue."
msgstr ""
-#: erpnext/controllers/buying_controller.py:1137
+#: erpnext/controllers/buying_controller.py:1141
msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue."
msgstr ""
@@ -9094,7 +9119,7 @@ msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipt
msgstr ""
#: erpnext/selling/doctype/sales_order/sales_order.py:1886
-#: erpnext/stock/doctype/pick_list/pick_list.py:254
+#: erpnext/stock/doctype/pick_list/pick_list.py:255
msgid "Cannot create a pick list for Sales Order {0} because it has reserved stock. Please unreserve the stock in order to create a pick list."
msgstr ""
@@ -9106,7 +9131,7 @@ msgstr ""
msgid "Cannot create return for consolidated invoice {0}."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1177
+#: erpnext/manufacturing/doctype/bom/bom.py:1210
msgid "Cannot deactivate or cancel BOM as it is linked with other BOMs"
msgstr ""
@@ -9140,7 +9165,7 @@ msgstr ""
msgid "Cannot delete virtual DocType: {0}. Virtual DocTypes do not have database tables."
msgstr ""
-#: erpnext/stock/doctype/stock_settings/stock_settings.py:148
+#: erpnext/stock/doctype/stock_settings/stock_settings.py:146
msgid "Cannot disable Serial and Batch No for Item, as there are existing records for serial / batch."
msgstr ""
@@ -9148,7 +9173,7 @@ msgstr ""
msgid "Cannot disable perpetual inventory, as there are existing Stock Ledger Entries for the company {0}. Please cancel the stock transactions first and try again."
msgstr ""
-#: erpnext/stock/doctype/stock_settings/stock_settings.py:129
+#: erpnext/stock/doctype/stock_settings/stock_settings.py:127
msgid "Cannot disable {0} as it may lead to incorrect stock valuation."
msgstr ""
@@ -9219,6 +9244,10 @@ msgstr ""
msgid "Cannot retrieve link token. Check Error Log for more information"
msgstr ""
+#: erpnext/selling/doctype/customer/customer.py:367
+msgid "Cannot select a Group type Customer Group. Please select a non-group Customer Group."
+msgstr ""
+
#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1523
#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1701
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1827
@@ -9485,12 +9514,12 @@ msgstr ""
msgid "Categorize By"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.js:116
+#: erpnext/accounts/report/general_ledger/general_ledger.js:117
#: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:80
msgid "Categorize by"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.js:129
+#: erpnext/accounts/report/general_ledger/general_ledger.js:130
msgid "Categorize by Account"
msgstr ""
@@ -9498,7 +9527,7 @@ msgstr ""
msgid "Categorize by Item"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.js:133
+#: erpnext/accounts/report/general_ledger/general_ledger.js:134
msgid "Categorize by Party"
msgstr ""
@@ -9510,14 +9539,14 @@ msgstr ""
#. Option for the 'Categorize By' (Select) field in DocType 'Process Statement
#. Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
-#: erpnext/accounts/report/general_ledger/general_ledger.js:121
+#: erpnext/accounts/report/general_ledger/general_ledger.js:122
msgid "Categorize by Voucher"
msgstr ""
#. Option for the 'Categorize By' (Select) field in DocType 'Process Statement
#. Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
-#: erpnext/accounts/report/general_ledger/general_ledger.js:125
+#: erpnext/accounts/report/general_ledger/general_ledger.js:126
msgid "Categorize by Voucher (Consolidated)"
msgstr ""
@@ -9855,7 +9884,7 @@ msgstr ""
#. Label of the reference_date (Date) field in DocType 'Payment Entry'
#: erpnext/accounts/doctype/payment_entry/payment_entry.json
-#: erpnext/public/js/controllers/transaction.js:2856
+#: erpnext/public/js/controllers/transaction.js:2860
msgid "Cheque/Reference Date"
msgstr ""
@@ -9909,7 +9938,7 @@ msgstr ""
#. Label of the child_row_reference (Data) field in DocType 'Quality
#. Inspection'
-#: erpnext/public/js/controllers/transaction.js:2951
+#: erpnext/public/js/controllers/transaction.js:2955
#: erpnext/stock/doctype/quality_inspection/quality_inspection.json
msgid "Child Row Reference"
msgstr ""
@@ -10081,7 +10110,7 @@ msgstr ""
msgid "Closed Documents"
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2452
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2453
msgid "Closed Work Order can not be stopped or Re-opened"
msgstr ""
@@ -10166,6 +10195,21 @@ msgstr ""
msgid "Closing [Opening + Total] "
msgstr ""
+#. Option for the 'Type' (Select) field in DocType 'BOM Secondary Item'
+#. Option for the 'Type' (Select) field in DocType 'Job Card Secondary Item'
+#. Option for the 'Type' (Select) field in DocType 'Stock Entry Detail'
+#. Option for the 'Type' (Select) field in DocType 'Subcontracting Inward Order
+#. Secondary Item'
+#. Option for the 'Type' (Select) field in DocType 'Subcontracting Receipt
+#. Item'
+#: erpnext/manufacturing/doctype/bom_secondary_item/bom_secondary_item.json
+#: erpnext/manufacturing/doctype/job_card_secondary_item/job_card_secondary_item.json
+#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
+#: erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json
+#: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
+msgid "Co-Product"
+msgstr ""
+
#. Name of a DocType
#. Label of the code_list (Link) field in DocType 'Common Code'
#: erpnext/edi/doctype/code_list/code_list.json
@@ -11098,8 +11142,8 @@ msgstr ""
msgid "Completed Qty cannot be greater than 'Qty to Manufacture'"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:325
-#: erpnext/manufacturing/doctype/job_card/job_card.js:446
+#: erpnext/manufacturing/doctype/job_card/job_card.js:323
+#: erpnext/manufacturing/doctype/job_card/job_card.js:444
#: erpnext/manufacturing/doctype/workstation/workstation.js:296
msgid "Completed Quantity"
msgstr ""
@@ -11235,7 +11279,7 @@ msgstr ""
msgid "Connection"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.js:175
+#: erpnext/accounts/report/general_ledger/general_ledger.js:176
msgid "Consider Accounting Dimensions"
msgstr ""
@@ -11245,7 +11289,7 @@ msgstr ""
msgid "Consider Minimum Order Qty"
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1017
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1018
msgid "Consider Process Loss"
msgstr ""
@@ -11465,7 +11509,7 @@ msgstr ""
msgid "Consumed Stock Total Value"
msgstr ""
-#: erpnext/stock/doctype/stock_entry_type/stock_entry_type.py:127
+#: erpnext/stock/doctype/stock_entry_type/stock_entry_type.py:132
msgid "Consumed quantity of item {0} exceeds transferred quantity."
msgstr ""
@@ -11718,6 +11762,7 @@ msgstr ""
#. Item Supplied'
#. Label of the conversion_factor (Float) field in DocType 'BOM Creator Item'
#. Label of the conversion_factor (Float) field in DocType 'BOM Item'
+#. Label of the conversion_factor (Float) field in DocType 'BOM Secondary Item'
#. Label of the conversion_factor (Float) field in DocType 'Material Request
#. Plan Item'
#. Label of the conversion_factor (Float) field in DocType 'Delivery Schedule
@@ -11745,8 +11790,9 @@ msgstr ""
#: erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json
#: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json
#: erpnext/manufacturing/doctype/bom_item/bom_item.json
+#: erpnext/manufacturing/doctype/bom_secondary_item/bom_secondary_item.json
#: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
-#: erpnext/public/js/utils.js:882
+#: erpnext/public/js/utils.js:886
#: erpnext/selling/doctype/delivery_schedule_item/delivery_schedule_item.json
#: erpnext/stock/doctype/packed_item/packed_item.json
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -11854,13 +11900,13 @@ msgstr ""
msgid "Corrective Action"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:503
+#: erpnext/manufacturing/doctype/job_card/job_card.js:501
msgid "Corrective Job Card"
msgstr ""
#. Label of the corrective_operation_section (Tab Break) field in DocType 'Job
#. Card'
-#: erpnext/manufacturing/doctype/job_card/job_card.js:510
+#: erpnext/manufacturing/doctype/job_card/job_card.js:508
#: erpnext/manufacturing/doctype/job_card/job_card.json
msgid "Corrective Operation"
msgstr ""
@@ -11882,10 +11928,24 @@ msgid "Cosmetics"
msgstr ""
#. Label of the cost (Currency) field in DocType 'Subscription Plan'
+#. Label of the cost (Currency) field in DocType 'BOM Secondary Item'
#: erpnext/accounts/doctype/subscription_plan/subscription_plan.json
+#: erpnext/manufacturing/doctype/bom_secondary_item/bom_secondary_item.json
msgid "Cost"
msgstr ""
+#. Label of the cost_allocation_section (Section Break) field in DocType 'BOM'
+#. Label of the cost_allocation (Currency) field in DocType 'BOM'
+#: erpnext/manufacturing/doctype/bom/bom.json
+msgid "Cost Allocation"
+msgstr ""
+
+#. Label of the cost_allocation_per (Percent) field in DocType 'BOM Secondary
+#. Item'
+#: erpnext/manufacturing/doctype/bom_secondary_item/bom_secondary_item.json
+msgid "Cost Allocation %"
+msgstr ""
+
#. Label of the cost_center (Link) field in DocType 'Account Closing Balance'
#. Label of the cost_center (Link) field in DocType 'Advance Taxes and Charges'
#. Option for the 'Budget Against' (Select) field in DocType 'Budget'
@@ -12007,7 +12067,7 @@ msgstr ""
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:42
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:98
-#: erpnext/accounts/report/general_ledger/general_ledger.js:153
+#: erpnext/accounts/report/general_ledger/general_ledger.js:154
#: erpnext/accounts/report/general_ledger/general_ledger.py:776
#: erpnext/accounts/report/gross_profit/gross_profit.js:68
#: erpnext/accounts/report/gross_profit/gross_profit.py:395
@@ -12145,6 +12205,10 @@ msgstr ""
msgid "Cost Per Unit"
msgstr ""
+#: erpnext/manufacturing/doctype/bom/bom.py:441
+msgid "Cost allocation between finished goods and secondary items should equal 100%"
+msgstr ""
+
#. Title of an incoterm
#: erpnext/setup/doctype/incoterm/incoterms.csv:8
msgid "Cost and Freight"
@@ -12240,7 +12304,7 @@ msgstr ""
msgid "Costing and Billing fields has been updated"
msgstr ""
-#: erpnext/setup/demo.py:55
+#: erpnext/setup/demo.py:78
msgid "Could Not Delete Demo Data"
msgstr ""
@@ -12524,11 +12588,11 @@ msgstr ""
msgid "Create Payment Entry for Consolidated POS Invoices."
msgstr ""
-#: erpnext/public/js/controllers/transaction.js:513
+#: erpnext/public/js/controllers/transaction.js:517
msgid "Create Payment Request"
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.js:793
+#: erpnext/manufacturing/doctype/work_order/work_order.js:794
msgid "Create Pick List"
msgstr ""
@@ -12740,7 +12804,7 @@ msgstr ""
msgid "Create a variant with the template image."
msgstr ""
-#: erpnext/stock/stock_ledger.py:2065
+#: erpnext/stock/stock_ledger.py:2072
msgid "Create an incoming stock transaction for the Item."
msgstr ""
@@ -12847,7 +12911,11 @@ msgstr ""
msgid "Creating User..."
msgstr ""
-#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py:300
+#: erpnext/setup/setup_wizard/setup_wizard.py:36
+msgid "Creating demo data"
+msgstr ""
+
+#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py:305
msgid "Creating {} out of {} {}"
msgstr ""
@@ -12978,7 +13046,7 @@ msgstr ""
msgid "Credit Limit"
msgstr ""
-#: erpnext/selling/doctype/customer/customer.py:630
+#: erpnext/selling/doctype/customer/customer.py:642
msgid "Credit Limit Crossed"
msgstr ""
@@ -13071,16 +13139,16 @@ msgstr ""
msgid "Credit in Company Currency"
msgstr ""
-#: erpnext/selling/doctype/customer/customer.py:596
-#: erpnext/selling/doctype/customer/customer.py:651
+#: erpnext/selling/doctype/customer/customer.py:608
+#: erpnext/selling/doctype/customer/customer.py:663
msgid "Credit limit has been crossed for customer {0} ({1}/{2})"
msgstr ""
-#: erpnext/selling/doctype/customer/customer.py:382
+#: erpnext/selling/doctype/customer/customer.py:394
msgid "Credit limit is already defined for the Company {0}"
msgstr ""
-#: erpnext/selling/doctype/customer/customer.py:650
+#: erpnext/selling/doctype/customer/customer.py:662
msgid "Credit limit reached for customer {0}"
msgstr ""
@@ -13135,7 +13203,7 @@ msgstr ""
msgid "Criteria weights must add up to 100%"
msgstr ""
-#: erpnext/accounts/doctype/accounts_settings/accounts_settings.py:172
+#: erpnext/accounts/doctype/accounts_settings/accounts_settings.py:173
msgid "Cron Interval should be between 1 and 59 Min"
msgstr ""
@@ -13272,7 +13340,7 @@ msgstr ""
msgid "Currency of the Closing Account must be {0}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:685
+#: erpnext/manufacturing/doctype/bom/bom.py:723
msgid "Currency of the price list {0} must be {1} or {2}"
msgstr ""
@@ -15329,9 +15397,10 @@ msgstr ""
msgid "Delimiter options"
msgstr ""
-#. Label of the deliver_scrap_items (Check) field in DocType 'Selling Settings'
+#. Label of the deliver_secondary_items (Check) field in DocType 'Selling
+#. Settings'
#: erpnext/selling/doctype/selling_settings/selling_settings.json
-msgid "Deliver Scrap Items"
+msgid "Deliver Secondary Items"
msgstr ""
#. Option for the 'Status' (Select) field in DocType 'Purchase Order'
@@ -15394,7 +15463,7 @@ msgstr ""
#. Label of the delivered_qty (Float) field in DocType 'Subcontracting Inward
#. Order Item'
#. Label of the delivered_qty (Float) field in DocType 'Subcontracting Inward
-#. Order Scrap Item'
+#. Order Secondary Item'
#: erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -15404,7 +15473,7 @@ msgstr ""
#: erpnext/stock/report/reserved_stock/reserved_stock.py:131
#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:63
#: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json
-#: erpnext/subcontracting/doctype/subcontracting_inward_order_scrap_item/subcontracting_inward_order_scrap_item.json
+#: erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json
msgid "Delivered Qty"
msgstr ""
@@ -15440,7 +15509,7 @@ msgstr ""
#: erpnext/manufacturing/doctype/master_production_schedule_item/master_production_schedule_item.json
#: erpnext/manufacturing/doctype/sales_forecast_item/sales_forecast_item.json
#: erpnext/manufacturing/report/material_requirements_planning_report/material_requirements_planning_report.py:1067
-#: erpnext/public/js/utils.js:875
+#: erpnext/public/js/utils.js:879
#: erpnext/selling/doctype/delivery_schedule_item/delivery_schedule_item.json
#: erpnext/selling/doctype/sales_order/sales_order.js:624
#: erpnext/selling/doctype/sales_order/sales_order.js:1490
@@ -15666,10 +15735,18 @@ msgstr ""
msgid "Demo Company"
msgstr ""
+#: erpnext/setup/demo.py:51
+msgid "Demo Data creation failed."
+msgstr ""
+
#: erpnext/public/js/utils/demo.js:25
msgid "Demo data cleared"
msgstr ""
+#: erpnext/setup/demo.py:42
+msgid "Demo data creation failed. Check notifications for more info."
+msgstr ""
+
#: erpnext/setup/setup_wizard/data/industry_type.txt:18
msgid "Department Stores"
msgstr ""
@@ -16208,7 +16285,7 @@ msgstr ""
msgid "Disassemble Order"
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.js:443
+#: erpnext/manufacturing/doctype/work_order/work_order.js:444
msgid "Disassemble Qty cannot be less than or equal to 0."
msgstr ""
@@ -16725,7 +16802,7 @@ msgstr ""
msgid "Do Not Use Batch-wise Valuation"
msgstr ""
-#: erpnext/stock/doctype/stock_settings/stock_settings.py:130
+#: erpnext/stock/doctype/stock_settings/stock_settings.py:128
msgid "Do Not Use Batchwise Valuation"
msgstr ""
@@ -17237,7 +17314,7 @@ msgstr ""
msgid "Each Transaction"
msgstr ""
-#: erpnext/stock/report/stock_ageing/stock_ageing.py:176
+#: erpnext/stock/report/stock_ageing/stock_ageing.py:177
msgid "Earliest"
msgstr ""
@@ -17655,7 +17732,7 @@ msgstr ""
msgid "Employee {0} does not belong to the company {1}"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:357
+#: erpnext/manufacturing/doctype/job_card/job_card.py:375
msgid "Employee {0} is currently working on another workstation. Please assign another employee."
msgstr ""
@@ -17832,6 +17909,18 @@ msgstr ""
msgid "Enable Stock Reservation"
msgstr ""
+#. Label of the enable_subscription (Check) field in DocType 'Accounts
+#. Settings'
+#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+msgid "Enable Subscription"
+msgstr ""
+
+#. Description of the 'Enable Subscription' (Check) field in DocType 'Accounts
+#. Settings'
+#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+msgid "Enable Subscription tracking in invoice"
+msgstr ""
+
#. Label of the enable_utm (Check) field in DocType 'Selling Settings'
#: erpnext/selling/doctype/selling_settings/selling_settings.json
msgid "Enable UTM"
@@ -17933,8 +18022,8 @@ msgstr ""
#. Label of the end_time (Time) field in DocType 'Stock Reposting Settings'
#. Label of the end_time (Time) field in DocType 'Service Day'
#. Label of the end_time (Datetime) field in DocType 'Call Log'
-#: erpnext/manufacturing/doctype/job_card/job_card.js:383
-#: erpnext/manufacturing/doctype/job_card/job_card.js:453
+#: erpnext/manufacturing/doctype/job_card/job_card.js:381
+#: erpnext/manufacturing/doctype/job_card/job_card.js:451
#: erpnext/manufacturing/doctype/workstation_working_hour/workstation_working_hour.json
#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json
#: erpnext/support/doctype/service_day/service_day.json
@@ -18019,8 +18108,8 @@ msgstr ""
msgid "Enter Serial Nos"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:410
-#: erpnext/manufacturing/doctype/job_card/job_card.js:479
+#: erpnext/manufacturing/doctype/job_card/job_card.js:408
+#: erpnext/manufacturing/doctype/job_card/job_card.js:477
#: erpnext/manufacturing/doctype/workstation/workstation.js:312
msgid "Enter Value"
msgstr ""
@@ -18096,11 +18185,11 @@ msgstr ""
msgid "Enter the opening stock units."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:973
+#: erpnext/manufacturing/doctype/bom/bom.js:990
msgid "Enter the quantity of the Item that will be manufactured from this Bill of Materials."
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1157
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1158
msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set."
msgstr ""
@@ -18161,7 +18250,7 @@ msgstr ""
msgid "Error Description"
msgstr ""
-#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py:290
+#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py:295
msgid "Error Occurred"
msgstr ""
@@ -18262,7 +18351,7 @@ msgstr ""
msgid "Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings."
msgstr ""
-#: erpnext/stock/stock_ledger.py:2328
+#: erpnext/stock/stock_ledger.py:2335
msgid "Example: Serial No {0} reserved in {1}."
msgstr ""
@@ -18276,7 +18365,7 @@ msgstr ""
msgid "Excess Materials Consumed"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1114
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1132
msgid "Excess Transfer"
msgstr ""
@@ -18712,7 +18801,7 @@ msgstr ""
msgid "Expenses Included In Valuation"
msgstr ""
-#: erpnext/stock/doctype/pick_list/pick_list.py:306
+#: erpnext/stock/doctype/pick_list/pick_list.py:307
#: erpnext/stock/doctype/stock_entry/stock_entry.js:409
msgid "Expired Batches"
msgstr ""
@@ -18786,7 +18875,7 @@ msgstr ""
msgid "Extra Consumed Qty"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:254
+#: erpnext/manufacturing/doctype/job_card/job_card.py:262
msgid "Extra Job Card Quantity"
msgstr ""
@@ -18868,20 +18957,18 @@ msgstr ""
msgid "Failed to Authenticate the API key."
msgstr ""
-#: erpnext/setup/demo.py:54
+#: erpnext/setup/setup_wizard/setup_wizard.py:37
+#: erpnext/setup/setup_wizard/setup_wizard.py:38
+msgid "Failed to create demo data"
+msgstr ""
+
+#: erpnext/setup/demo.py:77
msgid "Failed to erase demo data, please delete the demo company manually."
msgstr ""
-#: erpnext/setup/setup_wizard/setup_wizard.py:25
-#: erpnext/setup/setup_wizard/setup_wizard.py:26
-msgid "Failed to install presets"
-msgstr ""
-
+#: erpnext/setup/setup_wizard/setup_wizard.py:16
#: erpnext/setup/setup_wizard/setup_wizard.py:17
-#: erpnext/setup/setup_wizard/setup_wizard.py:18
-#: erpnext/setup/setup_wizard/setup_wizard.py:42
-#: erpnext/setup/setup_wizard/setup_wizard.py:43
-msgid "Failed to login"
+msgid "Failed to install presets"
msgstr ""
#: erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py:164
@@ -18896,12 +18983,16 @@ msgstr ""
msgid "Failed to send email for campaign {0} to {1}"
msgstr ""
-#: erpnext/setup/setup_wizard/setup_wizard.py:30
-#: erpnext/setup/setup_wizard/setup_wizard.py:31
+#: erpnext/setup/setup_wizard/setup_wizard.py:26
+msgid "Failed to set defaults"
+msgstr ""
+
+#: erpnext/setup/setup_wizard/setup_wizard.py:21
+#: erpnext/setup/setup_wizard/setup_wizard.py:22
msgid "Failed to setup company"
msgstr ""
-#: erpnext/setup/setup_wizard/setup_wizard.py:37
+#: erpnext/setup/setup_wizard/setup_wizard.py:28
msgid "Failed to setup defaults"
msgstr ""
@@ -18978,6 +19069,12 @@ msgstr ""
msgid "Fetch Overdue Payments"
msgstr ""
+#. Label of the fetch_payment_schedule_in_payment_request (Check) field in
+#. DocType 'Accounts Settings'
+#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+msgid "Fetch Payment Schedule In Payment Request"
+msgstr ""
+
#: erpnext/accounts/doctype/subscription/subscription.js:36
msgid "Fetch Subscription Updates"
msgstr ""
@@ -19026,7 +19123,7 @@ msgid "Fetching Sales Orders..."
msgstr ""
#: erpnext/accounts/doctype/dunning/dunning.js:135
-#: erpnext/public/js/controllers/transaction.js:1593
+#: erpnext/public/js/controllers/transaction.js:1597
msgid "Fetching exchange rates ..."
msgstr ""
@@ -19266,9 +19363,9 @@ msgstr ""
msgid "Financial reports will be generated using GL Entry doctypes (should be enabled if Period Closing Voucher is not posted for all years sequentially or missing) "
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.js:877
-#: erpnext/manufacturing/doctype/work_order/work_order.js:892
-#: erpnext/manufacturing/doctype/work_order/work_order.js:901
+#: erpnext/manufacturing/doctype/work_order/work_order.js:878
+#: erpnext/manufacturing/doctype/work_order/work_order.js:893
+#: erpnext/manufacturing/doctype/work_order/work_order.js:902
msgid "Finish"
msgstr ""
@@ -19299,20 +19396,20 @@ msgstr ""
#. Service Item'
#. Label of the fg_item (Link) field in DocType 'Subcontracting Order Service
#. Item'
-#: erpnext/public/js/utils.js:901
+#: erpnext/public/js/utils.js:905
#: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json
#: erpnext/subcontracting/doctype/subcontracting_order_service_item/subcontracting_order_service_item.json
msgid "Finished Good Item"
msgstr ""
#. Label of the fg_item_code (Link) field in DocType 'Subcontracting Inward
-#. Order Scrap Item'
+#. Order Secondary Item'
#: erpnext/buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.py:37
-#: erpnext/subcontracting/doctype/subcontracting_inward_order_scrap_item/subcontracting_inward_order_scrap_item.json
+#: erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json
msgid "Finished Good Item Code"
msgstr ""
-#: erpnext/public/js/utils.js:919
+#: erpnext/public/js/utils.js:923
msgid "Finished Good Item Qty"
msgstr ""
@@ -19419,7 +19516,7 @@ msgstr ""
msgid "Finished Goods based Operating Cost"
msgstr ""
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1670
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1675
msgid "Finished Item {0} does not match with Work Order {1}"
msgstr ""
@@ -19589,7 +19686,7 @@ msgstr ""
msgid "Fixed Asset Turnover Ratio"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:742
+#: erpnext/manufacturing/doctype/bom/bom.py:780
msgid "Fixed Asset item {0} cannot be used in BOMs."
msgstr ""
@@ -19667,7 +19764,7 @@ msgstr ""
msgid "Following Material Requests have been raised automatically based on Item's re-order level"
msgstr ""
-#: erpnext/selling/doctype/customer/customer.py:821
+#: erpnext/selling/doctype/customer/customer.py:833
msgid "Following fields are mandatory to create address:"
msgstr ""
@@ -19734,7 +19831,7 @@ msgid "For Job Card"
msgstr ""
#. Label of the for_operation (Link) field in DocType 'Job Card'
-#: erpnext/manufacturing/doctype/job_card/job_card.js:523
+#: erpnext/manufacturing/doctype/job_card/job_card.js:521
#: erpnext/manufacturing/doctype/job_card/job_card.json
msgid "For Operation"
msgstr ""
@@ -19823,7 +19920,7 @@ msgstr ""
msgid "For individual supplier"
msgstr ""
-#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:370
+#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:374
msgid "For item {0}, only {1} asset have been created or linked to {2}. Please create or link {3} more asset with the respective document."
msgstr ""
@@ -19831,11 +19928,11 @@ msgstr ""
msgid "For item {0}, rate must be a positive number. To Allow negative rates, enable {1} in {2}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:346
+#: erpnext/manufacturing/doctype/bom/bom.py:367
msgid "For operation {0} at row {1}, please add raw materials or set a BOM against it."
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2599
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2600
msgid "For operation {0}: Quantity ({1}) can not be greater than pending quantity({2})"
msgstr ""
@@ -19852,7 +19949,7 @@ msgstr ""
msgid "For projected and forecast quantities, the system will consider all child warehouses under the selected parent warehouse."
msgstr ""
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1702
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1707
msgid "For quantity {0} should not be greater than allowed quantity {1}"
msgstr ""
@@ -19889,7 +19986,7 @@ msgstr ""
msgid "For the item {0}, the consumed quantity should be {1} according to the BOM {2}."
msgstr ""
-#: erpnext/public/js/controllers/transaction.js:1403
+#: erpnext/public/js/controllers/transaction.js:1407
msgctxt "Clear payment terms template and/or payment schedule when due date is changed"
msgid "For the new {0} to take effect, would you like to clear the current {1}?"
msgstr ""
@@ -20894,10 +20991,10 @@ msgstr ""
msgid "Get Sales Orders"
msgstr ""
-#. Label of the get_scrap_items (Button) field in DocType 'Subcontracting
+#. Label of the get_secondary_items (Button) field in DocType 'Subcontracting
#. Receipt'
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
-msgid "Get Scrap Items"
+msgid "Get Secondary Items"
msgstr ""
#. Label of the get_started_sections (Code) field in DocType 'Support Settings'
@@ -20941,8 +21038,8 @@ msgstr ""
msgid "Get stops from"
msgstr ""
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:195
-msgid "Getting Scrap Items"
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:196
+msgid "Getting Secondary Items"
msgstr ""
#. Option for the 'Coupon Type' (Select) field in DocType 'Coupon Code'
@@ -20996,7 +21093,7 @@ msgstr ""
msgid "Goods Transferred"
msgstr ""
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2220
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:2225
msgid "Goods are already received against the outward entry {0}"
msgstr ""
@@ -21293,7 +21390,7 @@ msgstr ""
msgid "Group Same Items"
msgstr ""
-#: erpnext/stock/doctype/stock_settings/stock_settings.py:158
+#: erpnext/stock/doctype/stock_settings/stock_settings.py:156
msgid "Group Warehouses cannot be used in transactions. Please change the value of {0}"
msgstr ""
@@ -21598,7 +21695,7 @@ msgstr ""
msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}"
msgstr ""
-#: erpnext/stock/stock_ledger.py:2050
+#: erpnext/stock/stock_ledger.py:2057
msgid "Here are the options to proceed:"
msgstr ""
@@ -22073,10 +22170,10 @@ msgstr ""
msgid "If enabled, system will set incoming rate as zero for stand-alone credit notes with expired batch item."
msgstr ""
-#. Description of the 'Deliver Scrap Items' (Check) field in DocType 'Selling
-#. Settings'
+#. Description of the 'Deliver Secondary Items' (Check) field in DocType
+#. 'Selling Settings'
#: erpnext/selling/doctype/selling_settings/selling_settings.json
-msgid "If enabled, the Scrap Item generated against a Finished Good will also be added in the Stock Entry when delivering that Finished Good."
+msgid "If enabled, the Secondary Items generated against a Finished Good will also be added in the Stock Entry when delivering that Finished Good."
msgstr ""
#. Description of the 'Disable Rounded Total' (Check) field in DocType 'POS
@@ -22183,14 +22280,16 @@ msgstr ""
msgid "If no taxes are set, and Taxes and Charges Template is selected, the system will automatically apply the taxes from the chosen template."
msgstr ""
-#: erpnext/stock/stock_ledger.py:2060
+#: erpnext/stock/stock_ledger.py:2067
msgid "If not, you can Cancel / Submit this entry"
msgstr ""
-#. Description of the 'Create Missing Party' (Check) field in DocType 'Opening
-#. Invoice Creation Tool'
-#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
-msgid "If party does not exist, create it using the Party Name field."
+#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:197
+msgid "If party does not exist, create it using the Customer Name field."
+msgstr ""
+
+#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:198
+msgid "If party does not exist, create it using the Supplier Name field."
msgstr ""
#. Description of the 'Free Item Rate' (Currency) field in DocType 'Pricing
@@ -22209,7 +22308,7 @@ msgstr ""
msgid "If set, the system does not use the user's Email or the standard outgoing Email account for sending request for quotations."
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1190
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1191
msgid "If the BOM results in Scrap material, the Scrap Warehouse needs to be selected."
msgstr ""
@@ -22218,7 +22317,7 @@ msgstr ""
msgid "If the account is frozen, entries are allowed to restricted users."
msgstr ""
-#: erpnext/stock/stock_ledger.py:2053
+#: erpnext/stock/stock_ledger.py:2060
msgid "If the item is transacting as a Zero Valuation Rate item in this entry, please enable 'Allow Zero Valuation Rate' in the {0} Item table."
msgstr ""
@@ -22228,7 +22327,7 @@ msgstr ""
msgid "If the reorder check is set at the Group warehouse level, the available quantity becomes the sum of the projected quantities of all its child warehouses."
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1209
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1210
msgid "If the selected BOM has Operations mentioned in it, the system will fetch all Operations from BOM, these values can be changed."
msgstr ""
@@ -22319,7 +22418,7 @@ msgstr ""
msgid "If you still want to proceed, please disable 'Skip Available Sub Assembly Items' checkbox."
msgstr ""
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1837
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1839
msgid "If you still want to proceed, please enable {0}."
msgstr ""
@@ -22391,7 +22490,7 @@ msgstr ""
#. Label of the ignore_exchange_rate_revaluation_journals (Check) field in
#. DocType 'Process Statement Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
-#: erpnext/accounts/report/general_ledger/general_ledger.js:217
+#: erpnext/accounts/report/general_ledger/general_ledger.js:218
msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals"
msgstr ""
@@ -22399,7 +22498,7 @@ msgstr ""
msgid "Ignore Existing Ordered Qty"
msgstr ""
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1829
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1831
msgid "Ignore Existing Projected Quantity"
msgstr ""
@@ -22443,7 +22542,7 @@ msgstr ""
#. Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120
-#: erpnext/accounts/report/general_ledger/general_ledger.js:222
+#: erpnext/accounts/report/general_ledger/general_ledger.js:223
msgid "Ignore System Generated Credit / Debit Notes"
msgstr ""
@@ -22819,7 +22918,7 @@ msgstr ""
#: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:131
#: erpnext/accounts/report/consolidated_trial_balance/consolidated_trial_balance.js:85
#: erpnext/accounts/report/custom_financial_statement/custom_financial_statement.js:29
-#: erpnext/accounts/report/general_ledger/general_ledger.js:186
+#: erpnext/accounts/report/general_ledger/general_ledger.js:187
#: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:46
#: erpnext/accounts/report/trial_balance/trial_balance.js:105
msgid "Include Default FB Entries"
@@ -23050,7 +23149,7 @@ msgstr ""
msgid "Incompatible Setting Detected"
msgstr ""
-#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:191
+#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:195
msgid "Incorrect Account"
msgstr ""
@@ -23067,7 +23166,7 @@ msgstr ""
msgid "Incorrect Check in (group) Warehouse for Reorder"
msgstr ""
-#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:142
+#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:143
msgid "Incorrect Company"
msgstr ""
@@ -23080,7 +23179,7 @@ msgstr ""
msgid "Incorrect Date"
msgstr ""
-#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:157
+#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:158
msgid "Incorrect Invoice"
msgstr ""
@@ -23088,7 +23187,7 @@ msgstr ""
msgid "Incorrect Payment Type"
msgstr ""
-#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:113
+#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:114
msgid "Incorrect Reference Document (Purchase Receipt Item)"
msgstr ""
@@ -23115,9 +23214,9 @@ msgstr ""
msgid "Incorrect Type of Transaction"
msgstr ""
-#: erpnext/stock/doctype/pick_list/pick_list.py:186
-#: erpnext/stock/doctype/pick_list/pick_list.py:210
-#: erpnext/stock/doctype/stock_settings/stock_settings.py:161
+#: erpnext/stock/doctype/pick_list/pick_list.py:187
+#: erpnext/stock/doctype/pick_list/pick_list.py:211
+#: erpnext/stock/doctype/stock_settings/stock_settings.py:159
msgid "Incorrect Warehouse"
msgstr ""
@@ -23274,7 +23373,7 @@ msgid "Inspected By"
msgstr ""
#: erpnext/controllers/stock_controller.py:1494
-#: erpnext/manufacturing/doctype/job_card/job_card.py:814
+#: erpnext/manufacturing/doctype/job_card/job_card.py:832
msgid "Inspection Rejected"
msgstr ""
@@ -23298,7 +23397,7 @@ msgid "Inspection Required before Purchase"
msgstr ""
#: erpnext/controllers/stock_controller.py:1479
-#: erpnext/manufacturing/doctype/job_card/job_card.py:795
+#: erpnext/manufacturing/doctype/job_card/job_card.py:813
msgid "Inspection Submission"
msgstr ""
@@ -23353,7 +23452,7 @@ msgstr ""
msgid "Installed Qty"
msgstr ""
-#: erpnext/setup/setup_wizard/setup_wizard.py:24
+#: erpnext/setup/setup_wizard/setup_wizard.py:15
msgid "Installing presets"
msgstr ""
@@ -23373,16 +23472,16 @@ msgid "Insufficient Permissions"
msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:462
-#: erpnext/stock/doctype/pick_list/pick_list.py:144
-#: erpnext/stock/doctype/pick_list/pick_list.py:162
-#: erpnext/stock/doctype/pick_list/pick_list.py:1055
+#: erpnext/stock/doctype/pick_list/pick_list.py:145
+#: erpnext/stock/doctype/pick_list/pick_list.py:163
+#: erpnext/stock/doctype/pick_list/pick_list.py:1088
#: erpnext/stock/doctype/stock_entry/stock_entry.py:956
-#: erpnext/stock/serial_batch_bundle.py:1205 erpnext/stock/stock_ledger.py:1741
-#: erpnext/stock/stock_ledger.py:2219
+#: erpnext/stock/serial_batch_bundle.py:1205 erpnext/stock/stock_ledger.py:1748
+#: erpnext/stock/stock_ledger.py:2226
msgid "Insufficient Stock"
msgstr ""
-#: erpnext/stock/stock_ledger.py:2234
+#: erpnext/stock/stock_ledger.py:2241
msgid "Insufficient Stock for Batch"
msgstr ""
@@ -23497,12 +23596,6 @@ msgstr ""
msgid "Inter Transfer Reference"
msgstr ""
-#. Label of the inter_warehouse_transfer_settings_section (Section Break) field
-#. in DocType 'Stock Settings'
-#: erpnext/stock/doctype/stock_settings/stock_settings.json
-msgid "Inter Warehouse Transfer Settings"
-msgstr ""
-
#. Label of the interest (Currency) field in DocType 'Overdue Payment'
#: erpnext/accounts/doctype/overdue_payment/overdue_payment.json
msgid "Interest"
@@ -23543,7 +23636,7 @@ msgstr ""
msgid "Internal Customer Accounting"
msgstr ""
-#: erpnext/selling/doctype/customer/customer.py:254
+#: erpnext/selling/doctype/customer/customer.py:255
msgid "Internal Customer for company {0} already exists"
msgstr ""
@@ -23653,7 +23746,7 @@ msgstr ""
msgid "Invalid Barcode. There is no Item attached to this barcode."
msgstr ""
-#: erpnext/public/js/controllers/transaction.js:3212
+#: erpnext/public/js/controllers/transaction.js:3216
msgid "Invalid Blanket Order for the selected Customer and Item"
msgstr ""
@@ -23679,6 +23772,10 @@ msgstr ""
msgid "Invalid Cost Center"
msgstr ""
+#: erpnext/selling/doctype/customer/customer.py:368
+msgid "Invalid Customer Group"
+msgstr ""
+
#: erpnext/selling/doctype/sales_order/sales_order.py:417
msgid "Invalid Delivery Date"
msgstr ""
@@ -23687,11 +23784,11 @@ msgstr ""
msgid "Invalid Discount"
msgstr ""
-#: erpnext/controllers/taxes_and_totals.py:803
+#: erpnext/controllers/taxes_and_totals.py:840
msgid "Invalid Discount Amount"
msgstr ""
-#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:129
+#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:130
msgid "Invalid Document"
msgstr ""
@@ -23761,7 +23858,7 @@ msgstr ""
msgid "Invalid Priority"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1232
+#: erpnext/manufacturing/doctype/bom/bom.py:1275
msgid "Invalid Process Loss Configuration"
msgstr ""
@@ -23778,7 +23875,7 @@ msgstr ""
msgid "Invalid Quantity"
msgstr ""
-#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:475
+#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:479
msgid "Invalid Query"
msgstr ""
@@ -23799,7 +23896,7 @@ msgstr ""
msgid "Invalid Selling Price"
msgstr ""
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1745
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1750
msgid "Invalid Serial and Batch Bundle"
msgstr ""
@@ -23853,7 +23950,7 @@ msgstr ""
msgid "Invalid result key. Response:"
msgstr ""
-#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:475
+#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:479
msgid "Invalid search query"
msgstr ""
@@ -24402,6 +24499,20 @@ msgstr ""
msgid "Is Internal Supplier"
msgstr ""
+#. Label of the is_legacy (Check) field in DocType 'BOM Secondary Item'
+#: erpnext/manufacturing/doctype/bom_secondary_item/bom_secondary_item.json
+msgid "Is Legacy"
+msgstr ""
+
+#. Label of the is_legacy_scrap_item (Check) field in DocType 'Stock Entry
+#. Detail'
+#. Label of the is_legacy_scrap_item (Check) field in DocType 'Subcontracting
+#. Receipt Item'
+#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
+#: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
+msgid "Is Legacy Scrap Item"
+msgstr ""
+
#. Label of the is_mandatory (Check) field in DocType 'Applicable On Account'
#: erpnext/accounts/doctype/applicable_on_account/applicable_on_account.json
msgid "Is Mandatory"
@@ -24552,14 +24663,6 @@ msgstr ""
msgid "Is Sales Order Required for Sales Invoice & Delivery Note Creation?"
msgstr ""
-#. Label of the is_scrap_item (Check) field in DocType 'Stock Entry Detail'
-#. Label of the is_scrap_item (Check) field in DocType 'Subcontracting Receipt
-#. Item'
-#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
-#: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
-msgid "Is Scrap Item"
-msgstr ""
-
#. Label of the is_short_year (Check) field in DocType 'Fiscal Year'
#: erpnext/accounts/doctype/fiscal_year/fiscal_year.json
msgid "Is Short/Long Year"
@@ -24772,11 +24875,11 @@ msgstr ""
msgid "It can take upto few hours for accurate stock values to be visible after merging items."
msgstr ""
-#: erpnext/public/js/controllers/transaction.js:2613
+#: erpnext/public/js/controllers/transaction.js:2617
msgid "It is needed to fetch Item Details."
msgstr ""
-#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:211
+#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:215
msgid "It's not possible to distribute charges equally when total amount is zero, please set 'Distribute Charges Based On' as 'Quantity'"
msgstr ""
@@ -24831,9 +24934,9 @@ msgstr ""
#: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:33
#: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:204
#: erpnext/buying/workspace/buying/buying.json
-#: erpnext/controllers/taxes_and_totals.py:1212
+#: erpnext/controllers/taxes_and_totals.py:1249
#: erpnext/manufacturing/doctype/blanket_order/blanket_order.json
-#: erpnext/manufacturing/doctype/bom/bom.js:1066
+#: erpnext/manufacturing/doctype/bom/bom.js:1083
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109
#: erpnext/manufacturing/doctype/workstation/workstation_job_card.html:25
@@ -25018,7 +25121,7 @@ msgstr ""
#. Label of the item_code (Link) field in DocType 'BOM Creator Item'
#. Label of the item_code (Link) field in DocType 'BOM Explosion Item'
#. Label of the item_code (Link) field in DocType 'BOM Item'
-#. Label of the item_code (Link) field in DocType 'BOM Scrap Item'
+#. Label of the item_code (Link) field in DocType 'BOM Secondary Item'
#. Label of the item_code (Link) field in DocType 'BOM Website Item'
#. Label of the item_code (Link) field in DocType 'Job Card Item'
#. Label of the item_code (Link) field in DocType 'Master Production Schedule
@@ -25062,7 +25165,7 @@ msgstr ""
#. Label of the main_item_code (Link) field in DocType 'Subcontracting Inward
#. Order Received Item'
#. Label of the item_code (Link) field in DocType 'Subcontracting Inward Order
-#. Scrap Item'
+#. Secondary Item'
#. Label of the item_code (Link) field in DocType 'Subcontracting Inward Order
#. Service Item'
#. Label of the item_code (Link) field in DocType 'Subcontracting Order Item'
@@ -25109,7 +25212,7 @@ msgstr ""
#: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json
#: erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
#: erpnext/manufacturing/doctype/bom_item/bom_item.json
-#: erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.json
+#: erpnext/manufacturing/doctype/bom_secondary_item/bom_secondary_item.json
#: erpnext/manufacturing/doctype/bom_website_item/bom_website_item.json
#: erpnext/manufacturing/doctype/job_card_item/job_card_item.json
#: erpnext/manufacturing/doctype/master_production_schedule_item/master_production_schedule_item.json
@@ -25134,10 +25237,10 @@ msgstr ""
#: erpnext/manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:86
#: erpnext/manufacturing/report/work_order_stock_report/work_order_stock_report.py:119
#: erpnext/projects/doctype/timesheet/timesheet.js:214
-#: erpnext/public/js/controllers/transaction.js:2907
+#: erpnext/public/js/controllers/transaction.js:2911
#: erpnext/public/js/stock_reservation.js:112
-#: erpnext/public/js/stock_reservation.js:318 erpnext/public/js/utils.js:559
-#: erpnext/public/js/utils.js:716
+#: erpnext/public/js/stock_reservation.js:318 erpnext/public/js/utils.js:563
+#: erpnext/public/js/utils.js:720
#: erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.json
#: erpnext/selling/doctype/delivery_schedule_item/delivery_schedule_item.json
#: erpnext/selling/doctype/installation_note_item/installation_note_item.json
@@ -25195,13 +25298,13 @@ msgstr ""
#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:8
#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:433
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.js:7
-#: erpnext/stock/report/stock_ageing/stock_ageing.py:132
+#: erpnext/stock/report/stock_ageing/stock_ageing.py:133
#: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:104
#: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.py:25
#: erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:26
#: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json
#: erpnext/subcontracting/doctype/subcontracting_inward_order_received_item/subcontracting_inward_order_received_item.json
-#: erpnext/subcontracting/doctype/subcontracting_inward_order_scrap_item/subcontracting_inward_order_scrap_item.json
+#: erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json
#: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json
#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:253
#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:352
@@ -25394,7 +25497,7 @@ msgstr ""
#: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:55
#: erpnext/stock/report/product_bundle_balance/product_bundle_balance.js:37
#: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:100
-#: erpnext/stock/report/stock_ageing/stock_ageing.py:141
+#: erpnext/stock/report/stock_ageing/stock_ageing.py:142
#: erpnext/stock/report/stock_analytics/stock_analytics.js:8
#: erpnext/stock/report/stock_analytics/stock_analytics.py:52
#: erpnext/stock/report/stock_balance/stock_balance.js:32
@@ -25515,7 +25618,7 @@ msgstr ""
#. Label of the item_name (Data) field in DocType 'BOM Creator Item'
#. Label of the item_name (Data) field in DocType 'BOM Explosion Item'
#. Label of the item_name (Data) field in DocType 'BOM Item'
-#. Label of the item_name (Data) field in DocType 'BOM Scrap Item'
+#. Label of the item_name (Data) field in DocType 'BOM Secondary Item'
#. Label of the item_name (Data) field in DocType 'BOM Website Item'
#. Label of the item_name (Read Only) field in DocType 'Job Card'
#. Label of the item_name (Data) field in DocType 'Job Card Item'
@@ -25594,7 +25697,7 @@ msgstr ""
#: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json
#: erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
#: erpnext/manufacturing/doctype/bom_item/bom_item.json
-#: erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.json
+#: erpnext/manufacturing/doctype/bom_secondary_item/bom_secondary_item.json
#: erpnext/manufacturing/doctype/bom_website_item/bom_website_item.json
#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/manufacturing/doctype/job_card_item/job_card_item.json
@@ -25615,8 +25718,8 @@ msgstr ""
#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:371
#: erpnext/manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:92
#: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:138
-#: erpnext/public/js/controllers/transaction.js:2913
-#: erpnext/public/js/utils.js:811
+#: erpnext/public/js/controllers/transaction.js:2917
+#: erpnext/public/js/utils.js:815
#: erpnext/selling/doctype/quotation_item/quotation_item.json
#: erpnext/selling/doctype/sales_order/sales_order.js:1252
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -25654,7 +25757,7 @@ msgstr ""
#: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:54
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:131
#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:440
-#: erpnext/stock/report/stock_ageing/stock_ageing.py:138
+#: erpnext/stock/report/stock_ageing/stock_ageing.py:139
#: erpnext/stock/report/stock_analytics/stock_analytics.py:45
#: erpnext/stock/report/stock_balance/stock_balance.py:479
#: erpnext/stock/report/stock_ledger/stock_ledger.py:277
@@ -25770,7 +25873,7 @@ msgstr ""
msgid "Item Row"
msgstr ""
-#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:167
+#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:168
msgid "Item Row {0}: {1} {2} does not exist in above '{1}' table"
msgstr ""
@@ -25993,7 +26096,7 @@ msgstr ""
msgid "Item Wise Tax Details"
msgstr ""
-#: erpnext/controllers/taxes_and_totals.py:537
+#: erpnext/controllers/taxes_and_totals.py:559
msgid "Item Wise Tax Details do not match with Taxes and Charges at the following rows:"
msgstr ""
@@ -26013,7 +26116,7 @@ msgstr ""
msgid "Item and Warranty Details"
msgstr ""
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:3267
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:3299
msgid "Item for row {0} does not match Material Request"
msgstr ""
@@ -26029,7 +26132,7 @@ msgstr ""
msgid "Item is removed since no serial / batch no selected."
msgstr ""
-#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:163
+#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:164
msgid "Item must be added using 'Get Items from Purchase Receipts' button"
msgstr ""
@@ -26047,7 +26150,7 @@ msgstr ""
msgid "Item qty can not be updated as raw materials are already processed."
msgstr ""
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1148
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1155
msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}"
msgstr ""
@@ -26090,7 +26193,7 @@ msgstr ""
msgid "Item {0} does not exist"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:670
+#: erpnext/manufacturing/doctype/bom/bom.py:708
msgid "Item {0} does not exist in the system or has expired"
msgstr ""
@@ -26146,7 +26249,7 @@ msgstr ""
msgid "Item {0} is not a subcontracted item"
msgstr ""
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2132
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:2137
msgid "Item {0} is not active or end of life has been reached"
msgstr ""
@@ -26166,7 +26269,7 @@ msgstr ""
msgid "Item {0} must be a non-stock item"
msgstr ""
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1481
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1488
msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}"
msgstr ""
@@ -26232,7 +26335,7 @@ msgstr ""
msgid "Item/Item Code required to get Item Tax Template."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:412
+#: erpnext/manufacturing/doctype/bom/bom.py:451
msgid "Item: {0} does not exist in the system"
msgstr ""
@@ -26292,7 +26395,7 @@ msgstr ""
msgid "Items not found."
msgstr ""
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1144
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1151
msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}"
msgstr ""
@@ -26367,9 +26470,9 @@ msgstr ""
#: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/job_card/job_card.json
-#: erpnext/manufacturing/doctype/job_card/job_card.py:979
+#: erpnext/manufacturing/doctype/job_card/job_card.py:997
#: erpnext/manufacturing/doctype/operation/operation.json
-#: erpnext/manufacturing/doctype/work_order/work_order.js:396
+#: erpnext/manufacturing/doctype/work_order/work_order.js:397
#: erpnext/manufacturing/doctype/work_order/work_order.json
#: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:29
#: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:86
@@ -26407,8 +26510,8 @@ msgid "Job Card Scheduled Time"
msgstr ""
#. Name of a DocType
-#: erpnext/manufacturing/doctype/job_card_scrap_item/job_card_scrap_item.json
-msgid "Job Card Scrap Item"
+#: erpnext/manufacturing/doctype/job_card_secondary_item/job_card_secondary_item.json
+msgid "Job Card Secondary Item"
msgstr ""
#. Name of a report
@@ -26431,7 +26534,7 @@ msgstr ""
msgid "Job Card and Capacity Planning"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1455
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1473
msgid "Job Card {0} has been completed"
msgstr ""
@@ -26507,7 +26610,7 @@ msgstr ""
msgid "Job Worker Warehouse"
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2652
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2654
msgid "Job card {0} created"
msgstr ""
@@ -26723,7 +26826,7 @@ msgstr ""
msgid "Kilowatt-Hour"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:981
+#: erpnext/manufacturing/doctype/job_card/job_card.py:999
msgid "Kindly cancel the Manufacturing Entries first against the work order {0}."
msgstr ""
@@ -26925,7 +27028,7 @@ msgstr ""
msgid "Last transacted"
msgstr ""
-#: erpnext/stock/report/stock_ageing/stock_ageing.py:177
+#: erpnext/stock/report/stock_ageing/stock_ageing.py:178
msgid "Latest"
msgstr ""
@@ -27598,7 +27701,7 @@ msgstr ""
msgid "Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned."
msgstr ""
-#: erpnext/public/js/utils.js:180
+#: erpnext/public/js/utils.js:184
msgid "Loyalty Points: {0}"
msgstr ""
@@ -27939,9 +28042,9 @@ msgstr ""
#. Label of the make (Data) field in DocType 'Vehicle'
#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123
-#: erpnext/manufacturing/doctype/job_card/job_card.js:544
-#: erpnext/manufacturing/doctype/work_order/work_order.js:832
-#: erpnext/manufacturing/doctype/work_order/work_order.js:866
+#: erpnext/manufacturing/doctype/job_card/job_card.js:542
+#: erpnext/manufacturing/doctype/work_order/work_order.js:833
+#: erpnext/manufacturing/doctype/work_order/work_order.js:867
#: erpnext/setup/doctype/vehicle/vehicle.json
msgid "Make"
msgstr ""
@@ -28004,7 +28107,7 @@ msgstr ""
msgid "Make Stock Entry"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:418
+#: erpnext/manufacturing/doctype/job_card/job_card.js:416
msgid "Make Subcontracting PO"
msgstr ""
@@ -28167,8 +28270,8 @@ msgstr ""
#: erpnext/stock/doctype/material_request_item/material_request_item.json
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1225
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1241
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1232
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1248
#: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json
#: erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
#: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
@@ -28317,7 +28420,7 @@ msgstr ""
msgid "Manufacturing Manager"
msgstr ""
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2385
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:2390
msgid "Manufacturing Quantity is mandatory"
msgstr ""
@@ -28394,7 +28497,7 @@ msgstr ""
msgid "Mapping Subcontracting Order ..."
msgstr ""
-#: erpnext/public/js/utils.js:1046
+#: erpnext/public/js/utils.js:1050
msgid "Mapping {0} ..."
msgstr ""
@@ -28540,7 +28643,7 @@ msgstr ""
msgid "Material"
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.js:857
+#: erpnext/manufacturing/doctype/work_order/work_order.js:858
msgid "Material Consumption"
msgstr ""
@@ -28548,7 +28651,7 @@ msgstr ""
#. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type'
#: erpnext/setup/setup_wizard/operations/install_fixtures.py:114
#: erpnext/stock/doctype/stock_entry/stock_entry.json
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1226
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1233
#: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json
msgid "Material Consumption for Manufacture"
msgstr ""
@@ -28743,7 +28846,7 @@ msgstr ""
msgid "Material Request used to make this Stock Entry"
msgstr ""
-#: erpnext/controllers/subcontracting_controller.py:1343
+#: erpnext/controllers/subcontracting_controller.py:1349
msgid "Material Request {0} is cancelled or stopped"
msgstr ""
@@ -28862,12 +28965,12 @@ msgstr ""
msgid "Materials To Be Transferred"
msgstr ""
-#: erpnext/controllers/subcontracting_controller.py:1576
+#: erpnext/controllers/subcontracting_controller.py:1582
msgid "Materials are already received against the {0} {1}"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:181
-#: erpnext/manufacturing/doctype/job_card/job_card.py:835
+#: erpnext/manufacturing/doctype/job_card/job_card.py:183
+#: erpnext/manufacturing/doctype/job_card/job_card.py:853
msgid "Materials needs to be transferred to the work in progress warehouse for the job card {0}"
msgstr ""
@@ -28936,7 +29039,7 @@ msgstr ""
msgid "Max discount allowed for item: {0} is {1}%"
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1009
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1010
#: erpnext/stock/doctype/pick_list/pick_list.js:200
msgid "Max: {0}"
msgstr ""
@@ -28963,11 +29066,11 @@ msgstr ""
msgid "Maximum Producible Items"
msgstr ""
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:3870
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:3902
msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}."
msgstr ""
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:3861
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:3893
msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}."
msgstr ""
@@ -29022,7 +29125,7 @@ msgstr ""
msgid "Megawatt"
msgstr ""
-#: erpnext/stock/stock_ledger.py:2066
+#: erpnext/stock/stock_ledger.py:2073
msgid "Mention Valuation Rate in the Item master."
msgstr ""
@@ -29067,7 +29170,7 @@ msgstr ""
msgid "Merge Similar Account Heads"
msgstr ""
-#: erpnext/public/js/utils.js:1078
+#: erpnext/public/js/utils.js:1082
msgid "Merge taxes from multiple documents"
msgstr ""
@@ -29385,7 +29488,7 @@ msgstr ""
msgid "Miscellaneous Expenses"
msgstr ""
-#: erpnext/controllers/buying_controller.py:702
+#: erpnext/controllers/buying_controller.py:706
msgid "Mismatch"
msgstr ""
@@ -29423,7 +29526,7 @@ msgstr ""
msgid "Missing Finance Book"
msgstr ""
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1680
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1685
msgid "Missing Finished Good"
msgstr ""
@@ -29447,7 +29550,7 @@ msgstr ""
msgid "Missing Serial No Bundle"
msgstr ""
-#: erpnext/stock/doctype/pick_list/pick_list.py:170
+#: erpnext/stock/doctype/pick_list/pick_list.py:171
msgid "Missing Warehouse"
msgstr ""
@@ -29459,7 +29562,7 @@ msgstr ""
msgid "Missing required filter: {0}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1185
+#: erpnext/manufacturing/doctype/bom/bom.py:1218
#: erpnext/manufacturing/doctype/work_order/work_order.py:1476
msgid "Missing value"
msgstr ""
@@ -29695,7 +29798,7 @@ msgstr ""
msgid "Multi-level BOM Creator"
msgstr ""
-#: erpnext/selling/doctype/customer/customer.py:427
+#: erpnext/selling/doctype/customer/customer.py:439
msgid "Multiple Loyalty Programs found for Customer {}. Please select manually."
msgstr ""
@@ -29729,7 +29832,7 @@ msgstr ""
msgid "Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year"
msgstr ""
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1687
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1692
msgid "Multiple items cannot be marked as finished item"
msgstr ""
@@ -29866,7 +29969,7 @@ msgstr ""
msgid "Negative Quantity is not allowed"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1537
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1575
#: erpnext/stock/serial_batch_bundle.py:1528
msgid "Negative Stock Error"
msgstr ""
@@ -30337,7 +30440,7 @@ msgstr ""
msgid "New Task"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:206
+#: erpnext/manufacturing/doctype/bom/bom.js:244
msgid "New Version"
msgstr ""
@@ -30350,7 +30453,7 @@ msgstr ""
msgid "New Workplace"
msgstr ""
-#: erpnext/selling/doctype/customer/customer.py:392
+#: erpnext/selling/doctype/customer/customer.py:404
msgid "New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0}"
msgstr ""
@@ -30446,7 +30549,7 @@ msgstr ""
msgid "No Item with Serial No {0}"
msgstr ""
-#: erpnext/controllers/subcontracting_controller.py:1494
+#: erpnext/controllers/subcontracting_controller.py:1500
msgid "No Items selected for transfer."
msgstr ""
@@ -30541,7 +30644,7 @@ msgid "No Work Orders were created"
msgstr ""
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:833
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:860
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:897
msgid "No accounting entries for the following warehouses"
msgstr ""
@@ -30589,7 +30692,7 @@ msgstr ""
msgid "No employee was scheduled for call popup"
msgstr ""
-#: erpnext/controllers/subcontracting_controller.py:1385
+#: erpnext/controllers/subcontracting_controller.py:1391
msgid "No item available for transfer."
msgstr ""
@@ -30730,7 +30833,7 @@ msgstr ""
msgid "No pending Material Requests found to link for the given items."
msgstr ""
-#: erpnext/public/js/controllers/transaction.js:468
+#: erpnext/public/js/controllers/transaction.js:472
msgid "No pending payment schedules available."
msgstr ""
@@ -30832,7 +30935,7 @@ msgstr ""
msgid "Non Profit"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1593
+#: erpnext/manufacturing/doctype/bom/bom.py:1639
msgid "Non stock items"
msgstr ""
@@ -30961,7 +31064,7 @@ msgstr ""
msgid "Note: Email will not be sent to disabled users"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:754
+#: erpnext/manufacturing/doctype/bom/bom.py:792
msgid "Note: If you want to use the finished good {0} as a raw material, then enable the 'Do Not Explode' checkbox in the Items table against the same raw material."
msgstr ""
@@ -31343,7 +31446,7 @@ msgstr ""
msgid "Once set, this invoice will be on hold till the set date"
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.js:744
+#: erpnext/manufacturing/doctype/work_order/work_order.js:745
msgid "Once the Work Order is Closed. It can't be resumed."
msgstr ""
@@ -31435,11 +31538,11 @@ msgstr ""
msgid "Only one of Deposit or Withdrawal should be non-zero when applying an Excluded Fee."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:324
+#: erpnext/manufacturing/doctype/bom/bom.py:329
msgid "Only one operation can have 'Is Final Finished Good' checked when 'Track Semi Finished Goods' is enabled."
msgstr ""
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1240
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1247
msgid "Only one {0} entry can be created against the Work Order {1}"
msgstr ""
@@ -31676,7 +31779,7 @@ msgstr ""
msgid "Opening Entry can not be created after Period Closing Voucher is created."
msgstr ""
-#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py:299
+#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py:304
msgid "Opening Invoice Creation In Progress"
msgstr ""
@@ -31695,7 +31798,7 @@ msgstr ""
msgid "Opening Invoice Creation Tool Item"
msgstr ""
-#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py:101
+#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py:106
msgid "Opening Invoice Item"
msgstr ""
@@ -31793,7 +31896,7 @@ msgstr ""
msgid "Operating Cost Per BOM Quantity"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1680
+#: erpnext/manufacturing/doctype/bom/bom.py:1726
msgid "Operating Cost as per Work Order / BOM"
msgstr ""
@@ -31884,11 +31987,11 @@ msgstr ""
msgid "Operation time does not depend on quantity to produce"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:586
+#: erpnext/manufacturing/doctype/job_card/job_card.js:584
msgid "Operation {0} added multiple times in the work order {1}"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1228
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1246
msgid "Operation {0} does not belong to the work order {1}"
msgstr ""
@@ -31918,7 +32021,7 @@ msgstr ""
msgid "Operations Routing"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1194
+#: erpnext/manufacturing/doctype/bom/bom.py:1227
msgid "Operations cannot be left blank"
msgstr ""
@@ -32361,7 +32464,7 @@ msgstr ""
msgid "Out of Order"
msgstr ""
-#: erpnext/stock/doctype/pick_list/pick_list.py:603
+#: erpnext/stock/doctype/pick_list/pick_list.py:630
msgid "Out of Stock"
msgstr ""
@@ -33281,7 +33384,7 @@ msgstr ""
msgid "Parent Row No"
msgstr ""
-#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:534
+#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:533
msgid "Parent Row No not found for {0}"
msgstr ""
@@ -33655,7 +33758,7 @@ msgstr ""
#: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json
#: erpnext/accounts/doctype/payment_entry/payment_entry.json
#: erpnext/accounts/doctype/payment_request/payment_request.json
-#: erpnext/accounts/report/general_ledger/general_ledger.js:110
+#: erpnext/accounts/report/general_ledger/general_ledger.js:111
#: erpnext/accounts/report/general_ledger/general_ledger.py:761
#: erpnext/crm/doctype/contract/contract.json
#: erpnext/selling/doctype/party_specific_item/party_specific_item.json
@@ -34316,7 +34419,7 @@ msgstr ""
msgid "Payment Schedule based Payment Requests cannot be created because a Payment Entry already exists for this document."
msgstr ""
-#: erpnext/public/js/controllers/transaction.js:478
+#: erpnext/public/js/controllers/transaction.js:482
msgid "Payment Schedules"
msgstr ""
@@ -34342,7 +34445,7 @@ msgstr ""
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1256
#: erpnext/accounts/report/gross_profit/gross_profit.py:449
#: erpnext/accounts/workspace/invoicing/invoicing.json
-#: erpnext/public/js/controllers/transaction.js:492
+#: erpnext/public/js/controllers/transaction.js:496
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:30
#: erpnext/workspace_sidebar/accounts_setup.json
msgid "Payment Term"
@@ -34964,7 +35067,7 @@ msgstr ""
msgid "Pick List"
msgstr ""
-#: erpnext/stock/doctype/pick_list/pick_list.py:266
+#: erpnext/stock/doctype/pick_list/pick_list.py:267
msgid "Pick List Incomplete"
msgstr ""
@@ -35283,7 +35386,7 @@ msgstr ""
msgid "Plants and Machineries"
msgstr ""
-#: erpnext/stock/doctype/pick_list/pick_list.py:600
+#: erpnext/stock/doctype/pick_list/pick_list.py:627
msgid "Please Restock Items and Update the Pick List to continue. To discontinue, cancel the Pick List."
msgstr ""
@@ -35310,7 +35413,7 @@ msgstr ""
msgid "Please Set Priority"
msgstr ""
-#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py:166
+#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py:171
msgid "Please Set Supplier Group in Buying Settings."
msgstr ""
@@ -35326,7 +35429,7 @@ msgstr ""
msgid "Please add Mode of payments and opening balance details."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:24
+#: erpnext/manufacturing/doctype/bom/bom.js:39
msgid "Please add Operations first."
msgstr ""
@@ -35338,7 +35441,7 @@ msgstr ""
msgid "Please add Root Account for - {0}"
msgstr ""
-#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py:315
+#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py:320
msgid "Please add a Temporary Opening account in Chart of Accounts"
msgstr ""
@@ -35396,7 +35499,7 @@ msgstr ""
msgid "Please check Process Deferred Accounting {0} and submit manually after resolving errors."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:105
+#: erpnext/manufacturing/doctype/bom/bom.js:120
msgid "Please check either with operations or FG Based Operating Cost."
msgstr ""
@@ -35429,7 +35532,7 @@ msgstr ""
msgid "Please click on 'Generate Schedule' to get schedule"
msgstr ""
-#: erpnext/selling/doctype/customer/customer.py:622
+#: erpnext/selling/doctype/customer/customer.py:634
msgid "Please contact any of the following users to extend the credit limits for {0}: {1}"
msgstr ""
@@ -35437,7 +35540,7 @@ msgstr ""
msgid "Please contact any of the following users to {} this transaction."
msgstr ""
-#: erpnext/selling/doctype/customer/customer.py:615
+#: erpnext/selling/doctype/customer/customer.py:627
msgid "Please contact your administrator to extend the credit limits for {0}."
msgstr ""
@@ -35449,7 +35552,7 @@ msgstr ""
msgid "Please create Customer from Lead {0}."
msgstr ""
-#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:154
+#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:155
msgid "Please create Landed Cost Vouchers against Invoices that have 'Update Stock' enabled."
msgstr ""
@@ -35489,7 +35592,7 @@ msgstr ""
msgid "Please enable Applicable on Purchase Order and Applicable on Booking Actual Expenses"
msgstr ""
-#: erpnext/stock/doctype/pick_list/pick_list.py:317
+#: erpnext/stock/doctype/pick_list/pick_list.py:318
msgid "Please enable Use Old Serial / Batch Fields to make_bundle"
msgstr ""
@@ -35559,7 +35662,7 @@ msgstr ""
msgid "Please enter Item Code to get Batch Number"
msgstr ""
-#: erpnext/public/js/controllers/transaction.js:3069
+#: erpnext/public/js/controllers/transaction.js:3073
msgid "Please enter Item Code to get batch no"
msgstr ""
@@ -35583,7 +35686,7 @@ msgstr ""
msgid "Please enter Purchase Receipt first"
msgstr ""
-#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:118
+#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:119
msgid "Please enter Receipt Document"
msgstr ""
@@ -35672,7 +35775,7 @@ msgstr ""
msgid "Please enter the phone number first"
msgstr ""
-#: erpnext/controllers/buying_controller.py:1185
+#: erpnext/controllers/buying_controller.py:1189
msgid "Please enter the {schedule_date}."
msgstr ""
@@ -35782,7 +35885,7 @@ msgstr ""
msgid "Please select Template Type to download template"
msgstr ""
-#: erpnext/controllers/taxes_and_totals.py:809
+#: erpnext/controllers/taxes_and_totals.py:846
#: erpnext/public/js/controllers/taxes_and_totals.js:796
msgid "Please select Apply Discount On"
msgstr ""
@@ -35795,7 +35898,7 @@ msgstr ""
msgid "Please select BOM for Item in Row {0}"
msgstr ""
-#: erpnext/controllers/buying_controller.py:636
+#: erpnext/controllers/buying_controller.py:640
msgid "Please select BOM in BOM field for Item {item_code}."
msgstr ""
@@ -35875,7 +35978,7 @@ msgstr ""
msgid "Please select Posting Date first"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1245
+#: erpnext/manufacturing/doctype/bom/bom.py:1291
msgid "Please select Price List"
msgstr ""
@@ -35899,7 +36002,7 @@ msgstr ""
msgid "Please select Stock Asset Account"
msgstr ""
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1604
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1611
msgid "Please select Subcontracting Order instead of Purchase Order {0}"
msgstr ""
@@ -35907,20 +36010,20 @@ msgstr ""
msgid "Please select Unrealized Profit / Loss account or add default Unrealized Profit / Loss account account for company {0}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1500
+#: erpnext/manufacturing/doctype/bom/bom.py:1546
msgid "Please select a BOM"
msgstr ""
#: erpnext/accounts/party.py:417
-#: erpnext/stock/doctype/pick_list/pick_list.py:1656
+#: erpnext/stock/doctype/pick_list/pick_list.py:1689
msgid "Please select a Company"
msgstr ""
#: erpnext/accounts/doctype/payment_entry/payment_entry.js:268
-#: erpnext/manufacturing/doctype/bom/bom.js:688
-#: erpnext/manufacturing/doctype/bom/bom.py:276
+#: erpnext/manufacturing/doctype/bom/bom.js:727
+#: erpnext/manufacturing/doctype/bom/bom.py:278
#: erpnext/public/js/controllers/accounts.js:277
-#: erpnext/public/js/controllers/transaction.js:3368
+#: erpnext/public/js/controllers/transaction.js:3372
msgid "Please select a Company first."
msgstr ""
@@ -35944,7 +36047,7 @@ msgstr ""
msgid "Please select a Warehouse"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1569
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1600
msgid "Please select a Work Order first."
msgstr ""
@@ -36013,7 +36116,7 @@ msgstr ""
msgid "Please select at least one row with difference value"
msgstr ""
-#: erpnext/public/js/controllers/transaction.js:520
+#: erpnext/public/js/controllers/transaction.js:524
msgid "Please select at least one schedule."
msgstr ""
@@ -36063,7 +36166,7 @@ msgstr ""
msgid "Please select rows to create Reposting Entries"
msgstr ""
-#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py:93
+#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py:98
msgid "Please select the Company"
msgstr ""
@@ -36307,7 +36410,7 @@ msgstr ""
msgid "Please set opening number of booked depreciations"
msgstr ""
-#: erpnext/public/js/controllers/transaction.js:2756
+#: erpnext/public/js/controllers/transaction.js:2760
msgid "Please set recurring after saving"
msgstr ""
@@ -36315,19 +36418,19 @@ msgstr ""
msgid "Please set the Customer Address"
msgstr ""
-#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py:182
+#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py:187
msgid "Please set the Default Cost Center in {0} company."
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.js:661
+#: erpnext/manufacturing/doctype/work_order/work_order.js:662
msgid "Please set the Item Code first"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1632
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1663
msgid "Please set the Target Warehouse in the Job Card"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1636
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1667
msgid "Please set the WIP Warehouse in the Job Card"
msgstr ""
@@ -36638,7 +36741,7 @@ msgstr ""
msgid "Posting Date cannot be future date"
msgstr ""
-#: erpnext/public/js/controllers/transaction.js:1108
+#: erpnext/public/js/controllers/transaction.js:1112
msgid "Posting Date will change to today's date as Edit Posting Date and Time is unchecked. Are you sure want to proceed?"
msgstr ""
@@ -36701,7 +36804,7 @@ msgstr ""
msgid "Posting Time"
msgstr ""
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2333
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:2338
msgid "Posting date and posting time is mandatory"
msgstr ""
@@ -37102,7 +37205,7 @@ msgstr ""
msgid "Price is not set for the item."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:566
+#: erpnext/manufacturing/doctype/bom/bom.py:604
msgid "Price not found for item {0} in price list {1}"
msgstr ""
@@ -37477,11 +37580,18 @@ msgstr ""
msgid "Process Loss"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1228
+#. Label of the process_loss_per (Percent) field in DocType 'BOM Secondary
+#. Item'
+#: erpnext/manufacturing/doctype/bom_secondary_item/bom_secondary_item.json
+msgid "Process Loss %"
+msgstr ""
+
+#: erpnext/manufacturing/doctype/bom/bom.py:1271
msgid "Process Loss Percentage cannot be greater than 100"
msgstr ""
#. Label of the process_loss_qty (Float) field in DocType 'BOM'
+#. Label of the process_loss_qty (Float) field in DocType 'BOM Secondary Item'
#. Label of the process_loss_qty (Float) field in DocType 'Job Card'
#. Label of the process_loss_qty (Float) field in DocType 'Work Order'
#. Label of the process_loss_qty (Float) field in DocType 'Work Order
@@ -37489,17 +37599,21 @@ msgstr ""
#. Label of the process_loss_qty (Float) field in DocType 'Stock Entry'
#. Label of the process_loss_qty (Float) field in DocType 'Subcontracting
#. Inward Order Item'
+#. Label of the process_loss_qty (Float) field in DocType 'Subcontracting
+#. Receipt Item'
#: erpnext/manufacturing/doctype/bom/bom.json
+#: erpnext/manufacturing/doctype/bom_secondary_item/bom_secondary_item.json
#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/manufacturing/doctype/work_order/work_order.json
#: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
#: erpnext/manufacturing/report/process_loss_report/process_loss_report.py:94
#: erpnext/stock/doctype/stock_entry/stock_entry.json
#: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json
+#: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
msgid "Process Loss Qty"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:340
+#: erpnext/manufacturing/doctype/job_card/job_card.js:338
msgid "Process Loss Quantity"
msgstr ""
@@ -37638,7 +37752,7 @@ msgstr ""
#. Label of the produced_qty (Float) field in DocType 'Subcontracting Inward
#. Order Item'
#. Label of the produced_qty (Float) field in DocType 'Subcontracting Inward
-#. Order Scrap Item'
+#. Order Secondary Item'
#: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
#: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
#: erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py:50
@@ -37646,7 +37760,7 @@ msgstr ""
#: erpnext/manufacturing/report/work_order_summary/work_order_summary.py:215
#: erpnext/stock/doctype/batch/batch.json
#: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json
-#: erpnext/subcontracting/doctype/subcontracting_inward_order_scrap_item/subcontracting_inward_order_scrap_item.json
+#: erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json
msgid "Produced Qty"
msgstr ""
@@ -38555,7 +38669,7 @@ msgstr ""
#: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.js:48
#: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:203
#: erpnext/buying/workspace/buying/buying.json
-#: erpnext/controllers/buying_controller.py:918
+#: erpnext/controllers/buying_controller.py:922
#: erpnext/crm/doctype/contract/contract.json
#: erpnext/manufacturing/doctype/blanket_order/blanket_order.js:54
#: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
@@ -38630,7 +38744,7 @@ msgstr ""
msgid "Purchase Order Item Supplied"
msgstr ""
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:975
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1012
msgid "Purchase Order Item reference is missing in Subcontracting Receipt {0}"
msgstr ""
@@ -38677,7 +38791,7 @@ msgstr ""
msgid "Purchase Order {0} is not submitted"
msgstr ""
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:883
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:887
msgid "Purchase Orders"
msgstr ""
@@ -38818,7 +38932,7 @@ msgstr ""
msgid "Purchase Receipt doesn't have any Item for which Retain Sample is enabled."
msgstr ""
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1051
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1088
msgid "Purchase Receipt {0} created."
msgstr ""
@@ -38981,10 +39095,10 @@ msgstr ""
#. Label of the qty (Float) field in DocType 'Opportunity Item'
#. Label of the qty (Float) field in DocType 'BOM Creator Item'
#. Label of the qty (Float) field in DocType 'BOM Item'
-#. Label of the stock_qty (Float) field in DocType 'BOM Scrap Item'
+#. Label of the qty (Float) field in DocType 'BOM Secondary Item'
#. Label of the qty (Float) field in DocType 'BOM Website Item'
#. Label of the qty_section (Section Break) field in DocType 'Job Card Item'
-#. Label of the stock_qty (Float) field in DocType 'Job Card Scrap Item'
+#. Label of the stock_qty (Float) field in DocType 'Job Card Secondary Item'
#. Label of the qty (Float) field in DocType 'Production Plan Item Reference'
#. Label of the qty_section (Section Break) field in DocType 'Work Order Item'
#. Label of the qty (Float) field in DocType 'Delivery Schedule Item'
@@ -39012,13 +39126,13 @@ msgstr ""
#: erpnext/controllers/trends.py:276 erpnext/controllers/trends.py:288
#: erpnext/controllers/trends.py:293
#: erpnext/crm/doctype/opportunity_item/opportunity_item.json
-#: erpnext/manufacturing/doctype/bom/bom.js:1086
+#: erpnext/manufacturing/doctype/bom/bom.js:1103
#: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json
#: erpnext/manufacturing/doctype/bom_item/bom_item.json
-#: erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.json
+#: erpnext/manufacturing/doctype/bom_secondary_item/bom_secondary_item.json
#: erpnext/manufacturing/doctype/bom_website_item/bom_website_item.json
#: erpnext/manufacturing/doctype/job_card_item/job_card_item.json
-#: erpnext/manufacturing/doctype/job_card_scrap_item/job_card_scrap_item.json
+#: erpnext/manufacturing/doctype/job_card_secondary_item/job_card_secondary_item.json
#: erpnext/manufacturing/doctype/production_plan_item_reference/production_plan_item_reference.json
#: erpnext/manufacturing/doctype/work_order_item/work_order_item.json
#: erpnext/manufacturing/doctype/workstation/workstation_job_card.html:28
@@ -39028,7 +39142,7 @@ msgstr ""
#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:398
#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:499
#: erpnext/public/js/stock_reservation.js:134
-#: erpnext/public/js/stock_reservation.js:336 erpnext/public/js/utils.js:849
+#: erpnext/public/js/stock_reservation.js:336 erpnext/public/js/utils.js:853
#: erpnext/selling/doctype/delivery_schedule_item/delivery_schedule_item.json
#: erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
#: erpnext/selling/doctype/sales_order/sales_order.js:390
@@ -39062,6 +39176,12 @@ msgstr ""
msgid "Qty "
msgstr ""
+#. Label of the received_qty (Float) field in DocType 'Subcontracting Receipt
+#. Item'
+#: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
+msgid "Qty (As per BOM)"
+msgstr ""
+
#. Label of the company_total_stock (Float) field in DocType 'Sales Invoice
#. Item'
#. Label of the company_total_stock (Float) field in DocType 'Quotation Item'
@@ -39133,7 +39253,7 @@ msgstr ""
#. Label of the for_quantity (Float) field in DocType 'Job Card'
#. Label of the qty (Float) field in DocType 'Work Order'
-#: erpnext/manufacturing/doctype/bom/bom.js:367
+#: erpnext/manufacturing/doctype/bom/bom.js:405
#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/manufacturing/doctype/work_order/work_order.json
#: erpnext/manufacturing/report/process_loss_report/process_loss_report.py:82
@@ -39144,7 +39264,7 @@ msgstr ""
msgid "Qty To Manufacture ({0}) cannot be a fraction for the UOM {2}. To allow this, disable '{1}' in the UOM {2}."
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:251
+#: erpnext/manufacturing/doctype/job_card/job_card.py:259
msgid "Qty To Manufacture in the job card cannot be greater than Qty To Manufacture in the work order for the operation {0}.
Solution: Either you can reduce the Qty To Manufacture in the job card or set the 'Overproduction Percentage For Work Order' in the {1}."
msgstr ""
@@ -39195,7 +39315,7 @@ msgstr ""
msgid "Qty for which recursion isn't applicable."
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1007
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1008
msgid "Qty for {0}"
msgstr ""
@@ -39213,7 +39333,7 @@ msgstr ""
msgid "Qty of Finished Goods Item"
msgstr ""
-#: erpnext/stock/doctype/pick_list/pick_list.py:647
+#: erpnext/stock/doctype/pick_list/pick_list.py:674
msgid "Qty of Finished Goods Item should be greater than 0."
msgstr ""
@@ -39246,8 +39366,8 @@ msgstr ""
msgid "Qty to Fetch"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:312
-#: erpnext/manufacturing/doctype/job_card/job_card.py:871
+#: erpnext/manufacturing/doctype/job_card/job_card.js:310
+#: erpnext/manufacturing/doctype/job_card/job_card.py:889
msgid "Qty to Manufacture"
msgstr ""
@@ -39398,7 +39518,7 @@ msgstr ""
#: erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
-#: erpnext/manufacturing/doctype/bom/bom.js:236
+#: erpnext/manufacturing/doctype/bom/bom.js:274
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/quality_management/workspace/quality/quality.json
@@ -39478,17 +39598,17 @@ msgstr ""
msgid "Quality Inspection Template Name"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:780
+#: erpnext/manufacturing/doctype/job_card/job_card.py:798
msgid "Quality Inspection is required for the item {0} before completing the job card {1}"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:791
-#: erpnext/manufacturing/doctype/job_card/job_card.py:800
+#: erpnext/manufacturing/doctype/job_card/job_card.py:809
+#: erpnext/manufacturing/doctype/job_card/job_card.py:818
msgid "Quality Inspection {0} is not submitted for the item: {1}"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:810
-#: erpnext/manufacturing/doctype/job_card/job_card.py:819
+#: erpnext/manufacturing/doctype/job_card/job_card.py:828
+#: erpnext/manufacturing/doctype/job_card/job_card.py:837
msgid "Quality Inspection {0} is rejected for the item: {1}"
msgstr ""
@@ -39624,7 +39744,7 @@ msgstr ""
#: erpnext/buying/report/purchase_analytics/purchase_analytics.js:28
#: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:213
#: erpnext/manufacturing/doctype/blanket_order_item/blanket_order_item.json
-#: erpnext/manufacturing/doctype/bom/bom.js:454
+#: erpnext/manufacturing/doctype/bom/bom.js:493
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/bom_creator/bom_creator.js:69
#: erpnext/manufacturing/doctype/bom_creator/bom_creator.json
@@ -39708,10 +39828,8 @@ msgstr ""
#. Label of the quantity_and_rate_section (Section Break) field in DocType 'BOM
#. Creator Item'
#. Label of the quantity_and_rate (Section Break) field in DocType 'BOM Item'
-#. Label of the quantity_and_rate (Section Break) field in DocType 'BOM Scrap
-#. Item'
#. Label of the quantity_and_rate (Section Break) field in DocType 'Job Card
-#. Scrap Item'
+#. Secondary Item'
#. Label of the quantity_and_rate (Section Break) field in DocType 'Quotation
#. Item'
#. Label of the quantity_and_rate (Section Break) field in DocType 'Sales Order
@@ -39728,8 +39846,7 @@ msgstr ""
#: erpnext/crm/doctype/opportunity_item/opportunity_item.json
#: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json
#: erpnext/manufacturing/doctype/bom_item/bom_item.json
-#: erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.json
-#: erpnext/manufacturing/doctype/job_card_scrap_item/job_card_scrap_item.json
+#: erpnext/manufacturing/doctype/job_card_secondary_item/job_card_secondary_item.json
#: erpnext/selling/doctype/quotation_item/quotation_item.json
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
@@ -39764,7 +39881,7 @@ msgstr ""
msgid "Quantity must be less than or equal to {0}"
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1037
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1038
#: erpnext/stock/doctype/pick_list/pick_list.js:206
msgid "Quantity must not be more than {0}"
msgstr ""
@@ -39774,13 +39891,13 @@ msgstr ""
msgid "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:734
+#: erpnext/manufacturing/doctype/bom/bom.py:772
msgid "Quantity required for Item {0} in row {1}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:678
-#: erpnext/manufacturing/doctype/job_card/job_card.js:393
-#: erpnext/manufacturing/doctype/job_card/job_card.js:463
+#: erpnext/manufacturing/doctype/bom/bom.py:716
+#: erpnext/manufacturing/doctype/job_card/job_card.js:391
+#: erpnext/manufacturing/doctype/job_card/job_card.js:461
#: erpnext/manufacturing/doctype/workstation/workstation.js:303
msgid "Quantity should be greater than 0"
msgstr ""
@@ -39789,7 +39906,7 @@ msgstr ""
msgid "Quantity to Manufacture"
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2592
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2593
msgid "Quantity to Manufacture can not be zero for the operation {0}"
msgstr ""
@@ -39826,7 +39943,7 @@ msgstr ""
msgid "Query Route String"
msgstr ""
-#: erpnext/accounts/doctype/accounts_settings/accounts_settings.py:176
+#: erpnext/accounts/doctype/accounts_settings/accounts_settings.py:177
msgid "Queue Size should be between 5 and 100"
msgstr ""
@@ -40015,7 +40132,7 @@ msgstr ""
#. Label of the rate (Currency) field in DocType 'BOM Creator Item'
#. Label of the rate (Currency) field in DocType 'BOM Explosion Item'
#. Label of the rate (Currency) field in DocType 'BOM Item'
-#. Label of the rate (Currency) field in DocType 'BOM Scrap Item'
+#. Label of the rate (Currency) field in DocType 'BOM Secondary Item'
#. Label of the rate (Currency) field in DocType 'Work Order Item'
#. Label of the rate (Float) field in DocType 'Product Bundle Item'
#. Label of the rate (Currency) field in DocType 'Quotation Item'
@@ -40064,9 +40181,9 @@ msgstr ""
#: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json
#: erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
#: erpnext/manufacturing/doctype/bom_item/bom_item.json
-#: erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.json
+#: erpnext/manufacturing/doctype/bom_secondary_item/bom_secondary_item.json
#: erpnext/manufacturing/doctype/work_order_item/work_order_item.json
-#: erpnext/public/js/utils.js:859
+#: erpnext/public/js/utils.js:863
#: erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
#: erpnext/selling/doctype/quotation_item/quotation_item.json
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -40388,8 +40505,8 @@ msgstr ""
#. Label of the materials_section (Section Break) field in DocType 'BOM'
#. Label of the section_break_8 (Section Break) field in DocType 'Job Card'
#. Label of the mr_items (Table) field in DocType 'Production Plan'
-#: erpnext/manufacturing/doctype/bom/bom.js:407
-#: erpnext/manufacturing/doctype/bom/bom.js:1059
+#: erpnext/manufacturing/doctype/bom/bom.js:446
+#: erpnext/manufacturing/doctype/bom/bom.js:1076
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
@@ -40453,7 +40570,7 @@ msgstr ""
msgid "Raw Materials Supplied Cost"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:726
+#: erpnext/manufacturing/doctype/bom/bom.py:764
msgid "Raw Materials cannot be blank."
msgstr ""
@@ -40475,7 +40592,7 @@ msgstr ""
#: erpnext/buying/doctype/purchase_order/purchase_order.js:369
#: erpnext/manufacturing/doctype/production_plan/production_plan.js:124
-#: erpnext/manufacturing/doctype/work_order/work_order.js:760
+#: erpnext/manufacturing/doctype/work_order/work_order.js:761
#: erpnext/selling/doctype/sales_order/sales_order.js:968
#: erpnext/selling/doctype/sales_order/sales_order_list.js:70
#: erpnext/stock/doctype/material_request/material_request.js:243
@@ -40771,13 +40888,10 @@ msgid "Received Qty in Stock UOM"
msgstr ""
#. Label of the received_qty (Float) field in DocType 'Purchase Receipt Item'
-#. Label of the received_qty (Float) field in DocType 'Subcontracting Receipt
-#. Item'
#: erpnext/buying/report/item_wise_purchase_history/item_wise_purchase_history.py:119
#: erpnext/buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.py:50
#: erpnext/manufacturing/notification/material_request_receipt_notification/material_request_receipt_notification.html:9
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
-#: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
msgid "Received Quantity"
msgstr ""
@@ -41025,7 +41139,7 @@ msgstr ""
msgid "Reference #{0} dated {1}"
msgstr ""
-#: erpnext/public/js/controllers/transaction.js:2869
+#: erpnext/public/js/controllers/transaction.js:2873
msgid "Reference Date for Early Payment Discount"
msgstr ""
@@ -41216,20 +41330,20 @@ msgstr ""
msgid "Regular"
msgstr ""
-#: erpnext/stock/doctype/inventory_dimension/inventory_dimension.py:198
+#: erpnext/stock/doctype/inventory_dimension/inventory_dimension.py:199
msgid "Rejected "
msgstr ""
#. Label of the rejected_qty (Float) field in DocType 'Purchase Invoice Item'
+#. Label of the rejected_qty (Float) field in DocType 'Subcontracting Receipt
+#. Item'
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
+#: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
msgid "Rejected Qty"
msgstr ""
#. Label of the rejected_qty (Float) field in DocType 'Purchase Receipt Item'
-#. Label of the rejected_qty (Float) field in DocType 'Subcontracting Receipt
-#. Item'
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
-#: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
msgid "Rejected Quantity"
msgstr ""
@@ -41774,7 +41888,7 @@ msgstr ""
msgid "Reqd Qty (BOM)"
msgstr ""
-#: erpnext/public/js/utils.js:875
+#: erpnext/public/js/utils.js:879
msgid "Reqd by date"
msgstr ""
@@ -42046,7 +42160,7 @@ msgstr ""
msgid "Reservation Based On"
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.js:918
+#: erpnext/manufacturing/doctype/work_order/work_order.js:919
#: erpnext/selling/doctype/sales_order/sales_order.js:99
#: erpnext/stock/doctype/pick_list/pick_list.js:150
#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:180
@@ -42161,14 +42275,14 @@ msgstr ""
msgid "Reserved Quantity for Production"
msgstr ""
-#: erpnext/stock/stock_ledger.py:2334
+#: erpnext/stock/stock_ledger.py:2341
msgid "Reserved Serial No."
msgstr ""
#. Label of the reserved_stock (Float) field in DocType 'Bin'
#. Name of a report
#: erpnext/manufacturing/doctype/plant_floor/stock_summary_template.html:24
-#: erpnext/manufacturing/doctype/work_order/work_order.js:934
+#: erpnext/manufacturing/doctype/work_order/work_order.js:935
#: erpnext/public/js/stock_reservation.js:236
#: erpnext/selling/doctype/sales_order/sales_order.js:127
#: erpnext/selling/doctype/sales_order/sales_order.js:457
@@ -42177,13 +42291,13 @@ msgstr ""
#: erpnext/stock/doctype/pick_list/pick_list.js:170
#: erpnext/stock/report/reserved_stock/reserved_stock.json
#: erpnext/stock/report/stock_balance/stock_balance.py:572
-#: erpnext/stock/stock_ledger.py:2318
+#: erpnext/stock/stock_ledger.py:2325
#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:205
#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:333
msgid "Reserved Stock"
msgstr ""
-#: erpnext/stock/stock_ledger.py:2363
+#: erpnext/stock/stock_ledger.py:2370
msgid "Reserved Stock for Batch"
msgstr ""
@@ -42195,7 +42309,7 @@ msgstr ""
msgid "Reserved Stock for Sub-assembly"
msgstr ""
-#: erpnext/controllers/buying_controller.py:645
+#: erpnext/controllers/buying_controller.py:649
msgid "Reserved Warehouse is mandatory for the Item {item_code} in Raw Materials supplied."
msgstr ""
@@ -43138,11 +43252,11 @@ msgid "Row #{0}: Acceptance Criteria Formula is required."
msgstr ""
#: erpnext/controllers/subcontracting_controller.py:125
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:534
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:571
msgid "Row #{0}: Accepted Warehouse and Rejected Warehouse cannot be same"
msgstr ""
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:527
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:564
msgid "Row #{0}: Accepted Warehouse is mandatory for the accepted Item {1}"
msgstr ""
@@ -43187,7 +43301,7 @@ msgstr ""
msgid "Row #{0}: Batch No {1} is already selected."
msgstr ""
-#: erpnext/controllers/subcontracting_inward_controller.py:430
+#: erpnext/controllers/subcontracting_inward_controller.py:435
msgid "Row #{0}: Batch No(s) {1} is not a part of the linked Subcontracting Inward Order. Please select valid Batch No(s)."
msgstr ""
@@ -43195,15 +43309,15 @@ msgstr ""
msgid "Row #{0}: Cannot allocate more than {1} against payment term {2}"
msgstr ""
-#: erpnext/controllers/subcontracting_inward_controller.py:631
+#: erpnext/controllers/subcontracting_inward_controller.py:637
msgid "Row #{0}: Cannot cancel this Manufacturing Stock Entry as billed quantity of Item {1} cannot be greater than consumed quantity."
msgstr ""
-#: erpnext/controllers/subcontracting_inward_controller.py:610
-msgid "Row #{0}: Cannot cancel this Manufacturing Stock Entry as quantity of Scrap Item {1} produced cannot be less than quantity delivered."
+#: erpnext/controllers/subcontracting_inward_controller.py:616
+msgid "Row #{0}: Cannot cancel this Manufacturing Stock Entry as quantity of Secondary Item {1} produced cannot be less than quantity delivered."
msgstr ""
-#: erpnext/controllers/subcontracting_inward_controller.py:478
+#: erpnext/controllers/subcontracting_inward_controller.py:483
msgid "Row #{0}: Cannot cancel this Stock Entry as returned quantity cannot be greater than delivered quantity for Item {1} in the linked Subcontracting Inward Order"
msgstr ""
@@ -43235,7 +43349,7 @@ msgstr ""
msgid "Row #{0}: Cannot set Rate if the billed amount is greater than the amount for Item {1}."
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1109
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1127
msgid "Row #{0}: Cannot transfer more than Required Qty {1} for Item {2} against Job Card {3}"
msgstr ""
@@ -43275,13 +43389,13 @@ msgstr ""
msgid "Row #{0}: Cumulative threshold cannot be less than Single Transaction threshold"
msgstr ""
-#: erpnext/controllers/subcontracting_inward_controller.py:88
+#: erpnext/controllers/subcontracting_inward_controller.py:90
msgid "Row #{0}: Customer Provided Item {1} against Subcontracting Inward Order Item {2} ({3}) cannot be added multiple times."
msgstr ""
-#: erpnext/controllers/subcontracting_inward_controller.py:176
-#: erpnext/controllers/subcontracting_inward_controller.py:301
-#: erpnext/controllers/subcontracting_inward_controller.py:349
+#: erpnext/controllers/subcontracting_inward_controller.py:178
+#: erpnext/controllers/subcontracting_inward_controller.py:304
+#: erpnext/controllers/subcontracting_inward_controller.py:352
msgid "Row #{0}: Customer Provided Item {1} cannot be added multiple times in the Subcontracting Inward process."
msgstr ""
@@ -43293,7 +43407,7 @@ msgstr ""
msgid "Row #{0}: Customer Provided Item {1} does not exist in the Required Items table linked to the Subcontracting Inward Order."
msgstr ""
-#: erpnext/controllers/subcontracting_inward_controller.py:285
+#: erpnext/controllers/subcontracting_inward_controller.py:288
msgid "Row #{0}: Customer Provided Item {1} exceeds quantity available through Subcontracting Inward Order"
msgstr ""
@@ -43301,12 +43415,12 @@ msgstr ""
msgid "Row #{0}: Customer Provided Item {1} has insufficient quantity in the Subcontracting Inward Order. Available quantity is {2}."
msgstr ""
-#: erpnext/controllers/subcontracting_inward_controller.py:312
+#: erpnext/controllers/subcontracting_inward_controller.py:315
msgid "Row #{0}: Customer Provided Item {1} is not a part of Subcontracting Inward Order {2}"
msgstr ""
-#: erpnext/controllers/subcontracting_inward_controller.py:218
-#: erpnext/controllers/subcontracting_inward_controller.py:360
+#: erpnext/controllers/subcontracting_inward_controller.py:220
+#: erpnext/controllers/subcontracting_inward_controller.py:363
msgid "Row #{0}: Customer Provided Item {1} is not a part of Work Order {2}"
msgstr ""
@@ -43357,12 +43471,12 @@ msgstr ""
msgid "Row #{0}: Finished Good must be {1}"
msgstr ""
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:515
-msgid "Row #{0}: Finished Good reference is mandatory for Scrap Item {1}."
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:552
+msgid "Row #{0}: Finished Good reference is mandatory for Secondary Item {1}."
msgstr ""
-#: erpnext/controllers/subcontracting_inward_controller.py:168
-#: erpnext/controllers/subcontracting_inward_controller.py:291
+#: erpnext/controllers/subcontracting_inward_controller.py:170
+#: erpnext/controllers/subcontracting_inward_controller.py:294
msgid "Row #{0}: For Customer Provided Item {1}, Source Warehouse must be {2}"
msgstr ""
@@ -43382,7 +43496,7 @@ msgstr ""
msgid "Row #{0}: From Date cannot be before To Date"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:861
+#: erpnext/manufacturing/doctype/job_card/job_card.py:879
msgid "Row #{0}: From Time and To Time fields are required"
msgstr ""
@@ -43390,7 +43504,7 @@ msgstr ""
msgid "Row #{0}: Item added"
msgstr ""
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1535
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1542
msgid "Row #{0}: Item {1} cannot be transferred more than {2} against {3} {4}"
msgstr ""
@@ -43414,7 +43528,7 @@ msgstr ""
msgid "Row #{0}: Item {1} in warehouse {2}: Available {3}, Needed {4}."
msgstr ""
-#: erpnext/controllers/subcontracting_inward_controller.py:63
+#: erpnext/controllers/subcontracting_inward_controller.py:65
msgid "Row #{0}: Item {1} is not a Customer Provided Item."
msgstr ""
@@ -43422,8 +43536,8 @@ msgstr ""
msgid "Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it."
msgstr ""
-#: erpnext/controllers/subcontracting_inward_controller.py:113
-#: erpnext/controllers/subcontracting_inward_controller.py:491
+#: erpnext/controllers/subcontracting_inward_controller.py:115
+#: erpnext/controllers/subcontracting_inward_controller.py:496
msgid "Row #{0}: Item {1} is not a part of Subcontracting Inward Order {2}"
msgstr ""
@@ -43435,11 +43549,11 @@ msgstr ""
msgid "Row #{0}: Item {1} is not a stock item"
msgstr ""
-#: erpnext/controllers/subcontracting_inward_controller.py:77
+#: erpnext/controllers/subcontracting_inward_controller.py:79
msgid "Row #{0}: Item {1} mismatch. Changing of item code is not permitted, add another row instead."
msgstr ""
-#: erpnext/controllers/subcontracting_inward_controller.py:126
+#: erpnext/controllers/subcontracting_inward_controller.py:128
msgid "Row #{0}: Item {1} mismatch. Changing of item code is not permitted."
msgstr ""
@@ -43471,8 +43585,8 @@ msgstr ""
msgid "Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}."
msgstr ""
-#: erpnext/controllers/subcontracting_inward_controller.py:206
-#: erpnext/controllers/subcontracting_inward_controller.py:339
+#: erpnext/controllers/subcontracting_inward_controller.py:208
+#: erpnext/controllers/subcontracting_inward_controller.py:342
msgid "Row #{0}: Overconsumption of Customer Provided Item {1} against Work Order {2} is not allowed in the Subcontracting Inward process."
msgstr ""
@@ -43484,7 +43598,7 @@ msgstr ""
msgid "Row #{0}: Please select the BOM No in Assembly Items"
msgstr ""
-#: erpnext/controllers/subcontracting_inward_controller.py:104
+#: erpnext/controllers/subcontracting_inward_controller.py:106
msgid "Row #{0}: Please select the Finished Good Item against which this Customer Provided Item will be used."
msgstr ""
@@ -43500,6 +43614,11 @@ msgstr ""
msgid "Row #{0}: Please update deferred revenue/expense account in item row or default account in company master"
msgstr ""
+#: erpnext/manufacturing/doctype/bom/bom.py:345
+#, python-format
+msgid "Row #{0}: Process Loss Percentage should be less than 100% for {1} Item {2}"
+msgstr ""
+
#: erpnext/public/js/utils/barcode_scanner.js:425
msgid "Row #{0}: Qty increased by {1}"
msgstr ""
@@ -43533,10 +43652,14 @@ msgstr ""
msgid "Row #{0}: Quantity for Item {1} cannot be zero."
msgstr ""
-#: erpnext/controllers/subcontracting_inward_controller.py:532
+#: erpnext/controllers/subcontracting_inward_controller.py:537
msgid "Row #{0}: Quantity of Item {1} cannot be more than {2} {3} against Subcontracting Inward Order {4}"
msgstr ""
+#: erpnext/manufacturing/doctype/bom/bom.py:338
+msgid "Row #{0}: Quantity should be greater than 0 for {1} Item {2}"
+msgstr ""
+
#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1696
msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0."
msgstr ""
@@ -43556,8 +43679,8 @@ msgstr ""
msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning"
msgstr ""
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:508
-msgid "Row #{0}: Rejected Qty cannot be set for Scrap Item {1}."
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:545
+msgid "Row #{0}: Rejected Qty cannot be set for Secondary Item {1}."
msgstr ""
#: erpnext/controllers/subcontracting_controller.py:118
@@ -43572,16 +43695,16 @@ msgstr ""
msgid "Row #{0}: Return Against is required for returning asset"
msgstr ""
-#: erpnext/controllers/subcontracting_inward_controller.py:140
+#: erpnext/controllers/subcontracting_inward_controller.py:142
msgid "Row #{0}: Returned quantity cannot be greater than available quantity for Item {1}"
msgstr ""
-#: erpnext/controllers/subcontracting_inward_controller.py:153
+#: erpnext/controllers/subcontracting_inward_controller.py:155
msgid "Row #{0}: Returned quantity cannot be greater than available quantity to return for Item {1}"
msgstr ""
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:503
-msgid "Row #{0}: Scrap Item Qty cannot be zero"
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:540
+msgid "Row #{0}: Secondary Item Qty cannot be zero"
msgstr ""
#: erpnext/controllers/selling_controller.py:296
@@ -43608,7 +43731,7 @@ msgstr ""
msgid "Row #{0}: Serial No {1} is already selected."
msgstr ""
-#: erpnext/controllers/subcontracting_inward_controller.py:419
+#: erpnext/controllers/subcontracting_inward_controller.py:424
msgid "Row #{0}: Serial No(s) {1} are not a part of the linked Subcontracting Inward Order. Please select valid Serial No(s)."
msgstr ""
@@ -43632,7 +43755,7 @@ msgstr ""
msgid "Row #{0}: Since 'Track Semi Finished Goods' is enabled, the BOM {1} cannot be used for Sub Assembly Items"
msgstr ""
-#: erpnext/controllers/subcontracting_inward_controller.py:398
+#: erpnext/controllers/subcontracting_inward_controller.py:403
msgid "Row #{0}: Source Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order"
msgstr ""
@@ -43697,7 +43820,7 @@ msgstr ""
msgid "Row #{0}: Stock quantity {1} ({2}) for item {3} cannot exceed {4}"
msgstr ""
-#: erpnext/controllers/subcontracting_inward_controller.py:392
+#: erpnext/controllers/subcontracting_inward_controller.py:397
msgid "Row #{0}: Target Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order"
msgstr ""
@@ -43729,7 +43852,7 @@ msgstr ""
msgid "Row #{0}: Withholding Amount {1} does not match calculated amount {2}."
msgstr ""
-#: erpnext/controllers/subcontracting_inward_controller.py:572
+#: erpnext/controllers/subcontracting_inward_controller.py:577
msgid "Row #{0}: Work Order exists against full or partial quantity of Item {1}"
msgstr ""
@@ -43749,7 +43872,7 @@ msgstr ""
msgid "Row #{0}: {1} is not a valid reading field. Please refer to the field description."
msgstr ""
-#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py:126
+#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py:131
msgid "Row #{0}: {1} is required to create the Opening {2} Invoices"
msgstr ""
@@ -43769,23 +43892,23 @@ msgstr ""
msgid "Row #{idx}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor."
msgstr ""
-#: erpnext/controllers/buying_controller.py:576
+#: erpnext/controllers/buying_controller.py:580
msgid "Row #{idx}: Item rate has been updated as per valuation rate since its an internal stock transfer."
msgstr ""
-#: erpnext/controllers/buying_controller.py:1060
+#: erpnext/controllers/buying_controller.py:1064
msgid "Row #{idx}: Please enter a location for the asset item {item_code}."
msgstr ""
-#: erpnext/controllers/buying_controller.py:699
+#: erpnext/controllers/buying_controller.py:703
msgid "Row #{idx}: Received Qty must be equal to Accepted + Rejected Qty for Item {item_code}."
msgstr ""
-#: erpnext/controllers/buying_controller.py:712
+#: erpnext/controllers/buying_controller.py:716
msgid "Row #{idx}: {field_label} can not be negative for item {item_code}."
msgstr ""
-#: erpnext/controllers/buying_controller.py:665
+#: erpnext/controllers/buying_controller.py:669
msgid "Row #{idx}: {field_label} is mandatory."
msgstr ""
@@ -43793,7 +43916,7 @@ msgstr ""
msgid "Row #{idx}: {from_warehouse_field} and {to_warehouse_field} cannot be same."
msgstr ""
-#: erpnext/controllers/buying_controller.py:1177
+#: erpnext/controllers/buying_controller.py:1181
msgid "Row #{idx}: {schedule_date} cannot be before {transaction_date}."
msgstr ""
@@ -43801,7 +43924,7 @@ msgstr ""
msgid "Row #{}: Currency of {} - {} doesn't matches company currency."
msgstr ""
-#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py:108
+#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py:113
msgid "Row #{}: Either Party ID or Party Name is required"
msgstr ""
@@ -43821,7 +43944,7 @@ msgstr ""
msgid "Row #{}: POS Invoice {} is not submitted yet"
msgstr ""
-#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py:118
+#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py:123
msgid "Row #{}: Party ID is required"
msgstr ""
@@ -43845,7 +43968,7 @@ msgstr ""
msgid "Row #{}: You cannot add positive quantities in a return invoice. Please remove item {} to complete the return."
msgstr ""
-#: erpnext/stock/doctype/pick_list/pick_list.py:233
+#: erpnext/stock/doctype/pick_list/pick_list.py:234
msgid "Row #{}: item {} has been picked already."
msgstr ""
@@ -43854,7 +43977,7 @@ msgstr ""
msgid "Row #{}: {}"
msgstr ""
-#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py:121
+#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py:126
msgid "Row #{}: {} {} does not exist."
msgstr ""
@@ -43866,15 +43989,15 @@ msgstr ""
msgid "Row No {0}: Warehouse is required. Please set a Default Warehouse for Item {1} and Company {2}"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:728
+#: erpnext/manufacturing/doctype/job_card/job_card.py:746
msgid "Row {0} : Operation is required against the raw material item {1}"
msgstr ""
-#: erpnext/stock/doctype/pick_list/pick_list.py:263
+#: erpnext/stock/doctype/pick_list/pick_list.py:264
msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required."
msgstr ""
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1559
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1566
msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}"
msgstr ""
@@ -43906,7 +44029,7 @@ msgstr ""
msgid "Row {0}: Allocated amount {1} must be less than or equal to remaining payment amount {2}"
msgstr ""
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1220
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1227
msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials."
msgstr ""
@@ -43918,7 +44041,7 @@ msgstr ""
msgid "Row {0}: Both Debit and Credit values cannot be zero"
msgstr ""
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:550
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:587
msgid ""
"Row {0}: Consumed Qty {1} {2} must be less than or equal to Available Qty For Consumption\n"
"\t\t\t\t\t{3} {4} in Consumed Items Table."
@@ -43932,7 +44055,7 @@ msgstr ""
msgid "Row {0}: Cost Center {1} does not belong to Company {2}"
msgstr ""
-#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:174
+#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:175
msgid "Row {0}: Cost center is required for an item {1}"
msgstr ""
@@ -43940,7 +44063,7 @@ msgstr ""
msgid "Row {0}: Credit entry can not be linked with a {1}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:538
+#: erpnext/manufacturing/doctype/bom/bom.py:578
msgid "Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}"
msgstr ""
@@ -43965,7 +44088,7 @@ msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory.
msgstr ""
#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1018
-#: erpnext/controllers/taxes_and_totals.py:1340
+#: erpnext/controllers/taxes_and_totals.py:1377
msgid "Row {0}: Exchange Rate is mandatory"
msgstr ""
@@ -43977,7 +44100,7 @@ msgstr ""
msgid "Row {0}: Expected Value After Useful Life must be less than Net Purchase Amount"
msgstr ""
-#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:183
+#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:187
msgid "Row {0}: Expense Account {1} is linked to company {2}. Please select an account belonging to company {3}."
msgstr ""
@@ -44001,7 +44124,7 @@ msgstr ""
msgid "Row {0}: From Time and To Time is mandatory."
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:306
+#: erpnext/manufacturing/doctype/job_card/job_card.py:324
#: erpnext/projects/doctype/timesheet/timesheet.py:225
msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}"
msgstr ""
@@ -44010,7 +44133,7 @@ msgstr ""
msgid "Row {0}: From Warehouse is mandatory for internal transfers"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:297
+#: erpnext/manufacturing/doctype/job_card/job_card.py:315
msgid "Row {0}: From time must be less than to time"
msgstr ""
@@ -44046,7 +44169,7 @@ msgstr ""
msgid "Row {0}: Item {1}'s quantity cannot be higher than the available quantity."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1211
+#: erpnext/manufacturing/doctype/bom/bom.py:1244
msgid "Row {0}: Operation time should be greater than 0 for operation {1}"
msgstr ""
@@ -44110,7 +44233,7 @@ msgstr ""
msgid "Row {0}: Project must be same as the one set in the Timesheet: {1}."
msgstr ""
-#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:151
+#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:152
msgid "Row {0}: Purchase Invoice {1} has no stock impact."
msgstr ""
@@ -44142,7 +44265,7 @@ msgstr ""
msgid "Row {0}: Shift cannot be changed since the depreciation has already been processed"
msgstr ""
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1572
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1579
msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}"
msgstr ""
@@ -44170,7 +44293,7 @@ msgstr ""
msgid "Row {0}: To set {1} periodicity, difference between from and to date must be greater than or equal to {2}"
msgstr ""
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:3362
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:3394
msgid "Row {0}: Transferred quantity cannot be greater than the requested quantity."
msgstr ""
@@ -44178,15 +44301,15 @@ msgstr ""
msgid "Row {0}: UOM Conversion Factor is mandatory"
msgstr ""
-#: erpnext/stock/doctype/pick_list/pick_list.py:169
+#: erpnext/stock/doctype/pick_list/pick_list.py:170
msgid "Row {0}: Warehouse is required"
msgstr ""
-#: erpnext/stock/doctype/pick_list/pick_list.py:178
+#: erpnext/stock/doctype/pick_list/pick_list.py:179
msgid "Row {0}: Warehouse {1} is linked to company {2}. Please select a warehouse belonging to company {3}."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1205
+#: erpnext/manufacturing/doctype/bom/bom.py:1238
#: erpnext/manufacturing/doctype/work_order/work_order.py:415
msgid "Row {0}: Workstation or Workstation Type is mandatory for an operation {1}"
msgstr ""
@@ -44211,11 +44334,11 @@ msgstr ""
msgid "Row {0}: {1} {2} does not match with {3}"
msgstr ""
-#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:133
+#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:134
msgid "Row {0}: {1} {2} is linked to company {3}. Please select a document belonging to company {4}."
msgstr ""
-#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:107
+#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:108
msgid "Row {0}: {2} Item {1} does not exist in {2} {3}"
msgstr ""
@@ -44223,7 +44346,7 @@ msgstr ""
msgid "Row {1}: Quantity ({0}) cannot be a fraction. To allow this, disable '{2}' in UOM {3}."
msgstr ""
-#: erpnext/controllers/buying_controller.py:1042
+#: erpnext/controllers/buying_controller.py:1046
msgid "Row {idx}: Asset Naming Series is mandatory for the auto creation of assets for item {item_code}."
msgstr ""
@@ -44332,7 +44455,7 @@ msgstr ""
msgid "SLA Paused On"
msgstr ""
-#: erpnext/public/js/utils.js:1239
+#: erpnext/public/js/utils.js:1243
msgid "SLA is on hold since {0}"
msgstr ""
@@ -45279,12 +45402,12 @@ msgstr ""
#. Label of the sample_size (Float) field in DocType 'Quality Inspection'
#: erpnext/manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:93
-#: erpnext/public/js/controllers/transaction.js:2926
+#: erpnext/public/js/controllers/transaction.js:2930
#: erpnext/stock/doctype/quality_inspection/quality_inspection.json
msgid "Sample Size"
msgstr ""
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:3852
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:3884
msgid "Sample quantity {0} cannot be more than received quantity {1}"
msgstr ""
@@ -45385,7 +45508,7 @@ msgstr ""
msgid "Schedule Date"
msgstr ""
-#: erpnext/public/js/controllers/transaction.js:486
+#: erpnext/public/js/controllers/transaction.js:490
msgid "Schedule Name"
msgstr ""
@@ -45487,59 +45610,25 @@ msgstr ""
msgid "Scoring Standings"
msgstr ""
-#. Label of the scrap_section (Tab Break) field in DocType 'BOM'
-#: erpnext/manufacturing/doctype/bom/bom.json
-msgid "Scrap & Process Loss"
+#. Option for the 'Type' (Select) field in DocType 'BOM Secondary Item'
+#. Option for the 'Type' (Select) field in DocType 'Job Card Secondary Item'
+#. Option for the 'Type' (Select) field in DocType 'Stock Entry Detail'
+#. Option for the 'Type' (Select) field in DocType 'Subcontracting Inward Order
+#. Secondary Item'
+#. Option for the 'Type' (Select) field in DocType 'Subcontracting Receipt
+#. Item'
+#: erpnext/manufacturing/doctype/bom_secondary_item/bom_secondary_item.json
+#: erpnext/manufacturing/doctype/job_card_secondary_item/job_card_secondary_item.json
+#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
+#: erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json
+#: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
+msgid "Scrap"
msgstr ""
#: erpnext/assets/doctype/asset/asset.js:163
msgid "Scrap Asset"
msgstr ""
-#. Label of the scrap_cost_per_qty (Float) field in DocType 'Subcontracting
-#. Receipt Item'
-#: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
-msgid "Scrap Cost Per Qty"
-msgstr ""
-
-#. Label of the item_code (Link) field in DocType 'Job Card Scrap Item'
-#: erpnext/manufacturing/doctype/job_card_scrap_item/job_card_scrap_item.json
-msgid "Scrap Item Code"
-msgstr ""
-
-#. Label of the item_name (Data) field in DocType 'Job Card Scrap Item'
-#: erpnext/manufacturing/doctype/job_card_scrap_item/job_card_scrap_item.json
-msgid "Scrap Item Name"
-msgstr ""
-
-#. Label of the scrap_items (Table) field in DocType 'BOM'
-#. Label of the scrap_items_section (Section Break) field in DocType 'BOM'
-#. Label of the scrap_items_section (Tab Break) field in DocType 'Job Card'
-#. Label of the scrap_items (Table) field in DocType 'Job Card'
-#. Label of the scrap_items (Table) field in DocType 'Subcontracting Inward
-#. Order'
-#: erpnext/manufacturing/doctype/bom/bom.json
-#: erpnext/manufacturing/doctype/job_card/job_card.json
-#: erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.json
-msgid "Scrap Items"
-msgstr ""
-
-#. Label of the scrap_items_generated_section (Section Break) field in DocType
-#. 'Subcontracting Inward Order'
-#: erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.json
-msgid "Scrap Items Generated"
-msgstr ""
-
-#. Label of the scrap_material_cost (Currency) field in DocType 'BOM'
-#: erpnext/manufacturing/doctype/bom/bom.json
-msgid "Scrap Material Cost"
-msgstr ""
-
-#. Label of the base_scrap_material_cost (Currency) field in DocType 'BOM'
-#: erpnext/manufacturing/doctype/bom/bom.json
-msgid "Scrap Material Cost(Company Currency)"
-msgstr ""
-
#. Label of the scrap_warehouse (Link) field in DocType 'Work Order'
#: erpnext/manufacturing/doctype/work_order/work_order.json
msgid "Scrap Warehouse"
@@ -45594,6 +45683,50 @@ msgstr ""
msgid "Second Email"
msgstr ""
+#. Label of the item_code (Link) field in DocType 'Job Card Secondary Item'
+#: erpnext/manufacturing/doctype/job_card_secondary_item/job_card_secondary_item.json
+msgid "Secondary Item Code"
+msgstr ""
+
+#. Label of the item_name (Data) field in DocType 'Job Card Secondary Item'
+#: erpnext/manufacturing/doctype/job_card_secondary_item/job_card_secondary_item.json
+msgid "Secondary Item Name"
+msgstr ""
+
+#. Label of the secondary_items (Table) field in DocType 'BOM'
+#. Label of the secondary_items_tab (Tab Break) field in DocType 'BOM'
+#. Label of the secondary_items (Table) field in DocType 'Job Card'
+#. Label of the secondary_items_section (Tab Break) field in DocType 'Job Card'
+#. Label of the secondary_items (Table) field in DocType 'Subcontracting Inward
+#. Order'
+#: erpnext/manufacturing/doctype/bom/bom.json
+#: erpnext/manufacturing/doctype/job_card/job_card.json
+#: erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.json
+msgid "Secondary Items"
+msgstr ""
+
+#. Label of the secondary_items_cost (Currency) field in DocType 'BOM'
+#: erpnext/manufacturing/doctype/bom/bom.json
+msgid "Secondary Items Cost"
+msgstr ""
+
+#. Label of the base_secondary_items_cost (Currency) field in DocType 'BOM'
+#: erpnext/manufacturing/doctype/bom/bom.json
+msgid "Secondary Items Cost (Company Currency)"
+msgstr ""
+
+#. Label of the secondary_items_cost_per_qty (Currency) field in DocType
+#. 'Subcontracting Receipt Item'
+#: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
+msgid "Secondary Items Cost Per Qty"
+msgstr ""
+
+#. Label of the scrap_items_generated_section (Section Break) field in DocType
+#. 'Subcontracting Inward Order'
+#: erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.json
+msgid "Secondary Items Generated"
+msgstr ""
+
#. Label of the secondary_party (Dynamic Link) field in DocType 'Party Link'
#: erpnext/accounts/doctype/party_link/party_link.json
msgid "Secondary Party"
@@ -45643,7 +45776,7 @@ msgstr ""
msgid "Select Accounting Dimension."
msgstr ""
-#: erpnext/public/js/utils.js:535
+#: erpnext/public/js/utils.js:539
msgid "Select Alternate Item"
msgstr ""
@@ -45697,7 +45830,7 @@ msgstr ""
msgid "Select Company Address"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:541
+#: erpnext/manufacturing/doctype/job_card/job_card.js:539
msgid "Select Corrective Operation"
msgstr ""
@@ -45758,7 +45891,7 @@ msgstr ""
msgid "Select Items based on Delivery Date"
msgstr ""
-#: erpnext/public/js/controllers/transaction.js:2965
+#: erpnext/public/js/controllers/transaction.js:2969
msgid "Select Items for Quality Inspection"
msgstr ""
@@ -45788,7 +45921,7 @@ msgstr ""
msgid "Select Loyalty Program"
msgstr ""
-#: erpnext/public/js/controllers/transaction.js:473
+#: erpnext/public/js/controllers/transaction.js:477
msgid "Select Payment Schedule"
msgstr ""
@@ -45796,7 +45929,7 @@ msgstr ""
msgid "Select Possible Supplier"
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1043
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1044
#: erpnext/stock/doctype/pick_list/pick_list.js:216
msgid "Select Quantity"
msgstr ""
@@ -45917,7 +46050,7 @@ msgstr ""
msgid "Select item group"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:434
+#: erpnext/manufacturing/doctype/bom/bom.js:473
msgid "Select template item"
msgstr ""
@@ -45930,11 +46063,11 @@ msgstr ""
msgid "Select the Default Workstation where the Operation will be performed. This will be fetched in BOMs and Work Orders."
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1145
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1146
msgid "Select the Item to be manufactured."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:966
+#: erpnext/manufacturing/doctype/bom/bom.js:983
msgid "Select the Item to be manufactured. The Item name, UoM, Company, and Currency will be fetched automatically."
msgstr ""
@@ -45955,11 +46088,11 @@ msgstr ""
msgid "Select the date and your timezone"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:985
+#: erpnext/manufacturing/doctype/bom/bom.js:1002
msgid "Select the raw materials (Items) required to manufacture the Item"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:489
+#: erpnext/manufacturing/doctype/bom/bom.js:528
msgid "Select variant item code for the template item {0}"
msgstr ""
@@ -46090,7 +46223,7 @@ msgstr ""
#: erpnext/selling/doctype/selling_settings/selling_settings.json
#: erpnext/selling/workspace/selling/selling.json
#: erpnext/setup/workspace/erpnext_settings/erpnext_settings.json
-#: erpnext/stock/doctype/stock_settings/stock_settings.py:260
+#: erpnext/stock/doctype/stock_settings/stock_settings.py:258
#: erpnext/workspace_sidebar/erpnext_settings.json
msgid "Selling Settings"
msgstr ""
@@ -46148,7 +46281,7 @@ msgid "Send Emails to Suppliers"
msgstr ""
#. Label of the send_sms (Button) field in DocType 'SMS Center'
-#: erpnext/public/js/controllers/transaction.js:692
+#: erpnext/public/js/controllers/transaction.js:696
#: erpnext/selling/doctype/sms_center/sms_center.json
msgid "Send SMS"
msgstr ""
@@ -46232,7 +46365,7 @@ msgstr ""
msgid "Serial / Batch No"
msgstr ""
-#: erpnext/public/js/utils.js:197
+#: erpnext/public/js/utils.js:201
msgid "Serial / Batch Nos"
msgstr ""
@@ -46284,7 +46417,7 @@ msgstr ""
#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:74
#: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:114
-#: erpnext/public/js/controllers/transaction.js:2939
+#: erpnext/public/js/controllers/transaction.js:2943
#: erpnext/public/js/utils/serial_no_batch_selector.js:421
#: erpnext/selling/doctype/installation_note_item/installation_note_item.json
#: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
@@ -46345,7 +46478,7 @@ msgstr ""
msgid "Serial No Range"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2601
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2639
msgid "Serial No Reserved"
msgstr ""
@@ -46431,7 +46564,7 @@ msgstr ""
msgid "Serial No {0} does not exist"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:3391
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:3429
msgid "Serial No {0} does not exists"
msgstr ""
@@ -46485,11 +46618,11 @@ msgstr ""
msgid "Serial Nos and Batches"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1887
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1925
msgid "Serial Nos are created successfully"
msgstr ""
-#: erpnext/stock/stock_ledger.py:2324
+#: erpnext/stock/stock_ledger.py:2331
msgid "Serial Nos are reserved in Stock Reservation Entries, you need to unreserve them before proceeding."
msgstr ""
@@ -46566,11 +46699,11 @@ msgstr ""
msgid "Serial and Batch Bundle"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2109
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2147
msgid "Serial and Batch Bundle created"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2181
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2219
msgid "Serial and Batch Bundle updated"
msgstr ""
@@ -46943,12 +47076,12 @@ msgid "Service Stop Date"
msgstr ""
#: erpnext/accounts/deferred_revenue.py:45
-#: erpnext/public/js/controllers/transaction.js:1775
+#: erpnext/public/js/controllers/transaction.js:1779
msgid "Service Stop Date cannot be after Service End Date"
msgstr ""
#: erpnext/accounts/deferred_revenue.py:42
-#: erpnext/public/js/controllers/transaction.js:1772
+#: erpnext/public/js/controllers/transaction.js:1776
msgid "Service Stop Date cannot be before Service Start Date"
msgstr ""
@@ -46987,8 +47120,8 @@ msgstr ""
msgid "Set Delivery Warehouse"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:412
-#: erpnext/manufacturing/doctype/job_card/job_card.js:481
+#: erpnext/manufacturing/doctype/job_card/job_card.js:410
+#: erpnext/manufacturing/doctype/job_card/job_card.js:479
msgid "Set Finished Good Quantity"
msgstr ""
@@ -47033,10 +47166,10 @@ msgstr ""
msgid "Set New Release Date"
msgstr ""
-#. Label of the set_op_cost_and_scrap_from_sub_assemblies (Check) field in
-#. DocType 'Manufacturing Settings'
+#. Label of the set_op_cost_and_secondary_items_from_sub_assemblies (Check)
+#. field in DocType 'Manufacturing Settings'
#: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
-msgid "Set Operating Cost / Scrap Items From Sub-assemblies"
+msgid "Set Operating Cost / Secondary Items From Sub-assemblies"
msgstr ""
#. Label of the set_cost_based_on_bom_qty (Check) field in DocType 'BOM
@@ -47054,7 +47187,7 @@ msgstr ""
msgid "Set Posting Date"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:1012
+#: erpnext/manufacturing/doctype/bom/bom.js:1029
msgid "Set Process Loss Item Quantity"
msgstr ""
@@ -47177,7 +47310,7 @@ msgstr ""
msgid "Set fieldname from which you want to fetch the data from the parent form."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:1002
+#: erpnext/manufacturing/doctype/bom/bom.js:1019
msgid "Set quantity of process loss item:"
msgstr ""
@@ -47193,7 +47326,7 @@ msgstr ""
msgid "Set targets Item Group-wise for this Sales Person."
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1202
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1203
msgid "Set the Planned Start Date (an Estimated Date at which you want the Production to begin)"
msgstr ""
@@ -47274,7 +47407,7 @@ msgstr ""
msgid "Setting Item Locations..."
msgstr ""
-#: erpnext/setup/setup_wizard/setup_wizard.py:34
+#: erpnext/setup/setup_wizard/setup_wizard.py:25
msgid "Setting defaults"
msgstr ""
@@ -47284,11 +47417,11 @@ msgstr ""
msgid "Setting the account as a Company Account is necessary for Bank Reconciliation"
msgstr ""
-#: erpnext/setup/setup_wizard/setup_wizard.py:29
+#: erpnext/setup/setup_wizard/setup_wizard.py:20
msgid "Setting up company"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1184
+#: erpnext/manufacturing/doctype/bom/bom.py:1217
#: erpnext/manufacturing/doctype/work_order/work_order.py:1475
msgid "Setting {0} is required"
msgstr ""
@@ -47707,7 +47840,7 @@ msgstr ""
msgid "Show Barcode Field in Stock Transactions"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.js:192
+#: erpnext/accounts/report/general_ledger/general_ledger.js:193
msgid "Show Cancelled Entries"
msgstr ""
@@ -47715,7 +47848,7 @@ msgstr ""
msgid "Show Completed"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.js:202
+#: erpnext/accounts/report/general_ledger/general_ledger.js:203
msgid "Show Credit / Debit in Company Currency"
msgstr ""
@@ -47798,7 +47931,7 @@ msgstr ""
#. Label of the show_net_values_in_party_account (Check) field in DocType
#. 'Process Statement Of Accounts'
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
-#: erpnext/accounts/report/general_ledger/general_ledger.js:197
+#: erpnext/accounts/report/general_ledger/general_ledger.js:198
msgid "Show Net Values in Party Account"
msgstr ""
@@ -47806,7 +47939,7 @@ msgstr ""
msgid "Show Open"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.js:181
+#: erpnext/accounts/report/general_ledger/general_ledger.js:182
msgid "Show Opening Entries"
msgstr ""
@@ -47839,7 +47972,7 @@ msgstr ""
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/accounts_payable/accounts_payable.js:125
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:162
-#: erpnext/accounts/report/general_ledger/general_ledger.js:212
+#: erpnext/accounts/report/general_ledger/general_ledger.js:213
msgid "Show Remarks"
msgstr ""
@@ -48008,7 +48141,7 @@ msgstr ""
msgid "Since there is a process loss of {0} units for the finished good {1}, you should reduce the quantity by {0} units for the finished good {1} in the Items Table."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:317
+#: erpnext/manufacturing/doctype/bom/bom.py:322
msgid "Since you have enabled 'Track Semi Finished Goods', at least one operation must have 'Is Final Finished Good' checked. For that set the FG / Semi FG Item as {0} against an operation."
msgstr ""
@@ -48189,7 +48322,7 @@ msgstr ""
#. Label of the s_warehouse (Link) field in DocType 'Stock Entry Detail'
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/manufacturing/doctype/bom/bom.js:461
+#: erpnext/manufacturing/doctype/bom/bom.js:500
#: erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
#: erpnext/manufacturing/doctype/bom_item/bom_item.json
#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
@@ -48382,7 +48515,7 @@ msgstr ""
msgid "Stale Days"
msgstr ""
-#: erpnext/accounts/doctype/accounts_settings/accounts_settings.py:146
+#: erpnext/accounts/doctype/accounts_settings/accounts_settings.py:147
msgid "Stale Days should start from 1."
msgstr ""
@@ -48403,7 +48536,7 @@ msgstr ""
#: erpnext/setup/setup_wizard/operations/defaults_setup.py:70
#: erpnext/setup/setup_wizard/operations/install_fixtures.py:493
#: erpnext/stock/doctype/item/item.py:267 erpnext/tests/utils.py:324
-#: erpnext/tests/utils.py:2514
+#: erpnext/tests/utils.py:2522
msgid "Standard Selling"
msgstr ""
@@ -48755,7 +48888,7 @@ msgstr ""
msgid "Stock Entry Type"
msgstr ""
-#: erpnext/stock/doctype/pick_list/pick_list.py:1475
+#: erpnext/stock/doctype/pick_list/pick_list.py:1508
msgid "Stock Entry has been already created against this Pick List"
msgstr ""
@@ -48763,7 +48896,7 @@ msgstr ""
msgid "Stock Entry {0} created"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1495
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1526
msgid "Stock Entry {0} has created"
msgstr ""
@@ -48919,6 +49052,7 @@ msgstr ""
#. Label of the stock_qty (Float) field in DocType 'BOM Creator Item'
#. Label of the stock_qty (Float) field in DocType 'BOM Explosion Item'
#. Label of the stock_qty (Float) field in DocType 'BOM Item'
+#. Label of the stock_qty (Float) field in DocType 'BOM Secondary Item'
#. Label of the stock_qty (Float) field in DocType 'Delivery Schedule Item'
#. Label of the stock_qty (Float) field in DocType 'Material Request Item'
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:257
@@ -48926,6 +49060,7 @@ msgstr ""
#: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json
#: erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
#: erpnext/manufacturing/doctype/bom_item/bom_item.json
+#: erpnext/manufacturing/doctype/bom_secondary_item/bom_secondary_item.json
#: erpnext/selling/doctype/delivery_schedule_item/delivery_schedule_item.json
#: erpnext/stock/doctype/material_request_item/material_request_item.json
#: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.py:34
@@ -48996,9 +49131,9 @@ msgstr ""
#: erpnext/manufacturing/doctype/production_plan/production_plan.js:289
#: erpnext/manufacturing/doctype/production_plan/production_plan.js:297
#: erpnext/manufacturing/doctype/production_plan/production_plan.js:303
-#: erpnext/manufacturing/doctype/work_order/work_order.js:920
-#: erpnext/manufacturing/doctype/work_order/work_order.js:929
-#: erpnext/manufacturing/doctype/work_order/work_order.js:936
+#: erpnext/manufacturing/doctype/work_order/work_order.js:921
+#: erpnext/manufacturing/doctype/work_order/work_order.js:930
+#: erpnext/manufacturing/doctype/work_order/work_order.js:937
#: erpnext/manufacturing/doctype/work_order/work_order_dashboard.py:14
#: erpnext/public/js/stock_reservation.js:12
#: erpnext/selling/doctype/sales_order/sales_order.js:101
@@ -49019,9 +49154,9 @@ msgstr ""
#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1699
#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1716
#: erpnext/stock/doctype/stock_settings/stock_settings.json
-#: erpnext/stock/doctype/stock_settings/stock_settings.py:217
-#: erpnext/stock/doctype/stock_settings/stock_settings.py:229
-#: erpnext/stock/doctype/stock_settings/stock_settings.py:243
+#: erpnext/stock/doctype/stock_settings/stock_settings.py:215
+#: erpnext/stock/doctype/stock_settings/stock_settings.py:227
+#: erpnext/stock/doctype/stock_settings/stock_settings.py:241
#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:182
#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:195
#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:207
@@ -49034,8 +49169,8 @@ msgstr ""
msgid "Stock Reservation Entries Cancelled"
msgstr ""
-#: erpnext/controllers/subcontracting_inward_controller.py:1003
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2243
+#: erpnext/controllers/subcontracting_inward_controller.py:1018
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2245
#: erpnext/manufacturing/doctype/work_order/work_order.py:2124
#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1777
msgid "Stock Reservation Entries Created"
@@ -49148,9 +49283,9 @@ msgstr ""
#. Label of the stock_uom (Link) field in DocType 'BOM Creator Item'
#. Label of the stock_uom (Link) field in DocType 'BOM Explosion Item'
#. Label of the stock_uom (Link) field in DocType 'BOM Item'
-#. Label of the stock_uom (Link) field in DocType 'BOM Scrap Item'
+#. Label of the stock_uom (Link) field in DocType 'BOM Secondary Item'
#. Label of the stock_uom (Link) field in DocType 'Job Card Item'
-#. Label of the stock_uom (Link) field in DocType 'Job Card Scrap Item'
+#. Label of the stock_uom (Link) field in DocType 'Job Card Secondary Item'
#. Label of the stock_uom (Link) field in DocType 'Production Plan Sub Assembly
#. Item'
#. Label of the stock_uom (Link) field in DocType 'Work Order'
@@ -49174,7 +49309,7 @@ msgstr ""
#. Label of the stock_uom (Link) field in DocType 'Subcontracting Inward Order
#. Received Item'
#. Label of the stock_uom (Link) field in DocType 'Subcontracting Inward Order
-#. Scrap Item'
+#. Secondary Item'
#. Label of the stock_uom (Link) field in DocType 'Subcontracting Order Item'
#. Label of the stock_uom (Link) field in DocType 'Subcontracting Order
#. Supplied Item'
@@ -49195,9 +49330,9 @@ msgstr ""
#: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json
#: erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
#: erpnext/manufacturing/doctype/bom_item/bom_item.json
-#: erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.json
+#: erpnext/manufacturing/doctype/bom_secondary_item/bom_secondary_item.json
#: erpnext/manufacturing/doctype/job_card_item/job_card_item.json
-#: erpnext/manufacturing/doctype/job_card_scrap_item/job_card_scrap_item.json
+#: erpnext/manufacturing/doctype/job_card_secondary_item/job_card_secondary_item.json
#: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
#: erpnext/manufacturing/doctype/work_order/work_order.json
#: erpnext/manufacturing/doctype/work_order_item/work_order_item.json
@@ -49221,7 +49356,7 @@ msgstr ""
#: erpnext/stock/report/stock_ledger/stock_ledger.py:279
#: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json
#: erpnext/subcontracting/doctype/subcontracting_inward_order_received_item/subcontracting_inward_order_received_item.json
-#: erpnext/subcontracting/doctype/subcontracting_inward_order_scrap_item/subcontracting_inward_order_scrap_item.json
+#: erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json
#: erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
#: erpnext/subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json
#: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
@@ -49467,7 +49602,7 @@ msgstr ""
#. Label of the operation (Link) field in DocType 'Job Card Time Log'
#. Name of a DocType
-#: erpnext/manufacturing/doctype/job_card/job_card.js:357
+#: erpnext/manufacturing/doctype/job_card/job_card.js:355
#: erpnext/manufacturing/doctype/job_card_time_log/job_card_time_log.json
#: erpnext/manufacturing/doctype/sub_operation/sub_operation.json
msgid "Sub Operation"
@@ -49679,8 +49814,8 @@ msgid "Subcontracting Inward Order Received Item"
msgstr ""
#. Name of a DocType
-#: erpnext/subcontracting/doctype/subcontracting_inward_order_scrap_item/subcontracting_inward_order_scrap_item.json
-msgid "Subcontracting Inward Order Scrap Item"
+#: erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json
+msgid "Subcontracting Inward Order Secondary Item"
msgstr ""
#. Name of a DocType
@@ -49743,7 +49878,7 @@ msgstr ""
msgid "Subcontracting Order Supplied Item"
msgstr ""
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:920
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:924
msgid "Subcontracting Order {0} created."
msgstr ""
@@ -49832,8 +49967,8 @@ msgstr ""
msgid "Subdivision"
msgstr ""
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:916
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1047
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:920
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1084
msgid "Submit Action Failed"
msgstr ""
@@ -50943,7 +51078,7 @@ msgstr ""
msgid "Target Warehouse Reservation Error"
msgstr ""
-#: erpnext/controllers/subcontracting_inward_controller.py:230
+#: erpnext/controllers/subcontracting_inward_controller.py:232
msgid "Target Warehouse for Finished Good must be same as Finished Good Warehouse {1} in Work Order {2} linked to the Subcontracting Inward Order."
msgstr ""
@@ -51189,7 +51324,7 @@ msgstr ""
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:86
-#: erpnext/accounts/report/general_ledger/general_ledger.js:141
+#: erpnext/accounts/report/general_ledger/general_ledger.js:142
#: erpnext/accounts/report/purchase_register/purchase_register.py:192
#: erpnext/accounts/report/sales_register/sales_register.py:215
#: erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:67
@@ -51432,7 +51567,7 @@ msgstr ""
#. Detail'
#: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:157
-#: erpnext/controllers/taxes_and_totals.py:1212
+#: erpnext/controllers/taxes_and_totals.py:1249
msgid "Taxable Amount"
msgstr ""
@@ -51638,7 +51773,7 @@ msgstr ""
msgid "Television"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:413
+#: erpnext/manufacturing/doctype/bom/bom.js:452
msgid "Template Item"
msgstr ""
@@ -52013,11 +52148,11 @@ msgstr ""
msgid "The Payment Term at row {0} is possibly a duplicate."
msgstr ""
-#: erpnext/stock/doctype/pick_list/pick_list.py:341
+#: erpnext/stock/doctype/pick_list/pick_list.py:342
msgid "The Pick List having Stock Reservation Entries cannot be updated. If you need to make changes, we recommend canceling the existing Stock Reservation Entries before updating the Pick List."
msgstr ""
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2609
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:2621
msgid "The Process Loss Qty has reset as per job cards Process Loss Qty"
msgstr ""
@@ -52025,15 +52160,15 @@ msgstr ""
msgid "The Sales Person is linked with {0}"
msgstr ""
-#: erpnext/stock/doctype/pick_list/pick_list.py:207
+#: erpnext/stock/doctype/pick_list/pick_list.py:208
msgid "The Serial No at Row #{0}: {1} is not available in warehouse {2}."
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2598
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2636
msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction."
msgstr ""
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1742
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1747
msgid "The Serial and Batch Bundle {0} is not valid for this transaction. The 'Type of Transaction' should be 'Outward' instead of 'Inward' in Serial and Batch Bundle {0}"
msgstr ""
@@ -52059,7 +52194,7 @@ msgstr ""
msgid "The batch {0} is already reserved in {1} {2}. So, cannot proceed with the {3} {4}, which is created against the {5} {6}."
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1301
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1319
msgid "The completed quantity {0} of an operation {1} cannot be greater than the completed quantity {2} of a previous operation {3}."
msgstr ""
@@ -52071,7 +52206,7 @@ msgstr ""
msgid "The current POS opening entry is outdated. Please close it and create a new one."
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1150
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1151
msgid "The default BOM for that item will be fetched by the system. You can also change the BOM."
msgstr ""
@@ -52124,7 +52259,7 @@ msgstr ""
msgid "The following assets have failed to automatically post depreciation entries: {0}"
msgstr ""
-#: erpnext/stock/doctype/pick_list/pick_list.py:305
+#: erpnext/stock/doctype/pick_list/pick_list.py:306
msgid "The following batches are expired, please restock them:
{0}"
msgstr ""
@@ -52167,7 +52302,7 @@ msgstr ""
msgid "The holiday on {0} is not between From Date and To Date"
msgstr ""
-#: erpnext/controllers/buying_controller.py:1244
+#: erpnext/controllers/buying_controller.py:1248
msgid "The item {item} is not marked as {type_of} item. You can enable it as {type_of} item from its Item master."
msgstr ""
@@ -52175,7 +52310,7 @@ msgstr ""
msgid "The items {0} and {1} are present in the following {2} :"
msgstr ""
-#: erpnext/controllers/buying_controller.py:1237
+#: erpnext/controllers/buying_controller.py:1241
msgid "The items {items} are not marked as {type_of} item. You can enable them as {type_of} item from their Item masters."
msgstr ""
@@ -52257,7 +52392,7 @@ msgstr ""
msgid "The percentage you are allowed to transfer more against the quantity ordered. For example, if you have ordered 100 units, and your Allowance is 10%, then you are allowed transfer 110 units."
msgstr ""
-#: erpnext/public/js/utils.js:947
+#: erpnext/public/js/utils.js:951
msgid "The reserved stock will be released when you update items. Are you certain you wish to proceed?"
msgstr ""
@@ -52310,7 +52445,7 @@ msgstr ""
msgid "The shares don't exist with the {0}"
msgstr ""
-#: erpnext/stock/stock_ledger.py:806
+#: erpnext/stock/stock_ledger.py:813
msgid "The stock for the item {0} in the {1} warehouse was negative on the {2}. You should create a positive entry {3} before the date {4} and time {5} to post the correct valuation rate. For more details, please read the documentation."
msgstr ""
@@ -52376,23 +52511,23 @@ msgstr ""
msgid "The value {0} is already assigned to an existing Item {1}."
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1178
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1179
msgid "The warehouse where you store finished Items before they are shipped."
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1171
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1172
msgid "The warehouse where you store your raw materials. Each required item can have a separate source warehouse. Group warehouse also can be selected as source warehouse. On submission of the Work Order, the raw materials will be reserved in these warehouses for production usage."
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1183
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1184
msgid "The warehouse where your Items will be transferred when you begin production. Group Warehouse can also be selected as a Work in Progress warehouse."
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:874
+#: erpnext/manufacturing/doctype/job_card/job_card.py:892
msgid "The {0} ({1}) must be equal to {2} ({3})"
msgstr ""
-#: erpnext/public/js/controllers/transaction.js:3408
+#: erpnext/public/js/controllers/transaction.js:3412
msgid "The {0} contains Unit Price Items."
msgstr ""
@@ -52408,7 +52543,7 @@ msgstr ""
msgid "The {0} {1} does not match with the {0} {2} in the {3} {4}"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:977
+#: erpnext/manufacturing/doctype/job_card/job_card.py:995
msgid "The {0} {1} is used to calculate the valuation cost for the finished good {2}."
msgstr ""
@@ -52432,7 +52567,7 @@ msgstr ""
msgid "There are no Failed transactions"
msgstr ""
-#: erpnext/setup/demo.py:120
+#: erpnext/setup/demo.py:130
msgid "There are no active Fiscal Years for which Demo Data can be generated."
msgstr ""
@@ -52472,7 +52607,7 @@ msgstr ""
msgid "There is no batch found against the {0}: {1}"
msgstr ""
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1679
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1684
msgid "There must be atleast 1 Finished Good in this Stock Entry"
msgstr ""
@@ -52515,7 +52650,7 @@ msgstr ""
msgid "This Month's Summary"
msgstr ""
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:929
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:933
msgid "This Purchase Order has been fully subcontracted."
msgstr ""
@@ -52561,7 +52696,7 @@ msgstr ""
msgid "This invoice has already been paid."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:269
+#: erpnext/manufacturing/doctype/bom/bom.js:307
msgid "This is a Template BOM and will be used to make the work order for {0} of the item {1}"
msgstr ""
@@ -52638,7 +52773,7 @@ msgstr ""
msgid "This is done to handle accounting for cases when Purchase Receipt is created after Purchase Invoice"
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1164
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1165
msgid "This is enabled by default. If you want to plan materials for sub-assemblies of the Item you're manufacturing leave this enabled. If you plan and manufacture the sub-assemblies separately, you can disable this checkbox."
msgstr ""
@@ -52855,7 +52990,7 @@ msgstr ""
msgid "Time in mins."
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:853
+#: erpnext/manufacturing/doctype/job_card/job_card.py:871
msgid "Time logs are required for {0} {1}"
msgstr ""
@@ -53183,7 +53318,7 @@ msgstr ""
msgid "To Warehouse (Optional)"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:980
+#: erpnext/manufacturing/doctype/bom/bom.js:997
msgid "To add Operations tick the 'With Operations' checkbox."
msgstr ""
@@ -53235,10 +53370,10 @@ msgstr ""
msgid "To include non-stock items in the material request planning. i.e. Items for which 'Maintain Stock' checkbox is unticked."
msgstr ""
-#. Description of the 'Set Operating Cost / Scrap Items From Sub-assemblies'
-#. (Check) field in DocType 'Manufacturing Settings'
+#. Description of the 'Set Operating Cost / Secondary Items From
+#. Sub-assemblies' (Check) field in DocType 'Manufacturing Settings'
#: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
-msgid "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."
+msgid "To include sub-assembly costs and secondary items in Finished Goods on a work order without using a job card, when the 'Use Multi-Level BOM' option is enabled."
msgstr ""
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2247
@@ -53442,7 +53577,7 @@ msgstr ""
msgid "Total Amount in Words"
msgstr ""
-#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:258
+#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:262
msgid "Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges"
msgstr ""
@@ -53527,12 +53662,12 @@ msgstr ""
#. Label of the total_completed_qty (Float) field in DocType 'Job Card'
#: erpnext/manufacturing/doctype/job_card/job_card.json
-#: erpnext/manufacturing/doctype/job_card/job_card.py:870
+#: erpnext/manufacturing/doctype/job_card/job_card.py:888
#: erpnext/manufacturing/report/job_card_summary/job_card_summary.py:174
msgid "Total Completed Qty"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:188
+#: erpnext/manufacturing/doctype/job_card/job_card.py:190
msgid "Total Completed Qty is required for Job Card {0}, please start and complete the job card before submission"
msgstr ""
@@ -54021,7 +54156,7 @@ msgstr ""
msgid "Total Time in Mins"
msgstr ""
-#: erpnext/public/js/utils.js:173
+#: erpnext/public/js/utils.js:177
msgid "Total Unpaid: {0}"
msgstr ""
@@ -54100,7 +54235,7 @@ msgstr ""
msgid "Total allocated percentage for sales team should be 100"
msgstr ""
-#: erpnext/selling/doctype/customer/customer.py:192
+#: erpnext/selling/doctype/customer/customer.py:193
msgid "Total contribution percentage should be equal to 100"
msgstr ""
@@ -54136,7 +54271,7 @@ msgstr ""
msgid "Total {0} ({1})"
msgstr ""
-#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:239
+#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:243
msgid "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'"
msgstr ""
@@ -54368,7 +54503,7 @@ msgstr ""
msgid "Transaction from which tax is withheld"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:846
+#: erpnext/manufacturing/doctype/job_card/job_card.py:864
msgid "Transaction not allowed against stopped Work Order {0}"
msgstr ""
@@ -54724,6 +54859,7 @@ msgstr ""
#. Label of the uom (Link) field in DocType 'BOM Creator'
#. Label of the uom (Link) field in DocType 'BOM Creator Item'
#. Label of the uom (Link) field in DocType 'BOM Item'
+#. Label of the uom (Link) field in DocType 'BOM Secondary Item'
#. Label of the uom (Link) field in DocType 'Job Card Item'
#. Label of the uom (Link) field in DocType 'Master Production Schedule Item'
#. Label of the uom (Link) field in DocType 'Material Request Plan Item'
@@ -54772,6 +54908,7 @@ msgstr ""
#: erpnext/manufacturing/doctype/bom_creator/bom_creator.json
#: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json
#: erpnext/manufacturing/doctype/bom_item/bom_item.json
+#: erpnext/manufacturing/doctype/bom_secondary_item/bom_secondary_item.json
#: erpnext/manufacturing/doctype/job_card_item/job_card_item.json
#: erpnext/manufacturing/doctype/master_production_schedule_item/master_production_schedule_item.json
#: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
@@ -54781,7 +54918,7 @@ msgstr ""
#: erpnext/manufacturing/doctype/workstation/workstation.js:480
#: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:70
#: erpnext/manufacturing/report/bom_operations_time/bom_operations_time.py:110
-#: erpnext/public/js/stock_analytics.js:94 erpnext/public/js/utils.js:820
+#: erpnext/public/js/stock_analytics.js:94 erpnext/public/js/utils.js:824
#: erpnext/quality_management/doctype/quality_goal_objective/quality_goal_objective.json
#: erpnext/quality_management/doctype/quality_review_objective/quality_review_objective.json
#: erpnext/selling/doctype/delivery_schedule_item/delivery_schedule_item.json
@@ -54808,7 +54945,7 @@ msgstr ""
#: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:87
#: erpnext/stock/report/item_prices/item_prices.py:55
#: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:94
-#: erpnext/stock/report/stock_ageing/stock_ageing.py:178
+#: erpnext/stock/report/stock_ageing/stock_ageing.py:179
#: erpnext/stock/report/stock_analytics/stock_analytics.py:59
#: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:134
#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:60
@@ -54877,7 +55014,7 @@ msgstr ""
msgid "UOM Name"
msgstr ""
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:3774
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:3806
msgid "UOM conversion factor required for UOM: {0} in Item: {1}"
msgstr ""
@@ -55191,7 +55328,7 @@ msgstr ""
msgid "Unreconciled Entries"
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.js:927
+#: erpnext/manufacturing/doctype/work_order/work_order.js:928
#: erpnext/selling/doctype/sales_order/sales_order.js:114
#: erpnext/stock/doctype/pick_list/pick_list.js:158
#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:193
@@ -55372,7 +55509,7 @@ msgstr ""
#. Option for the 'Update Type' (Select) field in DocType 'BOM Update Log'
#. Label of the update_cost_section (Section Break) field in DocType 'BOM
#. Update Tool'
-#: erpnext/manufacturing/doctype/bom/bom.js:185
+#: erpnext/manufacturing/doctype/bom/bom.js:223
#: erpnext/manufacturing/doctype/bom_update_log/bom_update_log.json
#: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json
msgid "Update Cost"
@@ -55399,7 +55536,7 @@ msgstr ""
#: erpnext/buying/doctype/purchase_order/purchase_order.js:324
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:43
-#: erpnext/public/js/utils.js:926
+#: erpnext/public/js/utils.js:930
#: erpnext/selling/doctype/quotation/quotation.js:135
#: erpnext/selling/doctype/sales_order/sales_order.js:82
#: erpnext/selling/doctype/sales_order/sales_order.js:940
@@ -55501,7 +55638,7 @@ msgstr ""
msgid "Updating Variants..."
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1126
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1127
msgid "Updating Work Order status"
msgstr ""
@@ -55622,7 +55759,7 @@ msgstr ""
#. Label of the use_multi_level_bom (Check) field in DocType 'Work Order'
#. Label of the use_multi_level_bom (Check) field in DocType 'Stock Entry'
-#: erpnext/manufacturing/doctype/bom/bom.js:395
+#: erpnext/manufacturing/doctype/bom/bom.js:434
#: erpnext/manufacturing/doctype/work_order/work_order.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
msgid "Use Multi-Level BOM"
@@ -56053,11 +56190,11 @@ msgstr ""
msgid "Valuation Rate (In / Out)"
msgstr ""
-#: erpnext/stock/stock_ledger.py:2069
+#: erpnext/stock/stock_ledger.py:2076
msgid "Valuation Rate Missing"
msgstr ""
-#: erpnext/stock/stock_ledger.py:2047
+#: erpnext/stock/stock_ledger.py:2054
msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}."
msgstr ""
@@ -56101,7 +56238,7 @@ msgstr ""
msgid "Value (G - D)"
msgstr ""
-#: erpnext/stock/report/stock_ageing/stock_ageing.py:221
+#: erpnext/stock/report/stock_ageing/stock_ageing.py:222
msgid "Value ({0})"
msgstr ""
@@ -56229,7 +56366,7 @@ msgstr ""
msgid "Variant Attributes"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:226
+#: erpnext/manufacturing/doctype/bom/bom.js:264
msgid "Variant BOM"
msgstr ""
@@ -56251,8 +56388,8 @@ msgstr ""
msgid "Variant Field"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:349
-#: erpnext/manufacturing/doctype/bom/bom.js:428
+#: erpnext/manufacturing/doctype/bom/bom.js:387
+#: erpnext/manufacturing/doctype/bom/bom.js:467
msgid "Variant Item"
msgstr ""
@@ -57006,7 +57143,7 @@ msgstr ""
msgid "Warning - Row {0}: Billing Hours are more than Actual Hours"
msgstr ""
-#: erpnext/stock/stock_ledger.py:816
+#: erpnext/stock/stock_ledger.py:823
msgid "Warning on Negative Stock"
msgstr ""
@@ -57431,7 +57568,7 @@ msgstr ""
#. Option for the 'From Voucher Type' (Select) field in DocType 'Stock
#. Reservation Entry'
#. Label of a Workspace Sidebar Item
-#: erpnext/manufacturing/doctype/bom/bom.js:217
+#: erpnext/manufacturing/doctype/bom/bom.js:255
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/manufacturing/doctype/work_order/work_order.json
@@ -57527,8 +57664,8 @@ msgstr ""
msgid "Work Order cannot be raised against a Item Template"
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2456
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2536
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2457
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2537
msgid "Work Order has been {0}"
msgstr ""
@@ -57882,7 +58019,7 @@ msgstr ""
msgid "You are not authorized to set Frozen value"
msgstr ""
-#: erpnext/stock/doctype/pick_list/pick_list.py:512
+#: erpnext/stock/doctype/pick_list/pick_list.py:513
msgid "You are picking more than required quantity for the item {0}. Check if there is any other pick list created for the sales order {1}."
msgstr ""
@@ -57931,7 +58068,7 @@ msgstr ""
msgid "You can use {0} to reconcile against {1} later."
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1313
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1331
msgid "You can't make any changes to Job Card since Work Order is closed."
msgstr ""
@@ -57943,7 +58080,7 @@ msgstr ""
msgid "You can't redeem Loyalty Points having more value than the Total Amount."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:736
+#: erpnext/manufacturing/doctype/bom/bom.js:773
msgid "You cannot change the rate if BOM is mentioned against any Item."
msgstr ""
@@ -57971,7 +58108,7 @@ msgstr ""
msgid "You cannot edit root node."
msgstr ""
-#: erpnext/accounts/doctype/accounts_settings/accounts_settings.py:181
+#: erpnext/accounts/doctype/accounts_settings/accounts_settings.py:182
msgid "You cannot enable both the settings '{0}' and '{1}'."
msgstr ""
@@ -58003,7 +58140,7 @@ msgstr ""
msgid "You cannot {0} this document because another Period Closing Entry {1} exists after {2}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:566
+#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:565
msgid "You do not have permission to edit this document"
msgstr ""
@@ -58019,11 +58156,11 @@ msgstr ""
msgid "You don't have enough points to redeem."
msgstr ""
-#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py:286
+#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py:291
msgid "You had {} errors while creating opening invoices. Check {} for more details"
msgstr ""
-#: erpnext/public/js/utils.js:1026
+#: erpnext/public/js/utils.js:1030
msgid "You have already selected items from {0} {1}"
msgstr ""
@@ -58031,7 +58168,7 @@ msgstr ""
msgid "You have been invited to collaborate on the project {0}."
msgstr ""
-#: erpnext/stock/doctype/stock_settings/stock_settings.py:255
+#: erpnext/stock/doctype/stock_settings/stock_settings.py:253
msgid "You have enabled {0} and {1} in {2}. This can lead to prices from the default price list being inserted in the transaction price list."
msgstr ""
@@ -58127,7 +58264,7 @@ msgstr ""
msgid "`Allow Negative rates for Items`"
msgstr ""
-#: erpnext/stock/stock_ledger.py:2061
+#: erpnext/stock/stock_ledger.py:2068
msgid "after"
msgstr ""
@@ -58143,11 +58280,11 @@ msgstr ""
msgid "as Title"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:1004
+#: erpnext/manufacturing/doctype/bom/bom.js:1021
msgid "as a percentage of finished item quantity"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1518
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1556
msgid "as of {0}"
msgstr ""
@@ -58296,7 +58433,7 @@ msgstr ""
msgid "paid to"
msgstr ""
-#: erpnext/public/js/utils.js:443
+#: erpnext/public/js/utils.js:447
msgid "payments app is not installed. Please install it from {0} or {1}"
msgstr ""
@@ -58317,7 +58454,7 @@ msgstr ""
msgid "per hour"
msgstr ""
-#: erpnext/stock/stock_ledger.py:2062
+#: erpnext/stock/stock_ledger.py:2069
msgid "performing either one below:"
msgstr ""
@@ -58447,7 +58584,7 @@ msgstr ""
msgid "{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3}"
msgstr ""
-#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:381
+#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:385
msgid "{0} {1} has submitted Assets. Remove Item {2} from table to continue."
msgstr ""
@@ -58479,11 +58616,11 @@ msgstr ""
msgid "{0} Number {1} is already used in {2} {3}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1638
+#: erpnext/manufacturing/doctype/bom/bom.py:1684
msgid "{0} Operating Cost for operation {1}"
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.js:555
+#: erpnext/manufacturing/doctype/work_order/work_order.js:556
msgid "{0} Operations: {1}"
msgstr ""
@@ -58562,7 +58699,7 @@ msgstr ""
#: erpnext/manufacturing/doctype/production_plan/production_plan.py:923
#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1039
-#: erpnext/stock/doctype/pick_list/pick_list.py:1297
+#: erpnext/stock/doctype/pick_list/pick_list.py:1330
#: erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.py:322
msgid "{0} created"
msgstr ""
@@ -58668,11 +58805,11 @@ msgstr ""
msgid "{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}."
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1742
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1780
msgid "{0} is not a CSV file."
msgstr ""
-#: erpnext/selling/doctype/customer/customer.py:234
+#: erpnext/selling/doctype/customer/customer.py:235
msgid "{0} is not a company bank account"
msgstr ""
@@ -58716,27 +58853,27 @@ msgstr ""
msgid "{0} is open. Close the POS or cancel the existing POS Opening Entry to create a new POS Opening Entry."
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.js:520
+#: erpnext/manufacturing/doctype/work_order/work_order.js:521
msgid "{0} items disassembled"
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.js:484
+#: erpnext/manufacturing/doctype/work_order/work_order.js:485
msgid "{0} items in progress"
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.js:508
+#: erpnext/manufacturing/doctype/work_order/work_order.js:509
msgid "{0} items lost during process."
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.js:465
+#: erpnext/manufacturing/doctype/work_order/work_order.js:466
msgid "{0} items produced"
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.js:488
+#: erpnext/manufacturing/doctype/work_order/work_order.js:489
msgid "{0} items returned"
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.js:491
+#: erpnext/manufacturing/doctype/work_order/work_order.js:492
msgid "{0} items to return"
msgstr ""
@@ -58748,7 +58885,7 @@ msgstr ""
msgid "{0} not allowed to transact with {1}. Please change the Company or add the Company in the 'Allowed To Transact With'-Section in the Customer record."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:573
+#: erpnext/manufacturing/doctype/bom/bom.py:611
msgid "{0} not found for item {1}"
msgstr ""
@@ -58768,11 +58905,11 @@ msgstr ""
msgid "{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation."
msgstr ""
-#: erpnext/stock/doctype/pick_list/pick_list.py:1052
+#: erpnext/stock/doctype/pick_list/pick_list.py:1085
msgid "{0} units of Item {1} is not available in any of the warehouses."
msgstr ""
-#: erpnext/stock/doctype/pick_list/pick_list.py:1045
+#: erpnext/stock/doctype/pick_list/pick_list.py:1078
msgid "{0} units of Item {1} is not available in any of the warehouses. Other Pick Lists exist for this item."
msgstr ""
@@ -58780,16 +58917,16 @@ msgstr ""
msgid "{0} units of {1} are required in {2} with the inventory dimension: {3} on {4} {5} for {6} to complete the transaction."
msgstr ""
-#: erpnext/stock/stock_ledger.py:1714 erpnext/stock/stock_ledger.py:2210
-#: erpnext/stock/stock_ledger.py:2224
+#: erpnext/stock/stock_ledger.py:1721 erpnext/stock/stock_ledger.py:2217
+#: erpnext/stock/stock_ledger.py:2231
msgid "{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction."
msgstr ""
-#: erpnext/stock/stock_ledger.py:2311 erpnext/stock/stock_ledger.py:2356
+#: erpnext/stock/stock_ledger.py:2318 erpnext/stock/stock_ledger.py:2363
msgid "{0} units of {1} needed in {2} on {3} {4} to complete this transaction."
msgstr ""
-#: erpnext/stock/stock_ledger.py:1708
+#: erpnext/stock/stock_ledger.py:1715
msgid "{0} units of {1} needed in {2} to complete this transaction."
msgstr ""
@@ -58817,7 +58954,7 @@ msgstr ""
msgid "{0} will be set as the {1} in subsequently scanned items"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:986
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1004
msgid "{0} {1}"
msgstr ""
@@ -59015,8 +59152,8 @@ msgstr ""
msgid "{0}'s {1} cannot be after {2}'s Expected End Date."
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1285
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1293
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1303
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1311
msgid "{0}, complete the operation {1} before the operation {2}."
msgstr ""
@@ -59056,15 +59193,15 @@ msgstr ""
msgid "{0}: {1} must be less than {2}"
msgstr ""
-#: erpnext/controllers/buying_controller.py:1019
+#: erpnext/controllers/buying_controller.py:1023
msgid "{count} Assets created for {item_code}"
msgstr ""
-#: erpnext/controllers/buying_controller.py:917
+#: erpnext/controllers/buying_controller.py:921
msgid "{doctype} {name} is cancelled or closed."
msgstr ""
-#: erpnext/controllers/buying_controller.py:628
+#: erpnext/controllers/buying_controller.py:632
msgid "{field_label} is mandatory for sub-contracted {doctype}."
msgstr ""
@@ -59072,7 +59209,7 @@ msgstr ""
msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})"
msgstr ""
-#: erpnext/controllers/buying_controller.py:725
+#: erpnext/controllers/buying_controller.py:729
msgid "{ref_doctype} {ref_name} is {status}."
msgstr ""