diff --git a/erpnext/locale/main.pot b/erpnext/locale/main.pot index 63a1b5dd92b..fca65d161c5 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-08 09:42+0000\n" -"PO-Revision-Date: 2026-03-08 09:42+0000\n" +"POT-Creation-Date: 2026-03-15 09:45+0000\n" +"PO-Revision-Date: 2026-03-15 09:45+0000\n" "Last-Translator: hello@frappe.io\n" "Language-Team: hello@frappe.io\n" "MIME-Version: 1.0\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:992 +#: erpnext/manufacturing/doctype/bom/bom.js:972 #, python-format msgid "% Finished Item Quantity" msgstr "" @@ -282,7 +287,7 @@ msgstr "" msgid "'Default {0} Account' in Company {1}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1221 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1227 msgid "'Entries' cannot be empty" msgstr "" @@ -915,11 +920,11 @@ msgstr "" msgid "Your Shortcuts" msgstr "" -#: erpnext/accounts/doctype/payment_request/payment_request.py:1135 +#: erpnext/accounts/doctype/payment_request/payment_request.py:1136 msgid "Grand Total: {0}" msgstr "" -#: erpnext/accounts/doctype/payment_request/payment_request.py:1136 +#: erpnext/accounts/doctype/payment_request/payment_request.py:1137 msgid "Outstanding Amount: {0}" msgstr "" @@ -1004,7 +1009,7 @@ msgstr "" msgid "A Reconciliation Job {0} is running for the same filters. Cannot reconcile now" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1777 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1783 msgid "A Reverse Journal Entry {0} already exists for this Journal Entry." msgstr "" @@ -1170,7 +1175,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 "" @@ -1182,10 +1189,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:2911 #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json -#: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json msgid "Accepted Quantity" msgstr "" @@ -1229,7 +1234,7 @@ msgstr "" #. Name of a DocType #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/account_tree.js:167 +#: erpnext/accounts/doctype/account/account_tree.js:162 #: erpnext/accounts/doctype/account_category/account_category.json #: erpnext/workspace_sidebar/accounts_setup.json msgid "Account Category" @@ -1359,7 +1364,7 @@ msgstr "" #. Label of the account_number (Data) field in DocType 'Account' #: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/account_tree.js:133 +#: erpnext/accounts/doctype/account/account_tree.js:128 #: erpnext/accounts/report/consolidated_trial_balance/consolidated_trial_balance.py:396 #: erpnext/accounts/report/financial_statements.py:685 #: erpnext/accounts/report/trial_balance/trial_balance.py:495 @@ -1406,7 +1411,7 @@ msgstr "" #. Label of the account_type (Select) field in DocType 'Party Type' #: erpnext/accounts/doctype/account/account.json #: erpnext/accounts/doctype/account/account.py:206 -#: erpnext/accounts/doctype/account/account_tree.js:159 +#: erpnext/accounts/doctype/account/account_tree.js:154 #: erpnext/accounts/doctype/bank_account/bank_account.json #: erpnext/accounts/doctype/bank_account_type/bank_account_type.json #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json @@ -1536,7 +1541,7 @@ msgstr "" msgid "Account {0} is invalid. Account Currency must be {1}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:348 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:354 msgid "Account {0} should be of type Expense" msgstr "" @@ -1556,15 +1561,15 @@ msgstr "" msgid "Account {0}: You can not assign itself as parent account" msgstr "" -#: erpnext/accounts/general_ledger.py:463 +#: erpnext/accounts/general_ledger.py:465 msgid "Account: {0} is capital Work in progress and can not be updated by Journal Entry" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:363 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:369 msgid "Account: {0} can only be updated via Stock Transactions" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2727 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2722 msgid "Account: {0} is not permitted under Payment Entry" msgstr "" @@ -1853,12 +1858,12 @@ msgstr "" msgid "Accounting Entry for Asset" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1965 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1985 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1970 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1990 msgid "Accounting Entry for LCV in Stock Entry {0}" msgstr "" -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:874 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:911 msgid "Accounting Entry for Landed Cost Voucher for SCR {0}" msgstr "" @@ -1866,21 +1871,21 @@ msgstr "" msgid "Accounting Entry for Service" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1016 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1037 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1055 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1076 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1097 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1125 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1232 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1468 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1490 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1017 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1038 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1056 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1077 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1098 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1126 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1233 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1469 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1491 #: erpnext/controllers/stock_controller.py:727 #: erpnext/controllers/stock_controller.py:744 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:932 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1910 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1924 -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:709 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1915 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1929 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:746 msgid "Accounting Entry for Stock" msgstr "" @@ -1893,8 +1898,8 @@ msgid "Accounting Entry for {0}: {1} can only be made in currency: {2}" msgstr "" #: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js:193 -#: erpnext/assets/doctype/asset/asset.js:182 -#: erpnext/assets/doctype/asset_repair/asset_repair.js:171 +#: erpnext/assets/doctype/asset/asset.js:185 +#: erpnext/assets/doctype/asset_repair/asset_repair.js:92 #: erpnext/buying/doctype/supplier/supplier.js:98 #: erpnext/public/js/controllers/stock_controller.js:88 #: erpnext/public/js/utils/ledger_preview.js:8 @@ -2083,7 +2088,7 @@ msgstr "" msgid "Accounts Setup" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1320 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1326 msgid "Accounts table cannot be blank." msgstr "" @@ -2117,13 +2122,13 @@ msgstr "" #. Label of the accumulated_depreciation_amount (Currency) field in DocType #. 'Depreciation Schedule' #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:178 -#: erpnext/assets/doctype/asset/asset.js:373 +#: erpnext/assets/doctype/asset/asset.js:380 #: erpnext/assets/doctype/depreciation_schedule/depreciation_schedule.json msgid "Accumulated Depreciation Amount" msgstr "" -#: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:635 -#: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:653 +#: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:876 +#: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:894 msgid "Accumulated Depreciation as on" msgstr "" @@ -2609,7 +2614,7 @@ msgid "Add Quote" msgstr "" #. Label of the add_raw_materials (Button) field in DocType 'BOM Operation' -#: erpnext/manufacturing/doctype/bom/bom.js:1020 +#: erpnext/manufacturing/doctype/bom/bom.js:1000 #: erpnext/manufacturing/doctype/bom_operation/bom_operation.json msgid "Add Raw Materials" msgstr "" @@ -2670,7 +2675,7 @@ msgstr "" msgid "Add Sub Assembly" msgstr "" -#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:520 +#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:516 #: erpnext/public/js/event.js:32 msgid "Add Suppliers" msgstr "" @@ -2886,7 +2891,7 @@ msgstr "" msgid "Additional Discount Amount (Company Currency)" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:795 +#: erpnext/controllers/taxes_and_totals.py:796 msgid "Additional Discount Amount ({discount_amount}) cannot exceed the total before such discount ({total_before_discount})" msgstr "" @@ -2923,6 +2928,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' @@ -2966,7 +2986,7 @@ msgstr "" msgid "Additional Information updated successfully." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:784 +#: erpnext/manufacturing/doctype/work_order/work_order.js:812 msgid "Additional Material Transfer" msgstr "" @@ -3003,7 +3023,7 @@ msgstr "" msgid "Additional information regarding the customer." msgstr "" -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:591 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:628 msgid "Additional {0} {1} of item {2} required as per BOM to complete this transaction" msgstr "" @@ -3267,11 +3287,11 @@ msgstr "" msgid "Advance amount" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:932 +#: erpnext/controllers/taxes_and_totals.py:933 msgid "Advance amount cannot be greater than {0} {1}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:868 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:874 msgid "Advance paid against {0} {1} cannot be greater than Grand Total {2}" msgstr "" @@ -3399,7 +3419,7 @@ msgstr "" msgid "Against Income Account" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:730 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:736 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:777 msgid "Against Journal Entry {0} does not have any unmatched {1} entry" msgstr "" @@ -3585,7 +3605,7 @@ msgstr "" #: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:165 #: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:185 #: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:168 -#: erpnext/accounts/utils.py:1567 erpnext/public/js/setup_wizard.js:184 +#: erpnext/accounts/utils.py:1639 erpnext/public/js/setup_wizard.js:184 msgid "All Accounts" msgstr "" @@ -3609,7 +3629,7 @@ msgstr "" msgid "All Activities HTML" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:370 +#: erpnext/manufacturing/doctype/bom/bom.py:391 msgid "All BOMs" msgstr "" @@ -3750,11 +3770,11 @@ msgstr "" msgid "All items have already been Invoiced/Returned" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:1223 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:1237 msgid "All items have already been received" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3117 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3142 msgid "All items have already been transferred for this Work Order." msgstr "" @@ -3780,11 +3800,11 @@ msgstr "" msgid "All the items have been already returned." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1168 +#: 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 "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:869 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:873 msgid "All these items have already been Invoiced/Returned" msgstr "" @@ -4341,7 +4361,7 @@ msgstr "" #: erpnext/manufacturing/doctype/bom/bom.js:250 #: erpnext/manufacturing/doctype/work_order/work_order.js:165 #: erpnext/manufacturing/doctype/work_order/work_order.js:180 -#: erpnext/public/js/utils.js:561 +#: erpnext/public/js/utils.js:567 #: erpnext/stock/doctype/stock_entry/stock_entry.js:288 msgid "Alternate Item" msgstr "" @@ -4443,7 +4463,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' @@ -4537,7 +4556,6 @@ 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/selling/doctype/quotation/quotation.js:316 @@ -4770,7 +4788,7 @@ msgstr "" msgid "Analytical Accounting" msgstr "" -#: erpnext/public/js/utils.js:158 +#: erpnext/public/js/utils.js:164 msgid "Annual Billing: {0}" msgstr "" @@ -5298,7 +5316,7 @@ msgstr "" #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:30 #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:141 #: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js:44 -#: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:581 +#: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:822 #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_activity/asset_activity.json #: erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json @@ -5370,7 +5388,7 @@ msgstr "" #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:36 #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:197 #: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js:37 -#: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:571 +#: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:812 #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_category/asset_category.json #: erpnext/assets/doctype/asset_maintenance/asset_maintenance.json @@ -5536,7 +5554,7 @@ msgstr "" #. Label of the asset_name (Data) field in DocType 'Asset Movement Item' #. Label of the asset_name (Read Only) field in DocType 'Asset Repair' #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:148 -#: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:590 +#: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:831 #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_capitalization/asset_capitalization.json #: erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json @@ -5584,7 +5602,7 @@ msgstr "" #. Batch Bundle' #. Label of the asset_repair (Link) field in DocType 'Stock Entry' #. Label of a Workspace Sidebar Item -#: erpnext/assets/doctype/asset/asset.js:105 +#: erpnext/assets/doctype/asset/asset.js:108 #: erpnext/assets/doctype/asset_repair/asset_repair.json #: erpnext/assets/workspace/assets/assets.json #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json @@ -5636,7 +5654,7 @@ msgstr "" #. Label of the asset_value (Currency) field in DocType 'Asset Capitalization #. Asset Item' #: erpnext/assets/dashboard_fixtures.py:180 -#: erpnext/assets/doctype/asset/asset.js:505 +#: erpnext/assets/doctype/asset/asset.js:512 #: erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json #: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:208 #: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:459 @@ -5647,7 +5665,7 @@ msgstr "" #. Name of a DocType #. Label of a Link in the Assets Workspace #. Label of a Workspace Sidebar Item -#: erpnext/assets/doctype/asset/asset.js:97 +#: erpnext/assets/doctype/asset/asset.js:100 #: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json #: erpnext/assets/workspace/assets/assets.json #: erpnext/workspace_sidebar/assets.json @@ -5876,7 +5894,7 @@ msgstr "" msgid "At least one asset has to be selected." msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:1038 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:1043 msgid "At least one invoice has to be selected." msgstr "" @@ -6157,7 +6175,7 @@ msgstr "" msgid "Auto Reconcile Payments" msgstr "" -#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:451 +#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:452 msgid "Auto Reconciliation" msgstr "" @@ -6167,7 +6185,7 @@ msgstr "" msgid "Auto Reconciliation Job Trigger" msgstr "" -#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:399 +#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:400 msgid "Auto Reconciliation has started in the background" msgstr "" @@ -6321,7 +6339,7 @@ msgstr "" #. 'Pick List Item' #: erpnext/manufacturing/doctype/workstation/workstation.js:505 #: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:88 -#: erpnext/public/js/utils.js:621 +#: erpnext/public/js/utils.js:627 #: 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 @@ -6559,7 +6577,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 "" @@ -6708,11 +6726,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 @@ -6722,6 +6735,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_calculated/bom_stock_calculated.json msgid "BOM Stock Calculated" @@ -6797,14 +6823,10 @@ msgstr "" msgid "BOM Website Operation" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2285 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2290 msgid "BOM and Finished Good Quantity is mandatory for Disassembly" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.js:1341 -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 @@ -6820,23 +6842,23 @@ msgstr "" msgid "BOM recursion: {0} cannot be child of {1}" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:758 +#: erpnext/manufacturing/doctype/bom/bom.py:796 msgid "BOM recursion: {1} cannot be parent or child of {0}" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1495 +#: erpnext/manufacturing/doctype/bom/bom.py:1541 msgid "BOM {0} does not belong to Item {1}" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1477 +#: erpnext/manufacturing/doctype/bom/bom.py:1523 msgid "BOM {0} must be active" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1480 +#: erpnext/manufacturing/doctype/bom/bom.py:1526 msgid "BOM {0} must be submitted" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:848 +#: erpnext/manufacturing/doctype/bom/bom.py:886 msgid "BOM {0} not found for the item {1}" msgstr "" @@ -7378,6 +7400,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" @@ -7466,16 +7493,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 "" @@ -7601,7 +7621,7 @@ msgstr "" msgid "Batch No is mandatory" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:3368 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:3385 msgid "Batch No {0} does not exists" msgstr "" @@ -7624,11 +7644,11 @@ msgstr "" msgid "Batch Nos" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1917 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1934 msgid "Batch Nos are created successfully" msgstr "" -#: erpnext/controllers/sales_and_purchase_return.py:1194 +#: erpnext/controllers/sales_and_purchase_return.py:1193 msgid "Batch Not Available for Return" msgstr "" @@ -7642,7 +7662,7 @@ msgstr "" msgid "Batch Qty" msgstr "" -#: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.py:125 +#: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.py:126 msgid "Batch Qty updated successfully" msgstr "" @@ -7686,16 +7706,16 @@ msgstr "" msgid "Batch {0} and Warehouse" msgstr "" -#: erpnext/controllers/sales_and_purchase_return.py:1193 +#: erpnext/controllers/sales_and_purchase_return.py:1192 msgid "Batch {0} is not available in warehouse {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3294 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3326 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:289 msgid "Batch {0} of Item {1} has expired." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3300 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3332 msgid "Batch {0} of Item {1} is disabled." msgstr "" @@ -7762,7 +7782,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:1327 +#: erpnext/manufacturing/doctype/bom/bom.py:1373 #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json #: erpnext/stock/doctype/material_request/material_request.js:139 #: erpnext/stock/doctype/stock_entry/stock_entry.js:693 @@ -8205,7 +8225,7 @@ msgstr "" msgid "Booking stock value across multiple accounts will make it harder to track stock and account value." msgstr "" -#: erpnext/accounts/general_ledger.py:827 +#: erpnext/accounts/general_ledger.py:829 msgid "Books have been closed till the period ending on {0}" msgstr "" @@ -8599,6 +8619,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 @@ -8908,7 +8943,7 @@ msgstr "" msgid "Can be approved by {0}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2533 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2534 msgid "Can not close Work Order. Since {0} Job Cards are in Work In Progress state." msgstr "" @@ -8936,8 +8971,8 @@ msgstr "" msgid "Can not filter based on Voucher No, if grouped by Voucher" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1389 -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2885 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1395 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2880 msgid "Can only make payment against unbilled {0}" msgstr "" @@ -9023,7 +9058,7 @@ msgstr "" msgid "Cannot amend {0} {1}, please create a new one instead." msgstr "" -#: erpnext/accounts/doctype/tax_withholding_entry/tax_withholding_entry.py:1293 +#: erpnext/accounts/doctype/tax_withholding_entry/tax_withholding_entry.py:1295 msgid "Cannot apply TDS against multiple parties in one entry" msgstr "" @@ -9055,11 +9090,11 @@ 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 "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:570 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:576 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 "" @@ -9128,7 +9163,7 @@ msgstr "" msgid "Cannot create return for consolidated invoice {0}." msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1184 +#: erpnext/manufacturing/doctype/bom/bom.py:1217 msgid "Cannot deactivate or cancel BOM as it is linked with other BOMs" msgstr "" @@ -9355,7 +9390,7 @@ msgstr "" msgid "Capital Work in Progress" msgstr "" -#: erpnext/assets/doctype/asset/asset.js:220 +#: erpnext/assets/doctype/asset/asset.js:223 msgid "Capitalize Asset" msgstr "" @@ -9364,7 +9399,7 @@ msgstr "" msgid "Capitalize Repair Cost" msgstr "" -#: erpnext/assets/doctype/asset/asset.js:218 +#: erpnext/assets/doctype/asset/asset.js:221 msgid "Capitalize this asset before submitting." msgstr "" @@ -9764,7 +9799,7 @@ msgstr "" #. Label of a Link in the Invoicing Workspace #. Label of a Workspace Sidebar Item -#: erpnext/accounts/doctype/account/account_tree.js:196 +#: erpnext/accounts/doctype/account/account_tree.js:191 #: erpnext/accounts/doctype/cost_center/cost_center.js:41 #: erpnext/accounts/workspace/invoicing/invoicing.json #: erpnext/workspace_sidebar/accounts_setup.json @@ -10101,7 +10136,7 @@ msgstr "" msgid "Closed Documents" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2456 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2457 msgid "Closed Work Order can not be stopped or Re-opened" msgstr "" @@ -10186,6 +10221,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 @@ -11111,8 +11161,8 @@ msgstr "" msgid "Completed Qty cannot be greater than 'Qty to Manufacture'" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:323 -#: erpnext/manufacturing/doctype/job_card/job_card.js:444 +#: erpnext/manufacturing/doctype/job_card/job_card.js:321 +#: erpnext/manufacturing/doctype/job_card/job_card.js:442 #: erpnext/manufacturing/doctype/workstation/workstation.js:296 msgid "Completed Quantity" msgstr "" @@ -11258,7 +11308,7 @@ msgstr "" msgid "Consider Minimum Order Qty" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:990 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1018 msgid "Consider Process Loss" msgstr "" @@ -11478,7 +11528,7 @@ msgstr "" msgid "Consumed Stock Total Value" msgstr "" -#: erpnext/stock/doctype/stock_entry_type/stock_entry_type.py:126 +#: erpnext/stock/doctype/stock_entry_type/stock_entry_type.py:131 msgid "Consumed quantity of item {0} exceeds transferred quantity." msgstr "" @@ -11731,6 +11781,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 @@ -11758,8 +11809,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:876 +#: erpnext/public/js/utils.js:882 #: 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 @@ -11867,13 +11919,13 @@ msgstr "" msgid "Corrective Action" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:501 +#: erpnext/manufacturing/doctype/job_card/job_card.js:499 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:508 +#: erpnext/manufacturing/doctype/job_card/job_card.js:506 #: erpnext/manufacturing/doctype/job_card/job_card.json msgid "Corrective Operation" msgstr "" @@ -11895,10 +11947,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' @@ -12109,7 +12175,7 @@ msgstr "" msgid "Cost Center is a part of Cost Center Allocation, hence cannot be converted to a group" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1433 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1434 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:898 msgid "Cost Center is required in row {0} in Taxes table for type {1}" msgstr "" @@ -12156,6 +12222,10 @@ msgstr "" msgid "Cost Per Unit" msgstr "" +#: erpnext/manufacturing/doctype/bom/bom.py:442 +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" @@ -12259,7 +12329,7 @@ msgstr "" msgid "Could not auto create Customer due to the following missing mandatory field(s):" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:689 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:693 msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again" msgstr "" @@ -12341,7 +12411,7 @@ msgstr "" msgid "Coupon Type" msgstr "" -#: erpnext/accounts/doctype/account/account_tree.js:86 +#: erpnext/accounts/doctype/account/account_tree.js:63 #: erpnext/accounts/doctype/bank_clearance/bank_clearance.py:82 #: erpnext/templates/form_grid/bank_reconciliation_grid.html:16 msgid "Cr" @@ -12539,7 +12609,7 @@ msgstr "" msgid "Create Payment Request" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:766 +#: erpnext/manufacturing/doctype/work_order/work_order.js:794 msgid "Create Pick List" msgstr "" @@ -12670,7 +12740,7 @@ msgstr "" msgid "Create Supplier" msgstr "" -#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:184 +#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:180 msgid "Create Supplier Quotation" msgstr "" @@ -12745,7 +12815,7 @@ msgstr "" msgid "Create a variant with the template image." msgstr "" -#: erpnext/stock/stock_ledger.py:2012 +#: erpnext/stock/stock_ledger.py:2014 msgid "Create an incoming stock transaction for the Item." msgstr "" @@ -13059,7 +13129,7 @@ msgstr "" msgid "Credit Note will update it's own outstanding amount, even if 'Return Against' is specified." msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:686 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:690 msgid "Credit Note {0} has been created automatically" msgstr "" @@ -13269,7 +13339,7 @@ msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1604 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1672 -#: erpnext/accounts/utils.py:2468 +#: erpnext/accounts/utils.py:2541 msgid "Currency for {0} must be {1}" msgstr "" @@ -13277,7 +13347,7 @@ msgstr "" msgid "Currency of the Closing Account must be {0}" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:692 +#: erpnext/manufacturing/doctype/bom/bom.py:730 msgid "Currency of the price list {0} must be {1} or {2}" msgstr "" @@ -13337,11 +13407,6 @@ msgstr "" msgid "Current Exchange Rate" msgstr "" -#. Label of the current_index (Int) field in DocType 'Repost Item Valuation' -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json -msgid "Current Index" -msgstr "" - #. Label of the current_invoice_end (Date) field in DocType 'Subscription' #: erpnext/accounts/doctype/subscription/subscription.json msgid "Current Invoice End Date" @@ -14098,7 +14163,7 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1146 #: erpnext/selling/doctype/sales_order/sales_order.py:435 -#: erpnext/stock/doctype/delivery_note/delivery_note.py:433 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:437 msgid "Customer {0} does not belong to project {1}" msgstr "" @@ -14552,7 +14617,7 @@ msgstr "" msgid "Debit To is required" msgstr "" -#: erpnext/accounts/general_ledger.py:534 +#: erpnext/accounts/general_ledger.py:536 msgid "Debit and Credit not equal for {0} #{1}. Difference is {2}." msgstr "" @@ -15328,9 +15393,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' @@ -15393,7 +15459,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 @@ -15403,7 +15469,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 "" @@ -15439,7 +15505,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:1066 -#: erpnext/public/js/utils.js:869 +#: erpnext/public/js/utils.js:875 #: 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:1486 @@ -15747,12 +15813,12 @@ msgstr "" #. Label of the depreciation_amount (Currency) field in DocType 'Depreciation #. Schedule' #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:172 -#: erpnext/assets/doctype/asset/asset.js:372 +#: erpnext/assets/doctype/asset/asset.js:379 #: erpnext/assets/doctype/depreciation_schedule/depreciation_schedule.json msgid "Depreciation Amount" msgstr "" -#: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:641 +#: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:882 msgid "Depreciation Amount during the period" msgstr "" @@ -15768,7 +15834,7 @@ msgstr "" msgid "Depreciation Details" msgstr "" -#: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:647 +#: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:888 msgid "Depreciation Eliminated due to disposal of assets" msgstr "" @@ -15778,7 +15844,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/journal_entry_template/journal_entry_template.json #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:190 -#: erpnext/assets/doctype/asset/asset.js:119 +#: erpnext/assets/doctype/asset/asset.js:122 msgid "Depreciation Entry" msgstr "" @@ -15830,7 +15896,7 @@ msgstr "" msgid "Depreciation Posting Date" msgstr "" -#: erpnext/assets/doctype/asset/asset.js:910 +#: erpnext/assets/doctype/asset/asset.js:917 msgid "Depreciation Posting Date cannot be before Available-for-use Date" msgstr "" @@ -15871,7 +15937,7 @@ msgstr "" msgid "Depreciation cannot be calculated for fully depreciated assets" msgstr "" -#: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:659 +#: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:900 msgid "Depreciation eliminated via reversal" msgstr "" @@ -16207,7 +16273,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 "" @@ -16422,7 +16488,7 @@ msgstr "" msgid "Discount must be less than 100" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:3363 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:3358 msgid "Discount of {} applied as per Payment Term" msgstr "" @@ -16742,7 +16808,7 @@ msgstr "" msgid "Do not update variants on save" msgstr "" -#: erpnext/assets/doctype/asset/asset.js:948 +#: erpnext/assets/doctype/asset/asset.js:955 msgid "Do you really want to restore this scrapped asset?" msgstr "" @@ -17642,11 +17708,11 @@ msgstr "" msgid "Employee User Id" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:213 +#: erpnext/setup/doctype/employee/employee.py:211 msgid "Employee cannot report to himself." msgstr "" -#: erpnext/setup/doctype/employee/employee.py:451 +#: erpnext/setup/doctype/employee/employee.py:449 msgid "Employee is required" msgstr "" @@ -17659,11 +17725,11 @@ msgstr "" msgid "Employee {0} does not belong to the company {1}" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:358 +#: erpnext/manufacturing/doctype/job_card/job_card.py:376 msgid "Employee {0} is currently working on another workstation. Please assign another employee." msgstr "" -#: erpnext/setup/doctype/employee/employee.py:476 +#: erpnext/setup/doctype/employee/employee.py:474 msgid "Employee {0} not found" msgstr "" @@ -17932,8 +17998,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:381 -#: erpnext/manufacturing/doctype/job_card/job_card.js:451 +#: erpnext/manufacturing/doctype/job_card/job_card.js:379 +#: erpnext/manufacturing/doctype/job_card/job_card.js:449 #: 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 @@ -18028,8 +18094,8 @@ msgstr "" msgid "Enter Supplier" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:408 -#: erpnext/manufacturing/doctype/job_card/job_card.js:477 +#: erpnext/manufacturing/doctype/job_card/job_card.js:406 +#: erpnext/manufacturing/doctype/job_card/job_card.js:475 #: erpnext/manufacturing/doctype/workstation/workstation.js:312 msgid "Enter Value" msgstr "" @@ -18066,7 +18132,7 @@ msgstr "" msgid "Enter customer's phone number" msgstr "" -#: erpnext/assets/doctype/asset/asset.js:919 +#: erpnext/assets/doctype/asset/asset.js:926 msgid "Enter date to scrap asset" msgstr "" @@ -18105,11 +18171,11 @@ msgstr "" msgid "Enter the opening stock units." msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.js:965 +#: erpnext/manufacturing/doctype/bom/bom.js:945 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:1130 +#: 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 "" @@ -18271,7 +18337,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:2276 +#: erpnext/stock/stock_ledger.py:2278 msgid "Example: Serial No {0} reserved in {1}." msgstr "" @@ -18285,7 +18351,7 @@ msgstr "" msgid "Excess Materials Consumed" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1116 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1134 msgid "Excess Transfer" msgstr "" @@ -18790,7 +18856,7 @@ msgstr "" msgid "Extra Consumed Qty" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:255 +#: erpnext/manufacturing/doctype/job_card/job_card.py:263 msgid "Extra Job Card Quantity" msgstr "" @@ -18888,7 +18954,7 @@ msgstr "" msgid "Failed to parse MT940 format. Error: {0}" msgstr "" -#: erpnext/assets/doctype/asset/asset.js:253 +#: erpnext/assets/doctype/asset/asset.js:260 msgid "Failed to post depreciation entries" msgstr "" @@ -19266,9 +19332,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:850 -#: erpnext/manufacturing/doctype/work_order/work_order.js:865 -#: erpnext/manufacturing/doctype/work_order/work_order.js:874 +#: 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 +19365,20 @@ msgstr "" #. Service Item' #. Label of the fg_item (Link) field in DocType 'Subcontracting Order Service #. Item' -#: erpnext/public/js/utils.js:895 +#: erpnext/public/js/utils.js:901 #: 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:913 +#: erpnext/public/js/utils.js:919 msgid "Finished Good Item Qty" msgstr "" @@ -19419,7 +19485,7 @@ msgstr "" msgid "Finished Goods based Operating Cost" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1676 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1681 msgid "Finished Item {0} does not match with Work Order {1}" msgstr "" @@ -19589,7 +19655,7 @@ msgstr "" msgid "Fixed Asset Turnover Ratio" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:749 +#: erpnext/manufacturing/doctype/bom/bom.py:787 msgid "Fixed Asset item {0} cannot be used in BOMs." msgstr "" @@ -19738,7 +19804,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:521 +#: erpnext/manufacturing/doctype/job_card/job_card.js:519 #: erpnext/manufacturing/doctype/job_card/job_card.json msgid "For Operation" msgstr "" @@ -19835,11 +19901,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:347 +#: erpnext/manufacturing/doctype/bom/bom.py:368 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:2603 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2604 msgid "For operation {0}: Quantity ({1}) can not be greater than pending quantity({2})" msgstr "" @@ -19856,7 +19922,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:1708 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1713 msgid "For quantity {0} should not be greater than allowed quantity {1}" msgstr "" @@ -19902,7 +19968,7 @@ msgstr "" msgid "For the {0}, no stock is available for the return in the warehouse {1}." msgstr "" -#: erpnext/controllers/sales_and_purchase_return.py:1245 +#: erpnext/controllers/sales_and_purchase_return.py:1244 msgid "For the {0}, the quantity is required to make the return entry" msgstr "" @@ -20451,7 +20517,7 @@ msgstr "" msgid "Furniture and Fixtures" msgstr "" -#: erpnext/accounts/doctype/account/account_tree.js:140 +#: erpnext/accounts/doctype/account/account_tree.js:135 msgid "Further accounts can be made under Groups, but entries can be made against non-Groups" msgstr "" @@ -20784,9 +20850,9 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1125 #: erpnext/buying/doctype/purchase_order/purchase_order.js:540 #: erpnext/buying/doctype/purchase_order/purchase_order.js:563 -#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:383 -#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:405 -#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:450 +#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:379 +#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:401 +#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:446 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:75 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:108 #: erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js:80 @@ -20796,7 +20862,7 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan/production_plan.json #: erpnext/public/js/controllers/buying.js:327 #: erpnext/selling/doctype/quotation/quotation.js:183 -#: erpnext/selling/doctype/sales_order/sales_order.js:196 +#: erpnext/selling/doctype/sales_order/sales_order.js:203 #: erpnext/selling/doctype/sales_order/sales_order.js:1200 #: erpnext/stock/doctype/delivery_note/delivery_note.js:187 #: erpnext/stock/doctype/delivery_note/delivery_note.js:239 @@ -20829,7 +20895,7 @@ msgstr "" msgid "Get Items from BOM" msgstr "" -#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:422 +#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:418 msgid "Get Items from Material Requests against this Supplier" msgstr "" @@ -20898,10 +20964,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' @@ -20919,12 +20985,12 @@ msgstr "" msgid "Get Sub Assembly Items" msgstr "" -#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:464 -#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:484 +#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:460 +#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:480 msgid "Get Suppliers" msgstr "" -#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:488 +#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:484 msgid "Get Suppliers By" msgstr "" @@ -20945,8 +21011,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' @@ -21000,7 +21066,7 @@ msgstr "" msgid "Goods Transferred" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2226 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2231 msgid "Goods are already received against the outward entry {0}" msgstr "" @@ -21597,7 +21663,7 @@ msgstr "" msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}" msgstr "" -#: erpnext/stock/stock_ledger.py:1997 +#: erpnext/stock/stock_ledger.py:1999 msgid "Here are the options to proceed:" msgstr "" @@ -22072,10 +22138,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 @@ -22182,7 +22248,7 @@ 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:2007 +#: erpnext/stock/stock_ledger.py:2009 msgid "If not, you can Cancel / Submit this entry" msgstr "" @@ -22202,7 +22268,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:1163 +#: 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 "" @@ -22211,7 +22277,7 @@ msgstr "" msgid "If the account is frozen, entries are allowed to restricted users." msgstr "" -#: erpnext/stock/stock_ledger.py:2000 +#: erpnext/stock/stock_ledger.py:2002 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 "" @@ -22221,7 +22287,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:1182 +#: 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 "" @@ -23273,7 +23339,7 @@ msgid "Inspected By" msgstr "" #: erpnext/controllers/stock_controller.py:1494 -#: erpnext/manufacturing/doctype/job_card/job_card.py:816 +#: erpnext/manufacturing/doctype/job_card/job_card.py:834 msgid "Inspection Rejected" msgstr "" @@ -23297,7 +23363,7 @@ msgid "Inspection Required before Purchase" msgstr "" #: erpnext/controllers/stock_controller.py:1479 -#: erpnext/manufacturing/doctype/job_card/job_card.py:797 +#: erpnext/manufacturing/doctype/job_card/job_card.py:815 msgid "Inspection Submission" msgstr "" @@ -23327,7 +23393,7 @@ msgstr "" msgid "Installation Note Item" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:640 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:644 msgid "Installation Note {0} has already been submitted" msgstr "" @@ -23376,12 +23442,12 @@ msgstr "" #: erpnext/stock/doctype/pick_list/pick_list.py:154 #: erpnext/stock/doctype/pick_list/pick_list.py:1021 #: erpnext/stock/doctype/stock_entry/stock_entry.py:962 -#: erpnext/stock/serial_batch_bundle.py:1206 erpnext/stock/stock_ledger.py:1708 -#: erpnext/stock/stock_ledger.py:2167 +#: erpnext/stock/serial_batch_bundle.py:1206 erpnext/stock/stock_ledger.py:1710 +#: erpnext/stock/stock_ledger.py:2169 msgid "Insufficient Stock" msgstr "" -#: erpnext/stock/stock_ledger.py:2182 +#: erpnext/stock/stock_ledger.py:2184 msgid "Insufficient Stock for Batch" msgstr "" @@ -23517,7 +23583,7 @@ msgstr "" msgid "Interest Income" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2997 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2992 msgid "Interest and/or dunning fee" msgstr "" @@ -23632,7 +23698,7 @@ msgid "Invalid Accounting Dimension" msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.py:400 -#: erpnext/accounts/doctype/payment_request/payment_request.py:1004 +#: erpnext/accounts/doctype/payment_request/payment_request.py:1005 msgid "Invalid Allocated Amount" msgstr "" @@ -23686,7 +23752,7 @@ msgstr "" msgid "Invalid Discount" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:802 +#: erpnext/controllers/taxes_and_totals.py:803 msgid "Invalid Discount Amount" msgstr "" @@ -23726,7 +23792,7 @@ msgid "Invalid Net Purchase Amount" msgstr "" #: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:79 -#: erpnext/accounts/general_ledger.py:819 +#: erpnext/accounts/general_ledger.py:821 msgid "Invalid Opening Entry" msgstr "" @@ -23760,7 +23826,7 @@ msgstr "" msgid "Invalid Priority" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1233 +#: erpnext/manufacturing/doctype/bom/bom.py:1276 msgid "Invalid Process Loss Configuration" msgstr "" @@ -23798,7 +23864,7 @@ msgstr "" msgid "Invalid Selling Price" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1751 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1756 msgid "Invalid Serial and Batch Bundle" msgstr "" @@ -23858,8 +23924,8 @@ msgstr "" #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:109 #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:119 -#: erpnext/accounts/general_ledger.py:862 -#: erpnext/accounts/general_ledger.py:872 +#: erpnext/accounts/general_ledger.py:864 +#: erpnext/accounts/general_ledger.py:874 msgid "Invalid value {0} for {1} against account {2}" msgstr "" @@ -24401,6 +24467,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" @@ -24551,14 +24631,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" @@ -24830,9 +24902,9 @@ msgstr "" #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:33 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:202 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/controllers/taxes_and_totals.py:1211 +#: erpnext/controllers/taxes_and_totals.py:1212 #: erpnext/manufacturing/doctype/blanket_order/blanket_order.json -#: erpnext/manufacturing/doctype/bom/bom.js:1058 +#: erpnext/manufacturing/doctype/bom/bom.js:1038 #: erpnext/manufacturing/doctype/bom/bom.json #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109 #: erpnext/manufacturing/doctype/workstation/workstation_job_card.html:25 @@ -25019,7 +25091,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 @@ -25063,7 +25135,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' @@ -25110,7 +25182,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 @@ -25137,8 +25209,8 @@ msgstr "" #: erpnext/projects/doctype/timesheet/timesheet.js:214 #: erpnext/public/js/controllers/transaction.js:2899 #: erpnext/public/js/stock_reservation.js:112 -#: erpnext/public/js/stock_reservation.js:318 erpnext/public/js/utils.js:553 -#: erpnext/public/js/utils.js:710 +#: erpnext/public/js/stock_reservation.js:318 erpnext/public/js/utils.js:559 +#: erpnext/public/js/utils.js:716 #: 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 @@ -25202,7 +25274,7 @@ msgstr "" #: 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 @@ -25516,7 +25588,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' @@ -25595,7 +25667,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 @@ -25618,7 +25690,7 @@ msgstr "" #: 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:2905 -#: erpnext/public/js/utils.js:805 +#: erpnext/public/js/utils.js:811 #: 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 @@ -25995,7 +26067,7 @@ msgstr "" msgid "Item Wise Tax Details" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:536 +#: erpnext/controllers/taxes_and_totals.py:537 msgid "Item Wise Tax Details do not match with Taxes and Charges at the following rows:" msgstr "" @@ -26015,7 +26087,7 @@ msgstr "" msgid "Item and Warranty Details" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3273 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3305 msgid "Item for row {0} does not match Material Request" msgstr "" @@ -26049,7 +26121,7 @@ msgstr "" msgid "Item qty can not be updated as raw materials are already processed." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1154 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1161 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}" msgstr "" @@ -26092,7 +26164,7 @@ msgstr "" msgid "Item {0} does not exist" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:677 +#: erpnext/manufacturing/doctype/bom/bom.py:715 msgid "Item {0} does not exist in the system or has expired" msgstr "" @@ -26148,7 +26220,7 @@ msgstr "" msgid "Item {0} is not a subcontracted item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2138 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2143 msgid "Item {0} is not active or end of life has been reached" msgstr "" @@ -26168,7 +26240,7 @@ msgstr "" msgid "Item {0} must be a non-stock item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1487 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1494 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}" msgstr "" @@ -26234,7 +26306,7 @@ msgstr "" msgid "Item/Item Code required to get Item Tax Template." msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:413 +#: erpnext/manufacturing/doctype/bom/bom.py:452 msgid "Item: {0} does not exist in the system" msgstr "" @@ -26294,7 +26366,7 @@ msgstr "" msgid "Items not found." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1150 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1157 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}" msgstr "" @@ -26369,9 +26441,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:981 +#: erpnext/manufacturing/doctype/job_card/job_card.py:999 #: 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 @@ -26409,8 +26481,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 @@ -26433,7 +26505,7 @@ msgstr "" msgid "Job Card and Capacity Planning" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1457 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1475 msgid "Job Card {0} has been completed" msgstr "" @@ -26509,7 +26581,7 @@ msgstr "" msgid "Job Worker Warehouse" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2656 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2658 msgid "Job card {0} created" msgstr "" @@ -26559,8 +26631,8 @@ msgstr "" #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json #: erpnext/accounts/print_format/journal_auditing_voucher/journal_auditing_voucher.html:10 #: erpnext/accounts/workspace/invoicing/invoicing.json -#: erpnext/assets/doctype/asset/asset.js:378 -#: erpnext/assets/doctype/asset/asset.js:387 +#: erpnext/assets/doctype/asset/asset.js:385 +#: erpnext/assets/doctype/asset/asset.js:394 #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json #: erpnext/assets/doctype/depreciation_schedule/depreciation_schedule.json @@ -26594,7 +26666,7 @@ msgstr "" msgid "Journal Entry Type" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:548 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:554 msgid "Journal Entry for Asset scrapping cannot be cancelled. Please restore the Asset." msgstr "" @@ -26603,11 +26675,11 @@ msgstr "" msgid "Journal Entry for Scrap" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:344 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:350 msgid "Journal Entry type should be set as Depreciation Entry for asset depreciation" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:718 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:724 msgid "Journal Entry {0} does not have account {1} or already matched against other voucher" msgstr "" @@ -26725,7 +26797,7 @@ msgstr "" msgid "Kilowatt-Hour" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:983 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1001 msgid "Kindly cancel the Manufacturing Entries first against the work order {0}." msgstr "" @@ -27298,7 +27370,7 @@ msgstr "" msgid "Link to Material Request" msgstr "" -#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:455 +#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:451 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:80 msgid "Link to Material Requests" msgstr "" @@ -27595,7 +27667,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:174 +#: erpnext/public/js/utils.js:180 msgid "Loyalty Points: {0}" msgstr "" @@ -27713,7 +27785,7 @@ msgstr "" msgid "Main Item Code" msgstr "" -#: erpnext/assets/doctype/asset/asset.js:135 +#: erpnext/assets/doctype/asset/asset.js:138 msgid "Maintain Asset" msgstr "" @@ -27936,9 +28008,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:542 -#: erpnext/manufacturing/doctype/work_order/work_order.js:805 -#: erpnext/manufacturing/doctype/work_order/work_order.js:839 +#: erpnext/manufacturing/doctype/job_card/job_card.js:540 +#: 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 "" @@ -28001,7 +28073,7 @@ msgstr "" msgid "Make Stock Entry" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:416 +#: erpnext/manufacturing/doctype/job_card/job_card.js:414 msgid "Make Subcontracting PO" msgstr "" @@ -28160,8 +28232,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:1231 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1247 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1238 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1254 #: 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 @@ -28310,7 +28382,7 @@ msgstr "" msgid "Manufacturing Manager" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2391 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2396 msgid "Manufacturing Quantity is mandatory" msgstr "" @@ -28387,7 +28459,7 @@ msgstr "" msgid "Mapping Subcontracting Order ..." msgstr "" -#: erpnext/public/js/utils.js:1040 +#: erpnext/public/js/utils.js:1046 msgid "Mapping {0} ..." msgstr "" @@ -28533,7 +28605,7 @@ msgstr "" msgid "Material" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:830 +#: erpnext/manufacturing/doctype/work_order/work_order.js:858 msgid "Material Consumption" msgstr "" @@ -28541,7 +28613,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:1232 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1239 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json msgid "Material Consumption for Manufacture" msgstr "" @@ -28614,7 +28686,7 @@ msgstr "" #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json #: erpnext/buying/doctype/purchase_order/purchase_order.js:519 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json -#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:364 +#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:360 #: erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.json #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:56 #: erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json @@ -28732,7 +28804,7 @@ msgstr "" msgid "Material Request used to make this Stock Entry" msgstr "" -#: erpnext/controllers/subcontracting_controller.py:1336 +#: erpnext/controllers/subcontracting_controller.py:1342 msgid "Material Request {0} is cancelled or stopped" msgstr "" @@ -28851,12 +28923,12 @@ msgstr "" msgid "Materials To Be Transferred" msgstr "" -#: erpnext/controllers/subcontracting_controller.py:1574 +#: erpnext/controllers/subcontracting_controller.py:1580 msgid "Materials are already received against the {0} {1}" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:182 -#: erpnext/manufacturing/doctype/job_card/job_card.py:837 +#: erpnext/manufacturing/doctype/job_card/job_card.py:184 +#: erpnext/manufacturing/doctype/job_card/job_card.py:855 msgid "Materials needs to be transferred to the work in progress warehouse for the job card {0}" msgstr "" @@ -28925,7 +28997,7 @@ msgstr "" msgid "Max discount allowed for item: {0} is {1}%" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:982 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1010 #: erpnext/stock/doctype/pick_list/pick_list.js:200 msgid "Max: {0}" msgstr "" @@ -28947,11 +29019,11 @@ msgstr "" msgid "Maximum Payment Amount" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3876 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3908 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3867 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3899 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}." msgstr "" @@ -29006,7 +29078,7 @@ msgstr "" msgid "Megawatt" msgstr "" -#: erpnext/stock/stock_ledger.py:2013 +#: erpnext/stock/stock_ledger.py:2015 msgid "Mention Valuation Rate in the Item master." msgstr "" @@ -29051,7 +29123,7 @@ msgstr "" msgid "Merge Similar Account Heads" msgstr "" -#: erpnext/public/js/utils.js:1072 +#: erpnext/public/js/utils.js:1078 msgid "Merge taxes from multiple documents" msgstr "" @@ -29416,7 +29488,7 @@ msgstr "" msgid "Missing Finance Book" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1686 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1691 msgid "Missing Finished Good" msgstr "" @@ -29428,7 +29500,7 @@ msgstr "" msgid "Missing Item" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:451 +#: erpnext/setup/doctype/employee/employee.py:449 msgid "Missing Parameter" msgstr "" @@ -29452,7 +29524,7 @@ msgstr "" msgid "Missing required filter: {0}" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1192 +#: erpnext/manufacturing/doctype/bom/bom.py:1225 #: erpnext/manufacturing/doctype/work_order/work_order.py:1476 msgid "Missing value" msgstr "" @@ -29546,10 +29618,6 @@ msgstr "" msgid "Modes of Payment" msgstr "" -#: erpnext/templates/pages/projects.html:69 -msgid "Modified By" -msgstr "" - #: erpnext/templates/pages/projects.html:49 #: erpnext/templates/pages/projects.html:70 msgid "Modified On" @@ -29726,7 +29794,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:1693 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1698 msgid "Multiple items cannot be marked as finished item" msgstr "" @@ -29769,7 +29837,7 @@ msgstr "" msgid "Name of Beneficiary" msgstr "" -#: erpnext/accounts/doctype/account/account_tree.js:126 +#: erpnext/accounts/doctype/account/account_tree.js:121 msgid "Name of new Account. Note: Please don't create accounts for Customers and Suppliers" msgstr "" @@ -29946,8 +30014,8 @@ msgstr "" msgid "Net Amount (Company Currency)" msgstr "" -#: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:665 -#: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:671 +#: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:906 +#: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:912 msgid "Net Asset value as on" msgstr "" @@ -30178,7 +30246,7 @@ msgstr "" msgid "Net total calculation precision loss" msgstr "" -#: erpnext/accounts/doctype/account/account_tree.js:124 +#: erpnext/accounts/doctype/account/account_tree.js:119 msgid "New Account Name" msgstr "" @@ -30220,7 +30288,7 @@ msgstr "" msgid "New Batch Qty" msgstr "" -#: erpnext/accounts/doctype/account/account_tree.js:113 +#: erpnext/accounts/doctype/account/account_tree.js:108 #: erpnext/accounts/doctype/cost_center/cost_center_tree.js:18 #: erpnext/setup/doctype/company/company_tree.js:23 msgid "New Company" @@ -30443,7 +30511,7 @@ msgstr "" msgid "No Item with Serial No {0}" msgstr "" -#: erpnext/controllers/subcontracting_controller.py:1490 +#: erpnext/controllers/subcontracting_controller.py:1496 msgid "No Items selected for transfer." msgstr "" @@ -30471,9 +30539,9 @@ msgstr "" msgid "No POS Profile found. Please create a New POS Profile first" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1580 -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1640 -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1661 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1586 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1646 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1667 #: erpnext/stock/doctype/item/item.py:1405 msgid "No Permission" msgstr "" @@ -30496,7 +30564,7 @@ msgstr "" msgid "No Selection" msgstr "" -#: erpnext/controllers/sales_and_purchase_return.py:973 +#: erpnext/controllers/sales_and_purchase_return.py:972 msgid "No Serial / Batches are available for return" msgstr "" @@ -30520,7 +30588,7 @@ msgstr "" msgid "No Tax withholding account set for Company {0} in Tax Withholding Category {1}." msgstr "" -#: erpnext/accounts/report/gross_profit/gross_profit.py:965 +#: erpnext/accounts/report/gross_profit/gross_profit.py:971 msgid "No Terms" msgstr "" @@ -30538,7 +30606,7 @@ msgid "No Work Orders were created" msgstr "" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:828 -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:861 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:898 msgid "No accounting entries for the following warehouses" msgstr "" @@ -30554,7 +30622,7 @@ msgstr "" msgid "No available quantity to reserve for item {0} in warehouse {1}" msgstr "" -#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:495 +#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:497 msgid "No billing email found for customer: {0}" msgstr "" @@ -30586,7 +30654,7 @@ msgstr "" msgid "No employee was scheduled for call popup" msgstr "" -#: erpnext/controllers/subcontracting_controller.py:1381 +#: erpnext/controllers/subcontracting_controller.py:1387 msgid "No item available for transfer." msgstr "" @@ -30607,7 +30675,7 @@ msgstr "" msgid "No items in cart" msgstr "" -#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:460 +#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:461 msgid "No matches occurred via auto reconciliation" msgstr "" @@ -30725,7 +30793,7 @@ msgstr "" msgid "No pending payment schedules available." msgstr "" -#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:502 +#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:504 msgid "No primary email found for customer: {0}" msgstr "" @@ -30786,7 +30854,7 @@ msgstr "" msgid "No {0} found for Inter Company Transactions." msgstr "" -#: erpnext/assets/doctype/asset/asset.js:370 +#: erpnext/assets/doctype/asset/asset.js:377 msgid "No." msgstr "" @@ -30823,7 +30891,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 "" @@ -30952,7 +31020,7 @@ msgstr "" msgid "Note: Email will not be sent to disabled users" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:761 +#: erpnext/manufacturing/doctype/bom/bom.py:799 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 "" @@ -30972,7 +31040,7 @@ msgstr "" msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1022 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1028 msgid "Note: {0}" msgstr "" @@ -31128,7 +31196,7 @@ msgstr "" msgid "Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days" msgstr "" -#: erpnext/accounts/doctype/account/account_tree.js:134 +#: erpnext/accounts/doctype/account/account_tree.js:129 msgid "Number of new Account, it will be included in the account name as a prefix" msgstr "" @@ -31334,7 +31402,7 @@ msgstr "" msgid "Once set, this invoice will be on hold till the set date" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:717 +#: erpnext/manufacturing/doctype/work_order/work_order.js:745 msgid "Once the Work Order is Closed. It can't be resumed." msgstr "" @@ -31426,11 +31494,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:325 +#: erpnext/manufacturing/doctype/bom/bom.py:330 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:1246 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1253 msgid "Only one {0} entry can be created against the Work Order {1}" msgstr "" @@ -31663,7 +31731,7 @@ msgstr "" msgid "Opening Entry" msgstr "" -#: erpnext/accounts/general_ledger.py:818 +#: erpnext/accounts/general_ledger.py:820 msgid "Opening Entry can not be created after Period Closing Voucher is created." msgstr "" @@ -31674,7 +31742,7 @@ msgstr "" #. Name of a DocType #. Label of a Link in the Invoicing Workspace #. Label of a Link in the Home Workspace -#: erpnext/accounts/doctype/account/account_tree.js:206 +#: erpnext/accounts/doctype/account/account_tree.js:201 #: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json #: erpnext/accounts/workspace/invoicing/invoicing.json #: erpnext/setup/workspace/home/home.json @@ -31695,7 +31763,7 @@ msgstr "" msgid "Opening Invoice Tool" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1647 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1648 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1994 msgid "Opening Invoice has rounding adjustment of {0}.

'{1}' account is required to post these values. Please set it in Company: {2}.

Or, '{3}' can be enabled to not post any rounding adjustment." msgstr "" @@ -31788,7 +31856,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 "" @@ -31879,11 +31947,11 @@ msgstr "" msgid "Operation time does not depend on quantity to produce" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:584 +#: erpnext/manufacturing/doctype/job_card/job_card.js:582 msgid "Operation {0} added multiple times in the work order {1}" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1230 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1248 msgid "Operation {0} does not belong to the work order {1}" msgstr "" @@ -31913,7 +31981,7 @@ msgstr "" msgid "Operations Routing" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1201 +#: erpnext/manufacturing/doctype/bom/bom.py:1234 msgid "Operations cannot be left blank" msgstr "" @@ -31962,7 +32030,7 @@ msgstr "" #. Label of the opportunity_name (Link) field in DocType 'Customer' #. Label of the opportunity (Link) field in DocType 'Quotation' #. Label of a Workspace Sidebar Item -#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:388 +#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:384 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json #: erpnext/crm/doctype/crm_settings/crm_settings.json @@ -32074,15 +32142,15 @@ msgstr "" msgid "Optimize Route" msgstr "" -#: erpnext/accounts/doctype/account/account_tree.js:183 +#: erpnext/accounts/doctype/account/account_tree.js:178 msgid "Optional. Sets company's default currency, if not specified." msgstr "" -#: erpnext/accounts/doctype/account/account_tree.js:162 +#: erpnext/accounts/doctype/account/account_tree.js:157 msgid "Optional. This setting will be used to filter in various transactions." msgstr "" -#: erpnext/accounts/doctype/account/account_tree.js:170 +#: erpnext/accounts/doctype/account/account_tree.js:165 msgid "Optional. Used with Financial Report Template" msgstr "" @@ -33046,7 +33114,7 @@ msgstr "" msgid "Packing Slip Item" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:656 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:660 msgid "Packing Slip(s) cancelled" msgstr "" @@ -33294,7 +33362,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 "" @@ -33758,7 +33826,7 @@ msgstr "" msgid "Party Type and Party is mandatory for {0} account" msgstr "" -#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:165 +#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:166 msgid "Party Type and Party is required for Receivable / Payable account {0}" msgstr "" @@ -34067,7 +34135,7 @@ msgstr "" msgid "Payment Gateway Account" msgstr "" -#: erpnext/accounts/utils.py:1447 +#: erpnext/accounts/utils.py:1519 msgid "Payment Gateway Account not created, please create one manually." msgstr "" @@ -34458,7 +34526,7 @@ msgstr "" msgid "Payment Unlink Error" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:890 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:896 msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}" msgstr "" @@ -34728,7 +34796,7 @@ msgstr "" msgid "Period Based On" msgstr "" -#: erpnext/accounts/general_ledger.py:830 +#: erpnext/accounts/general_ledger.py:832 msgid "Period Closed" msgstr "" @@ -35353,7 +35421,7 @@ msgstr "" msgid "Please add the Bank Account column" msgstr "" -#: erpnext/accounts/doctype/account/account_tree.js:244 +#: erpnext/accounts/doctype/account/account_tree.js:239 msgid "Please add the account to root level Company - {0}" msgstr "" @@ -35386,12 +35454,12 @@ msgstr "" msgid "Please cancel related transaction." msgstr "" -#: erpnext/assets/doctype/asset/asset.js:85 +#: erpnext/assets/doctype/asset/asset.js:86 #: erpnext/assets/doctype/asset/asset.py:250 msgid "Please capitalize this asset before submitting." msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:964 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:970 msgid "Please check Multi Currency option to allow accounts with other currency" msgstr "" @@ -35594,7 +35662,7 @@ msgstr "" msgid "Please enter Receipt Document" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1028 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1034 msgid "Please enter Reference date" msgstr "" @@ -35687,7 +35755,7 @@ msgstr "" msgid "Please enter valid Financial Year Start and End Dates" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:221 +#: erpnext/setup/doctype/employee/employee.py:219 msgid "Please enter {0}" msgstr "" @@ -35743,8 +35811,8 @@ msgstr "" msgid "Please mention 'Weight UOM' along with Weight." msgstr "" -#: erpnext/accounts/general_ledger.py:664 -#: erpnext/accounts/general_ledger.py:671 +#: erpnext/accounts/general_ledger.py:666 +#: erpnext/accounts/general_ledger.py:673 msgid "Please mention '{0}' in Company: {1}" msgstr "" @@ -35789,7 +35857,7 @@ msgstr "" msgid "Please select Template Type to download template" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:808 +#: erpnext/controllers/taxes_and_totals.py:809 #: erpnext/public/js/controllers/taxes_and_totals.js:796 msgid "Please select Apply Discount On" msgstr "" @@ -35853,8 +35921,8 @@ msgstr "" msgid "Please select Finished Good Item for Service Item {0}" msgstr "" -#: erpnext/assets/doctype/asset/asset.js:745 -#: erpnext/assets/doctype/asset/asset.js:760 +#: erpnext/assets/doctype/asset/asset.js:752 +#: erpnext/assets/doctype/asset/asset.js:767 msgid "Please select Item Code first" msgstr "" @@ -35882,7 +35950,7 @@ msgstr "" msgid "Please select Posting Date first" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1246 +#: erpnext/manufacturing/doctype/bom/bom.py:1292 msgid "Please select Price List" msgstr "" @@ -35906,7 +35974,7 @@ msgstr "" msgid "Please select Stock Asset Account" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1610 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1617 msgid "Please select Subcontracting Order instead of Purchase Order {0}" msgstr "" @@ -35914,7 +35982,7 @@ 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:1501 +#: erpnext/manufacturing/doctype/bom/bom.py:1547 msgid "Please select a BOM" msgstr "" @@ -35924,8 +35992,8 @@ msgid "Please select a Company" msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.js:268 -#: erpnext/manufacturing/doctype/bom/bom.js:680 -#: erpnext/manufacturing/doctype/bom/bom.py:277 +#: erpnext/manufacturing/doctype/bom/bom.js:687 +#: erpnext/manufacturing/doctype/bom/bom.py:279 #: erpnext/public/js/controllers/accounts.js:277 #: erpnext/public/js/controllers/transaction.js:3360 msgid "Please select a Company first." @@ -35951,7 +36019,7 @@ msgstr "" msgid "Please select a Warehouse" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1571 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1602 msgid "Please select a Work Order first." msgstr "" @@ -36016,7 +36084,7 @@ msgstr "" msgid "Please select at least one row to fix" msgstr "" -#: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.js:50 +#: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.js:51 msgid "Please select at least one row with difference value" msgstr "" @@ -36032,7 +36100,7 @@ msgstr "" msgid "Please select atleast one operation to create Job Card" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1726 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1732 msgid "Please select correct account" msgstr "" @@ -36122,7 +36190,7 @@ msgstr "" msgid "Please set 'Gain/Loss Account on Asset Disposal' in Company {0}" msgstr "" -#: erpnext/accounts/general_ledger.py:558 +#: erpnext/accounts/general_ledger.py:560 msgid "Please set '{0}' in Company: {1}" msgstr "" @@ -36228,11 +36296,11 @@ msgstr "" msgid "Please set a default Holiday List for Company {0}" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:272 +#: erpnext/setup/doctype/employee/employee.py:270 msgid "Please set a default Holiday List for Employee {0} or Company {1}" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1116 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1117 msgid "Please set account in Warehouse {0}" msgstr "" @@ -36277,7 +36345,7 @@ msgstr "" msgid "Please set default Cash or Bank account in Mode of Payments {}" msgstr "" -#: erpnext/accounts/utils.py:2463 +#: erpnext/accounts/utils.py:2536 msgid "Please set default Exchange Gain/Loss Account in Company {}" msgstr "" @@ -36326,15 +36394,15 @@ msgstr "" msgid "Please set the Default Cost Center in {0} company." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:634 +#: 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:1634 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1665 msgid "Please set the Target Warehouse in the Job Card" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1638 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1669 msgid "Please set the WIP Warehouse in the Job Card" msgstr "" @@ -36471,7 +36539,7 @@ msgstr "" msgid "Portal Users" msgstr "" -#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:410 +#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:406 msgid "Possible Supplier" msgstr "" @@ -36704,7 +36772,7 @@ msgstr "" msgid "Posting Time" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2339 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2344 msgid "Posting date and posting time is mandatory" msgstr "" @@ -36845,7 +36913,7 @@ msgid "Preventive Maintenance" msgstr "" #. Label of the preview (Button) field in DocType 'Request for Quotation' -#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:270 +#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:266 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json msgid "Preview Email" msgstr "" @@ -37111,7 +37179,7 @@ msgstr "" msgid "Price is not set for the item." msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:567 +#: erpnext/manufacturing/doctype/bom/bom.py:605 msgid "Price not found for item {0} in price list {1}" msgstr "" @@ -37486,11 +37554,18 @@ msgstr "" msgid "Process Loss" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1229 +#. 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:1272 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 @@ -37498,17 +37573,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:338 +#: erpnext/manufacturing/doctype/job_card/job_card.js:336 msgid "Process Loss Quantity" msgstr "" @@ -37647,7 +37726,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 @@ -37655,7 +37734,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 "" @@ -38528,7 +38607,7 @@ msgstr "" msgid "Purchase Invoice {0} is already submitted" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1932 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1933 msgid "Purchase Invoices" msgstr "" @@ -38571,7 +38650,7 @@ msgstr "" #: 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 -#: erpnext/selling/doctype/sales_order/sales_order.js:174 +#: erpnext/selling/doctype/sales_order/sales_order.js:181 #: erpnext/selling/doctype/sales_order/sales_order.js:1097 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json @@ -38642,7 +38721,7 @@ msgstr "" msgid "Purchase Order Item Supplied" msgstr "" -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:982 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1019 msgid "Purchase Order Item reference is missing in Subcontracting Receipt {0}" msgstr "" @@ -38830,7 +38909,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:1058 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1095 msgid "Purchase Receipt {0} created." msgstr "" @@ -38993,10 +39072,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' @@ -39024,13 +39103,13 @@ msgstr "" #: erpnext/controllers/trends.py:268 erpnext/controllers/trends.py:280 #: erpnext/controllers/trends.py:285 #: erpnext/crm/doctype/opportunity_item/opportunity_item.json -#: erpnext/manufacturing/doctype/bom/bom.js:1078 +#: erpnext/manufacturing/doctype/bom/bom.js:1058 #: 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 @@ -39040,7 +39119,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:843 +#: erpnext/public/js/stock_reservation.js:336 erpnext/public/js/utils.js:849 #: 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 @@ -39074,6 +39153,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' @@ -39155,7 +39240,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:252 +#: erpnext/manufacturing/doctype/job_card/job_card.py:260 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 "" @@ -39206,7 +39291,7 @@ msgstr "" msgid "Qty for which recursion isn't applicable." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:980 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1008 msgid "Qty for {0}" msgstr "" @@ -39257,8 +39342,8 @@ msgstr "" msgid "Qty to Fetch" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:310 -#: erpnext/manufacturing/doctype/job_card/job_card.py:873 +#: erpnext/manufacturing/doctype/job_card/job_card.js:308 +#: erpnext/manufacturing/doctype/job_card/job_card.py:891 msgid "Qty to Manufacture" msgstr "" @@ -39489,17 +39574,17 @@ msgstr "" msgid "Quality Inspection Template Name" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:782 +#: erpnext/manufacturing/doctype/job_card/job_card.py:800 msgid "Quality Inspection is required for the item {0} before completing the job card {1}" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:793 -#: erpnext/manufacturing/doctype/job_card/job_card.py:802 +#: erpnext/manufacturing/doctype/job_card/job_card.py:811 +#: erpnext/manufacturing/doctype/job_card/job_card.py:820 msgid "Quality Inspection {0} is not submitted for the item: {1}" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:812 -#: erpnext/manufacturing/doctype/job_card/job_card.py:821 +#: erpnext/manufacturing/doctype/job_card/job_card.py:830 +#: erpnext/manufacturing/doctype/job_card/job_card.py:839 msgid "Quality Inspection {0} is rejected for the item: {1}" msgstr "" @@ -39719,10 +39804,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 @@ -39739,8 +39822,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 @@ -39771,7 +39853,7 @@ msgstr "" msgid "Quantity must be greater than zero, and less or equal to {0}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1010 +#: 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 "" @@ -39781,13 +39863,13 @@ msgstr "" msgid "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:741 +#: erpnext/manufacturing/doctype/bom/bom.py:779 msgid "Quantity required for Item {0} in row {1}" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:685 -#: erpnext/manufacturing/doctype/job_card/job_card.js:391 -#: erpnext/manufacturing/doctype/job_card/job_card.js:461 +#: erpnext/manufacturing/doctype/bom/bom.py:723 +#: erpnext/manufacturing/doctype/job_card/job_card.js:389 +#: erpnext/manufacturing/doctype/job_card/job_card.js:459 #: erpnext/manufacturing/doctype/workstation/workstation.js:303 msgid "Quantity should be greater than 0" msgstr "" @@ -39800,7 +39882,7 @@ msgstr "" msgid "Quantity to Manufacture" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2596 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2597 msgid "Quantity to Manufacture can not be zero for the operation {0}" msgstr "" @@ -40034,7 +40116,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' @@ -40083,9 +40165,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:853 +#: erpnext/public/js/utils.js:859 #: 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 @@ -40408,7 +40490,7 @@ msgstr "" #. 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:406 -#: erpnext/manufacturing/doctype/bom/bom.js:1051 +#: erpnext/manufacturing/doctype/bom/bom.js:1031 #: erpnext/manufacturing/doctype/bom/bom.json #: erpnext/manufacturing/doctype/job_card/job_card.json #: erpnext/manufacturing/doctype/production_plan/production_plan.json @@ -40472,7 +40554,7 @@ msgstr "" msgid "Raw Materials Supplied Cost" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:733 +#: erpnext/manufacturing/doctype/bom/bom.py:771 msgid "Raw Materials cannot be blank." msgstr "" @@ -40494,7 +40576,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:733 +#: 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 @@ -40790,13 +40872,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 "" @@ -41040,7 +41119,7 @@ msgstr "" msgid "Ref Date" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1026 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1032 msgid "Reference #{0} dated {1}" msgstr "" @@ -41078,7 +41157,7 @@ msgstr "" msgid "Reference No" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:640 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:646 msgid "Reference No & Reference Date is required for {0}" msgstr "" @@ -41086,7 +41165,7 @@ msgstr "" msgid "Reference No and Reference Date is mandatory for Bank transaction" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:645 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:651 msgid "Reference No is mandatory if you entered Reference Date" msgstr "" @@ -41180,11 +41259,11 @@ msgstr "" msgid "References" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:400 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:404 msgid "References to Sales Invoices are Incomplete" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:395 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:396 msgid "References to Sales Orders are Incomplete" msgstr "" @@ -41240,15 +41319,15 @@ 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 "" @@ -41779,7 +41858,7 @@ msgstr "" msgid "Reqd Qty (BOM)" msgstr "" -#: erpnext/public/js/utils.js:869 +#: erpnext/public/js/utils.js:875 msgid "Reqd by date" msgstr "" @@ -42052,8 +42131,8 @@ msgstr "" msgid "Reservation Based On" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:891 -#: erpnext/selling/doctype/sales_order/sales_order.js:92 +#: 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 msgid "Reserve" @@ -42167,29 +42246,29 @@ msgstr "" msgid "Reserved Quantity for Production" msgstr "" -#: erpnext/stock/stock_ledger.py:2282 +#: erpnext/stock/stock_ledger.py:2284 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:907 +#: erpnext/manufacturing/doctype/work_order/work_order.js:935 #: erpnext/public/js/stock_reservation.js:236 -#: erpnext/selling/doctype/sales_order/sales_order.js:120 +#: erpnext/selling/doctype/sales_order/sales_order.js:127 #: erpnext/selling/doctype/sales_order/sales_order.js:457 #: erpnext/stock/dashboard/item_dashboard_list.html:15 #: erpnext/stock/doctype/bin/bin.json #: 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:2266 +#: erpnext/stock/stock_ledger.py:2268 #: 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:2311 +#: erpnext/stock/stock_ledger.py:2313 msgid "Reserved Stock for Batch" msgstr "" @@ -42402,7 +42481,7 @@ msgstr "" msgid "Restart Subscription" msgstr "" -#: erpnext/assets/doctype/asset/asset.js:175 +#: erpnext/assets/doctype/asset/asset.js:178 msgid "Restore Asset" msgstr "" @@ -42897,7 +42976,7 @@ msgstr "" #. Label of the root_type (Select) field in DocType 'Account' #. Label of the root_type (Select) field in DocType 'Ledger Merge' #: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/account_tree.js:152 +#: erpnext/accounts/doctype/account/account_tree.js:147 #: erpnext/accounts/doctype/ledger_merge/ledger_merge.json #: erpnext/accounts/report/account_balance/account_balance.js:22 msgid "Root Type" @@ -43138,11 +43217,11 @@ msgid "Row #{0}: Acceptance Criteria Formula is required." msgstr "" #: erpnext/controllers/subcontracting_controller.py:125 -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:535 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:572 msgid "Row #{0}: Accepted Warehouse and Rejected Warehouse cannot be same" msgstr "" -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:528 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:565 msgid "Row #{0}: Accepted Warehouse is mandatory for the accepted Item {1}" msgstr "" @@ -43187,7 +43266,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 +43274,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 +43314,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:1111 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1129 msgid "Row #{0}: Cannot transfer more than Required Qty {1} for Item {2} against Job Card {3}" msgstr "" @@ -43267,7 +43346,7 @@ msgstr "" msgid "Row #{0}: Cost Center {1} does not belong to company {2}" msgstr "" -#: erpnext/accounts/doctype/tax_withholding_entry/tax_withholding_entry.py:211 +#: erpnext/accounts/doctype/tax_withholding_entry/tax_withholding_entry.py:212 msgid "Row #{0}: Could not find enough {1} entries to match. Remaining amount: {2}" msgstr "" @@ -43275,13 +43354,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 +43372,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 +43380,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,20 +43436,20 @@ msgstr "" msgid "Row #{0}: Finished Good must be {1}" msgstr "" -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:516 -msgid "Row #{0}: Finished Good reference is mandatory for Scrap Item {1}." +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:553 +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 "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:688 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:694 msgid "Row #{0}: For {1}, you can select reference document only if account gets credited" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:698 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:704 msgid "Row #{0}: For {1}, you can select reference document only if account gets debited" msgstr "" @@ -43382,7 +43461,7 @@ msgstr "" msgid "Row #{0}: From Date cannot be before To Date" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:863 +#: erpnext/manufacturing/doctype/job_card/job_card.py:881 msgid "Row #{0}: From Time and To Time fields are required" msgstr "" @@ -43390,7 +43469,7 @@ msgstr "" msgid "Row #{0}: Item added" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1541 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1548 msgid "Row #{0}: Item {1} cannot be transferred more than {2} against {3} {4}" msgstr "" @@ -43414,7 +43493,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 +43501,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 +43514,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 "" @@ -43475,8 +43554,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 "" @@ -43488,7 +43567,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 "" @@ -43504,6 +43583,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:346 +#, 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 "" @@ -43537,10 +43621,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:339 +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 "" @@ -43560,8 +43648,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:509 -msgid "Row #{0}: Rejected Qty cannot be set for Scrap Item {1}." +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:546 +msgid "Row #{0}: Rejected Qty cannot be set for Secondary Item {1}." msgstr "" #: erpnext/controllers/subcontracting_controller.py:118 @@ -43576,16 +43664,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:504 -msgid "Row #{0}: Scrap Item Qty cannot be zero" +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:541 +msgid "Row #{0}: Secondary Item Qty cannot be zero" msgstr "" #: erpnext/controllers/selling_controller.py:296 @@ -43612,7 +43700,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 "" @@ -43636,7 +43724,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 "" @@ -43668,7 +43756,7 @@ msgstr "" msgid "Row #{0}: Status is mandatory" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:450 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:456 msgid "Row #{0}: Status must be {1} for Invoice Discounting {2}" msgstr "" @@ -43688,7 +43776,7 @@ msgstr "" msgid "Row #{0}: Stock is already reserved for the Item {1}." msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:554 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:558 msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}." msgstr "" @@ -43705,7 +43793,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 "" @@ -43737,7 +43825,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 "" @@ -43866,7 +43954,7 @@ 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:730 +#: erpnext/manufacturing/doctype/job_card/job_card.py:748 msgid "Row {0} : Operation is required against the raw material item {1}" msgstr "" @@ -43874,7 +43962,7 @@ msgstr "" msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1565 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1572 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}" msgstr "" @@ -43882,7 +43970,7 @@ msgstr "" msgid "Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time." msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:603 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:609 msgid "Row {0}: Account {1} and Party Type {2} have different account types" msgstr "" @@ -43890,11 +43978,11 @@ msgstr "" msgid "Row {0}: Activity Type is mandatory." msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:669 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:675 msgid "Row {0}: Advance against Customer must be credit" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:671 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:677 msgid "Row {0}: Advance against Supplier must be debit" msgstr "" @@ -43906,7 +43994,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:1226 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1233 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials." msgstr "" @@ -43914,11 +44002,11 @@ msgstr "" msgid "Row {0}: Bill of Materials not found for the Item {1}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:922 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:928 msgid "Row {0}: Both Debit and Credit values cannot be zero" msgstr "" -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:551 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:588 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." @@ -43936,15 +44024,15 @@ msgstr "" msgid "Row {0}: Cost center is required for an item {1}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:768 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:774 msgid "Row {0}: Credit entry can not be linked with a {1}" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:539 +#: erpnext/manufacturing/doctype/bom/bom.py:579 msgid "Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:763 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:769 msgid "Row {0}: Debit entry can not be linked with a {1}" msgstr "" @@ -43964,8 +44052,8 @@ msgstr "" msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory." msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1013 -#: erpnext/controllers/taxes_and_totals.py:1334 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1019 +#: erpnext/controllers/taxes_and_totals.py:1335 msgid "Row {0}: Exchange Rate is mandatory" msgstr "" @@ -44001,7 +44089,7 @@ msgstr "" msgid "Row {0}: From Time and To Time is mandatory." msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:307 +#: erpnext/manufacturing/doctype/job_card/job_card.py:325 #: erpnext/projects/doctype/timesheet/timesheet.py:225 msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}" msgstr "" @@ -44010,7 +44098,7 @@ msgstr "" msgid "Row {0}: From Warehouse is mandatory for internal transfers" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:298 +#: erpnext/manufacturing/doctype/job_card/job_card.py:316 msgid "Row {0}: From time must be less than to time" msgstr "" @@ -44018,11 +44106,11 @@ msgstr "" msgid "Row {0}: Hours value must be greater than zero." msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:788 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:794 msgid "Row {0}: Invalid reference {1}" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:128 +#: erpnext/controllers/taxes_and_totals.py:129 msgid "Row {0}: Item Tax template updated as per validity and rate applied" msgstr "" @@ -44046,7 +44134,7 @@ msgstr "" msgid "Row {0}: Item {1}'s quantity cannot be higher than the available quantity." msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:611 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:615 msgid "Row {0}: Packed Qty must be equal to {1} Qty." msgstr "" @@ -44054,11 +44142,11 @@ msgstr "" msgid "Row {0}: Packing Slip is already created for Item {1}." msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:814 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:820 msgid "Row {0}: Party / Account does not match with {1} / {2} in {3} {4}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:592 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:598 msgid "Row {0}: Party Type and Party is required for Receivable / Payable account {1}" msgstr "" @@ -44066,11 +44154,11 @@ msgstr "" msgid "Row {0}: Payment Term is mandatory" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:662 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:668 msgid "Row {0}: Payment against Sales/Purchase Order should always be marked as advance" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:655 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:661 msgid "Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry." msgstr "" @@ -44138,7 +44226,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:1578 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1585 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}" msgstr "" @@ -44150,7 +44238,7 @@ msgstr "" msgid "Row {0}: Task {1} does not belong to Project {2}" msgstr "" -#: erpnext/assets/doctype/asset_repair/asset_repair.js:158 +#: erpnext/assets/doctype/asset_repair/asset_repair.js:178 msgid "Row {0}: The entire expense amount for account {1} in {2} has already been allocated." msgstr "" @@ -44166,7 +44254,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:3368 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3400 msgid "Row {0}: Transferred quantity cannot be greater than the requested quantity." msgstr "" @@ -44174,7 +44262,7 @@ msgstr "" msgid "Row {0}: UOM Conversion Factor is mandatory" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1212 +#: erpnext/manufacturing/doctype/bom/bom.py:1245 #: erpnext/manufacturing/doctype/work_order/work_order.py:415 msgid "Row {0}: Workstation or Workstation Type is mandatory for an operation {1}" msgstr "" @@ -44195,7 +44283,7 @@ msgstr "" msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:828 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:834 msgid "Row {0}: {1} {2} does not match with {3}" msgstr "" @@ -44320,7 +44408,7 @@ msgstr "" msgid "SLA Paused On" msgstr "" -#: erpnext/public/js/utils.js:1233 +#: erpnext/public/js/utils.js:1239 msgid "SLA is on hold since {0}" msgstr "" @@ -44619,7 +44707,7 @@ msgstr "" msgid "Sales Invoice mode is activated in POS. Please create Sales Invoice instead." msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:631 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:635 msgid "Sales Invoice {0} has already been submitted" msgstr "" @@ -44817,7 +44905,7 @@ msgstr "" msgid "Sales Order Trends" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:283 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:284 msgid "Sales Order required for Item {0}" msgstr "" @@ -45090,7 +45178,7 @@ msgstr "" msgid "Sales Representative" msgstr "" -#: erpnext/accounts/report/gross_profit/gross_profit.py:964 +#: erpnext/accounts/report/gross_profit/gross_profit.py:970 #: erpnext/stock/doctype/delivery_note/delivery_note.js:270 msgid "Sales Return" msgstr "" @@ -45272,7 +45360,7 @@ msgstr "" msgid "Sample Size" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3858 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3890 msgid "Sample quantity {0} cannot be more than received quantity {1}" msgstr "" @@ -45367,7 +45455,7 @@ msgstr "" #. Label of the schedule_date (Date) field in DocType 'Depreciation Schedule' #. Label of the schedule_date (Datetime) field in DocType 'Production Plan Sub #. Assembly Item' -#: erpnext/assets/doctype/asset/asset.js:371 +#: erpnext/assets/doctype/asset/asset.js:378 #: erpnext/assets/doctype/depreciation_schedule/depreciation_schedule.json #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json msgid "Schedule Date" @@ -45479,57 +45567,23 @@ 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" -msgstr "" - -#: erpnext/assets/doctype/asset/asset.js:160 -msgid "Scrap Asset" -msgstr "" - -#. Label of the scrap_cost_per_qty (Float) field in DocType 'Subcontracting -#. Receipt Item' +#. 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 Cost Per Qty" +msgid "Scrap" 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)" +#: erpnext/assets/doctype/asset/asset.js:163 +msgid "Scrap Asset" msgstr "" #. Label of the scrap_warehouse (Link) field in DocType 'Work Order' @@ -45586,6 +45640,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" @@ -45635,7 +45733,7 @@ msgstr "" msgid "Select Accounting Dimension." msgstr "" -#: erpnext/public/js/utils.js:529 +#: erpnext/public/js/utils.js:535 msgid "Select Alternate Item" msgstr "" @@ -45689,7 +45787,7 @@ msgstr "" msgid "Select Company Address" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:539 +#: erpnext/manufacturing/doctype/job_card/job_card.js:537 msgid "Select Corrective Operation" msgstr "" @@ -45784,11 +45882,11 @@ msgstr "" msgid "Select Payment Schedule" msgstr "" -#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:414 +#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:410 msgid "Select Possible Supplier" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1016 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1044 #: erpnext/stock/doctype/pick_list/pick_list.js:216 msgid "Select Quantity" msgstr "" @@ -45926,11 +46024,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:1118 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1146 msgid "Select the Item to be manufactured." msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.js:958 +#: erpnext/manufacturing/doctype/bom/bom.js:938 msgid "Select the Item to be manufactured. The Item name, UoM, Company, and Currency will be fetched automatically." msgstr "" @@ -45943,7 +46041,7 @@ msgstr "" msgid "Select the customer or supplier." msgstr "" -#: erpnext/assets/doctype/asset/asset.js:922 +#: erpnext/assets/doctype/asset/asset.js:929 msgid "Select the date" msgstr "" @@ -45951,7 +46049,7 @@ msgstr "" msgid "Select the date and your timezone" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.js:977 +#: erpnext/manufacturing/doctype/bom/bom.js:957 msgid "Select the raw materials (Items) required to manufacture the Item" msgstr "" @@ -46010,22 +46108,22 @@ msgstr "" msgid "Self delivery" msgstr "" -#: erpnext/assets/doctype/asset/asset.js:633 +#: erpnext/assets/doctype/asset/asset.js:640 #: erpnext/stock/doctype/batch/batch_dashboard.py:9 #: erpnext/stock/doctype/item/item_dashboard.py:20 msgid "Sell" msgstr "" -#: erpnext/assets/doctype/asset/asset.js:168 -#: erpnext/assets/doctype/asset/asset.js:622 +#: erpnext/assets/doctype/asset/asset.js:171 +#: erpnext/assets/doctype/asset/asset.js:629 msgid "Sell Asset" msgstr "" -#: erpnext/assets/doctype/asset/asset.js:627 +#: erpnext/assets/doctype/asset/asset.js:634 msgid "Sell Qty" msgstr "" -#: erpnext/assets/doctype/asset/asset.js:643 +#: erpnext/assets/doctype/asset/asset.js:650 msgid "Sell quantity cannot exceed the asset quantity" msgstr "" @@ -46033,7 +46131,7 @@ msgstr "" msgid "Sell quantity cannot exceed the asset quantity. Asset {0} has only {1} item(s)." msgstr "" -#: erpnext/assets/doctype/asset/asset.js:639 +#: erpnext/assets/doctype/asset/asset.js:646 msgid "Sell quantity must be greater than zero" msgstr "" @@ -46228,7 +46326,7 @@ msgstr "" msgid "Serial / Batch No" msgstr "" -#: erpnext/public/js/utils.js:191 +#: erpnext/public/js/utils.js:197 msgid "Serial / Batch Nos" msgstr "" @@ -46341,7 +46439,7 @@ msgstr "" msgid "Serial No Range" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2594 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2611 msgid "Serial No Reserved" msgstr "" @@ -46427,7 +46525,7 @@ msgstr "" msgid "Serial No {0} does not exist" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:3362 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:3379 msgid "Serial No {0} does not exists" msgstr "" @@ -46481,11 +46579,11 @@ msgstr "" msgid "Serial Nos and Batches" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1866 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1883 msgid "Serial Nos are created successfully" msgstr "" -#: erpnext/stock/stock_ledger.py:2272 +#: erpnext/stock/stock_ledger.py:2274 msgid "Serial Nos are reserved in Stock Reservation Entries, you need to unreserve them before proceeding." msgstr "" @@ -46562,11 +46660,11 @@ msgstr "" msgid "Serial and Batch Bundle" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2102 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2119 msgid "Serial and Batch Bundle created" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2174 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2191 msgid "Serial and Batch Bundle updated" msgstr "" @@ -46981,8 +47079,8 @@ msgstr "" msgid "Set Delivery Warehouse" 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 msgid "Set Finished Good Quantity" msgstr "" @@ -47027,10 +47125,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 @@ -47048,7 +47146,7 @@ msgstr "" msgid "Set Posting Date" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.js:1004 +#: erpnext/manufacturing/doctype/bom/bom.js:984 msgid "Set Process Loss Item Quantity" msgstr "" @@ -47171,7 +47269,7 @@ msgstr "" msgid "Set fieldname from which you want to fetch the data from the parent form." msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.js:994 +#: erpnext/manufacturing/doctype/bom/bom.js:974 msgid "Set quantity of process loss item:" msgstr "" @@ -47187,7 +47285,7 @@ msgstr "" msgid "Set targets Item Group-wise for this Sales Person." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1175 +#: 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 "" @@ -47276,7 +47374,7 @@ msgstr "" msgid "Setting up company" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1191 +#: erpnext/manufacturing/doctype/bom/bom.py:1224 #: erpnext/manufacturing/doctype/work_order/work_order.py:1475 msgid "Setting {0} is required" msgstr "" @@ -47417,7 +47515,7 @@ msgid "Shelf Life in Days" msgstr "" #. Label of the shift (Link) field in DocType 'Depreciation Schedule' -#: erpnext/assets/doctype/asset/asset.js:384 +#: erpnext/assets/doctype/asset/asset.js:391 #: erpnext/assets/doctype/depreciation_schedule/depreciation_schedule.json msgid "Shift" msgstr "" @@ -47489,7 +47587,7 @@ msgstr "" msgid "Shipment details" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:802 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:806 msgid "Shipments" msgstr "" @@ -47676,6 +47774,7 @@ msgstr "" msgid "Shortage Qty" msgstr "" +#: erpnext/buying/report/purchase_analytics/purchase_analytics.js:70 #: erpnext/selling/report/sales_analytics/sales_analytics.js:103 msgid "Show Aggregate Value from Subsidiary Companies" msgstr "" @@ -47997,7 +48096,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:318 +#: erpnext/manufacturing/doctype/bom/bom.py:323 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 "" @@ -48273,15 +48372,15 @@ msgstr "" msgid "Spending for Account {0} ({1}) between {2} and {3} has already exceeded the new allocated budget. Spent: {4}, Budget: {5}" msgstr "" -#: erpnext/assets/doctype/asset/asset.js:683 +#: erpnext/assets/doctype/asset/asset.js:690 #: erpnext/stock/doctype/batch/batch.js:91 #: erpnext/stock/doctype/batch/batch.js:183 #: erpnext/support/doctype/issue/issue.js:114 msgid "Split" msgstr "" -#: erpnext/assets/doctype/asset/asset.js:144 -#: erpnext/assets/doctype/asset/asset.js:667 +#: erpnext/assets/doctype/asset/asset.js:147 +#: erpnext/assets/doctype/asset/asset.js:674 msgid "Split Asset" msgstr "" @@ -48304,7 +48403,7 @@ msgstr "" msgid "Split Issue" msgstr "" -#: erpnext/assets/doctype/asset/asset.js:673 +#: erpnext/assets/doctype/asset/asset.js:680 msgid "Split Qty" msgstr "" @@ -48574,8 +48673,8 @@ msgstr "" #: erpnext/accounts/doctype/account/account.json #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:96 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:158 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1358 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1384 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1359 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1385 #: erpnext/accounts/report/account_balance/account_balance.js:58 msgid "Stock Adjustment" msgstr "" @@ -48749,11 +48848,11 @@ msgstr "" msgid "Stock Entry {0} created" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1497 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1528 msgid "Stock Entry {0} has created" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1307 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1313 msgid "Stock Entry {0} is not submitted" msgstr "" @@ -48905,6 +49004,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:252 @@ -48912,6 +49012,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 @@ -48982,14 +49083,14 @@ 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:893 -#: erpnext/manufacturing/doctype/work_order/work_order.js:902 -#: erpnext/manufacturing/doctype/work_order/work_order.js:909 +#: 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:94 -#: erpnext/selling/doctype/sales_order/sales_order.js:109 -#: erpnext/selling/doctype/sales_order/sales_order.js:122 +#: erpnext/selling/doctype/sales_order/sales_order.js:101 +#: erpnext/selling/doctype/sales_order/sales_order.js:116 +#: erpnext/selling/doctype/sales_order/sales_order.js:129 #: erpnext/selling/doctype/sales_order/sales_order.js:250 #: erpnext/stock/doctype/pick_list/pick_list.js:152 #: erpnext/stock/doctype/pick_list/pick_list.js:167 @@ -49020,8 +49121,8 @@ msgstr "" msgid "Stock Reservation Entries Cancelled" msgstr "" -#: erpnext/controllers/subcontracting_inward_controller.py:1003 -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2248 +#: erpnext/controllers/subcontracting_inward_controller.py:1021 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2250 #: erpnext/manufacturing/doctype/work_order/work_order.py:2126 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1777 msgid "Stock Reservation Entries Created" @@ -49050,7 +49151,7 @@ msgstr "" msgid "Stock Reservation Entry created against a Pick List cannot be updated. If you need to make changes, we recommend canceling the existing entry and creating a new one." msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:564 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:568 msgid "Stock Reservation Warehouse Mismatch" msgstr "" @@ -49134,9 +49235,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' @@ -49160,7 +49261,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' @@ -49181,9 +49282,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 @@ -49207,7 +49308,7 @@ msgstr "" #: erpnext/stock/report/stock_ledger/stock_ledger.py:278 #: 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 @@ -49236,6 +49337,10 @@ msgstr "" msgid "Stock Uom" msgstr "" +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:740 +msgid "Stock Update Not Allowed" +msgstr "" + #. Name of a role #: erpnext/accounts/doctype/fiscal_year/fiscal_year.json #: erpnext/assets/doctype/location/location.json @@ -49329,10 +49434,6 @@ msgstr "" msgid "Stock cannot be reserved in the group warehouse {0}." msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:737 -msgid "Stock cannot be updated against Purchase Receipt {0}" -msgstr "" - #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1229 msgid "Stock cannot be updated against the following Delivery Notes: {0}" msgstr "" @@ -49341,6 +49442,10 @@ msgstr "" msgid "Stock cannot be updated because the invoice contains a drop shipping item. Please disable 'Update Stock' or remove the drop shipping item." msgstr "" +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:737 +msgid "Stock cannot be updated for Purchase Invoice {0} because a Purchase Receipt {1} has already been created for this transaction. Please disable the 'Update Stock' checkbox in the Purchase Invoice and save the invoice." +msgstr "" + #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1131 msgid "Stock has been unreserved for work order {0}." msgstr "" @@ -49449,7 +49554,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:355 +#: erpnext/manufacturing/doctype/job_card/job_card.js:353 #: erpnext/manufacturing/doctype/job_card_time_log/job_card_time_log.json #: erpnext/manufacturing/doctype/sub_operation/sub_operation.json msgid "Sub Operation" @@ -49661,8 +49766,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 @@ -49815,7 +49920,7 @@ msgid "Subdivision" msgstr "" #: erpnext/buying/doctype/purchase_order/purchase_order.py:927 -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1054 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1091 msgid "Submit Action Failed" msgstr "" @@ -50148,8 +50253,8 @@ msgstr "" #: erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:37 #: erpnext/assets/doctype/asset/asset.json #: erpnext/buying/doctype/purchase_order/purchase_order.json -#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:188 -#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:273 +#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:184 +#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:269 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json #: erpnext/buying/doctype/request_for_quotation_supplier/request_for_quotation_supplier.json #: erpnext/buying/doctype/supplier/supplier.json @@ -50176,7 +50281,7 @@ msgstr "" #: erpnext/regional/report/irs_1099/irs_1099.py:77 #: erpnext/selling/doctype/customer/customer.js:255 #: erpnext/selling/doctype/party_specific_item/party_specific_item.json -#: erpnext/selling/doctype/sales_order/sales_order.js:182 +#: erpnext/selling/doctype/sales_order/sales_order.js:189 #: erpnext/selling/doctype/sales_order/sales_order.js:1660 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/doctype/sms_center/sms_center.json @@ -50282,7 +50387,7 @@ msgstr "" #: erpnext/accounts/report/purchase_register/purchase_register.py:186 #: erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:55 #: erpnext/buying/doctype/purchase_order/purchase_order.json -#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:506 +#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:502 #: erpnext/buying/doctype/supplier/supplier.json #: erpnext/buying/report/item_wise_purchase_history/item_wise_purchase_history.py:105 #: erpnext/buying/workspace/buying/buying.json @@ -50336,7 +50441,7 @@ msgstr "" msgid "Supplier Invoice No" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1774 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1775 msgid "Supplier Invoice No exists in Purchase Invoice {0}" msgstr "" @@ -50766,7 +50871,7 @@ msgstr "" msgid "TDS Computation Summary" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1535 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1536 msgid "TDS Deducted" msgstr "" @@ -50925,7 +51030,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 "" @@ -51203,7 +51308,7 @@ msgstr "" #. Label of the rate (Float) field in DocType 'Sales Taxes and Charges' #. Label of the tax_rate (Percent) field in DocType 'Tax Withholding Entry' #: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/account_tree.js:175 +#: erpnext/accounts/doctype/account/account_tree.js:170 #: erpnext/accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.json #: erpnext/accounts/doctype/item_tax_template_detail/item_tax_template_detail.json #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json @@ -51414,7 +51519,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:1211 +#: erpnext/controllers/taxes_and_totals.py:1212 msgid "Taxable Amount" msgstr "" @@ -51989,7 +52094,7 @@ msgstr "" msgid "The Loyalty Program isn't valid for the selected company" msgstr "" -#: erpnext/accounts/doctype/payment_request/payment_request.py:1106 +#: erpnext/accounts/doctype/payment_request/payment_request.py:1107 msgid "The Payment Request {0} is already paid, cannot process payment twice" msgstr "" @@ -52001,7 +52106,7 @@ msgstr "" 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:2615 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2627 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty" msgstr "" @@ -52013,11 +52118,11 @@ msgstr "" 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:2591 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2608 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:1748 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1753 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 "" @@ -52031,7 +52136,7 @@ msgstr "" msgid "The account head under Liability or Equity, in which Profit/Loss will be booked" msgstr "" -#: erpnext/accounts/doctype/payment_request/payment_request.py:1001 +#: erpnext/accounts/doctype/payment_request/payment_request.py:1002 msgid "The allocated amount is greater than the outstanding amount of Payment Request {0}" msgstr "" @@ -52043,7 +52148,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:1303 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1321 msgid "The completed quantity {0} of an operation {1} cannot be greater than the completed quantity {2} of a previous operation {3}." msgstr "" @@ -52055,7 +52160,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:1123 +#: 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 "" @@ -52080,7 +52185,7 @@ msgstr "" msgid "The field To Shareholder cannot be blank" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:414 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:418 msgid "The field {0} in row {1} is not set" msgstr "" @@ -52241,7 +52346,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:941 +#: erpnext/public/js/utils.js:947 msgid "The reserved stock will be released when you update items. Are you certain you wish to proceed?" msgstr "" @@ -52265,7 +52370,7 @@ msgstr "" msgid "The selected item cannot have Batch" msgstr "" -#: erpnext/assets/doctype/asset/asset.js:648 +#: erpnext/assets/doctype/asset/asset.js:655 msgid "The sell quantity is less than the total asset quantity. The remaining quantity will be split into a new asset. This action cannot be undone.

Do you want to continue?" msgstr "" @@ -52294,7 +52399,7 @@ msgstr "" msgid "The shares don't exist with the {0}" msgstr "" -#: erpnext/stock/stock_ledger.py:801 +#: erpnext/stock/stock_ledger.py:803 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 "" @@ -52360,19 +52465,19 @@ msgstr "" msgid "The value {0} is already assigned to an existing Item {1}." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1151 +#: 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:1144 +#: 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:1156 +#: 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:876 +#: erpnext/manufacturing/doctype/job_card/job_card.py:894 msgid "The {0} ({1}) must be equal to {2} ({3})" msgstr "" @@ -52392,7 +52497,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:979 +#: erpnext/manufacturing/doctype/job_card/job_card.py:997 msgid "The {0} {1} is used to calculate the valuation cost for the finished good {2}." msgstr "" @@ -52456,7 +52561,7 @@ msgstr "" msgid "There is no batch found against the {0}: {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1685 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1690 msgid "There must be atleast 1 Finished Good in this Stock Entry" msgstr "" @@ -52570,7 +52675,7 @@ msgstr "" msgid "This is a location where scraped materials are stored." msgstr "" -#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:322 +#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:318 msgid "This is a preview of the email to be sent. A PDF of the document will automatically be attached with the email." msgstr "" @@ -52622,7 +52727,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:1137 +#: 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 "" @@ -52839,7 +52944,7 @@ msgstr "" msgid "Time in mins." msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:855 +#: erpnext/manufacturing/doctype/job_card/job_card.py:873 msgid "Time logs are required for {0} {1}" msgstr "" @@ -53167,7 +53272,7 @@ msgstr "" msgid "To Warehouse (Optional)" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.js:972 +#: erpnext/manufacturing/doctype/bom/bom.js:952 msgid "To add Operations tick the 'With Operations' checkbox." msgstr "" @@ -53219,10 +53324,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:2249 @@ -53511,12 +53616,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:872 +#: erpnext/manufacturing/doctype/job_card/job_card.py:890 #: erpnext/manufacturing/report/job_card_summary/job_card_summary.py:174 msgid "Total Completed Qty" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:189 +#: erpnext/manufacturing/doctype/job_card/job_card.py:191 msgid "Total Completed Qty is required for Job Card {0}, please start and complete the job card before submission" msgstr "" @@ -53563,7 +53668,7 @@ msgstr "" msgid "Total Credit" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:337 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:343 msgid "Total Credit/ Debit Amount should be same as linked Journal Entry" msgstr "" @@ -53572,7 +53677,7 @@ msgstr "" msgid "Total Debit" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:928 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:934 msgid "Total Debit must be equal to Total Credit. The difference is {0}" msgstr "" @@ -54006,7 +54111,7 @@ msgstr "" msgid "Total Time in Mins" msgstr "" -#: erpnext/public/js/utils.js:167 +#: erpnext/public/js/utils.js:173 msgid "Total Unpaid: {0}" msgstr "" @@ -54206,7 +54311,7 @@ msgstr "" #. Label of the transaction_tab (Tab Break) field in DocType 'Selling Settings' #. Label of the transaction (Select) field in DocType 'Authorization Rule' #. Option for the 'Based On' (Select) field in DocType 'Repost Item Valuation' -#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:471 +#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:472 #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json #: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10 @@ -54356,7 +54461,7 @@ msgstr "" msgid "Transaction from which tax is withheld" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:848 +#: erpnext/manufacturing/doctype/job_card/job_card.py:866 msgid "Transaction not allowed against stopped Work Order {0}" msgstr "" @@ -54366,7 +54471,7 @@ msgstr "" #. Group in Bank Account's connections #: erpnext/accounts/doctype/bank_account/bank_account.json -#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:471 +#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:472 #: erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template_dashboard.py:12 #: erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template_dashboard.py:13 #: erpnext/manufacturing/doctype/job_card/job_card_dashboard.py:9 @@ -54404,7 +54509,7 @@ msgstr "" msgid "Transfer" msgstr "" -#: erpnext/assets/doctype/asset/asset.js:152 +#: erpnext/assets/doctype/asset/asset.js:155 msgid "Transfer Asset" msgstr "" @@ -54712,6 +54817,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' @@ -54760,6 +54866,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 @@ -54769,7 +54876,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:814 +#: erpnext/public/js/stock_analytics.js:94 erpnext/public/js/utils.js:820 #: 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 @@ -54865,7 +54972,7 @@ msgstr "" msgid "UOM Name" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3780 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3812 msgid "UOM conversion factor required for UOM: {0} in Item: {1}" msgstr "" @@ -55179,8 +55286,8 @@ msgstr "" msgid "Unreconciled Entries" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:900 -#: erpnext/selling/doctype/sales_order/sales_order.js:107 +#: 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 msgid "Unreserve" @@ -55312,7 +55419,7 @@ msgstr "" msgid "Update BOM cost automatically via scheduler, based on the latest Valuation Rate/Price List Rate/Last Purchase Rate of raw materials" msgstr "" -#: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.js:31 +#: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.js:32 msgid "Update Batch Qty" msgstr "" @@ -55387,9 +55494,9 @@ msgstr "" #: erpnext/buying/doctype/purchase_order/purchase_order.js:324 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:43 -#: erpnext/public/js/utils.js:920 +#: erpnext/public/js/utils.js:926 #: erpnext/selling/doctype/quotation/quotation.js:135 -#: erpnext/selling/doctype/sales_order/sales_order.js:75 +#: erpnext/selling/doctype/sales_order/sales_order.js:82 #: erpnext/selling/doctype/sales_order/sales_order.js:940 msgid "Update Items" msgstr "" @@ -55489,7 +55596,7 @@ msgstr "" msgid "Updating Variants..." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1099 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1127 msgid "Updating Work Order status" msgstr "" @@ -55732,7 +55839,7 @@ msgstr "" msgid "User has not applied rule on the invoice {0}" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:190 +#: erpnext/setup/doctype/employee/employee.py:187 msgid "User {0} does not exist" msgstr "" @@ -55740,15 +55847,15 @@ msgstr "" msgid "User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User." msgstr "" -#: erpnext/setup/doctype/employee/employee.py:207 +#: erpnext/setup/doctype/employee/employee.py:205 msgid "User {0} is already assigned to Employee {1}" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:245 +#: erpnext/setup/doctype/employee/employee.py:243 msgid "User {0}: Removed Employee Self Service role as there is no mapped employee." msgstr "" -#: erpnext/setup/doctype/employee/employee.py:240 +#: erpnext/setup/doctype/employee/employee.py:238 msgid "User {0}: Removed Employee role as there is no mapped employee." msgstr "" @@ -56041,11 +56148,11 @@ msgstr "" msgid "Valuation Rate (In / Out)" msgstr "" -#: erpnext/stock/stock_ledger.py:2016 +#: erpnext/stock/stock_ledger.py:2018 msgid "Valuation Rate Missing" msgstr "" -#: erpnext/stock/stock_ledger.py:1994 +#: erpnext/stock/stock_ledger.py:1996 msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}." msgstr "" @@ -56133,8 +56240,8 @@ msgstr "" msgid "Value Type" msgstr "" -#: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:599 -#: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:629 +#: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:840 +#: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:870 msgid "Value as on" msgstr "" @@ -56147,19 +56254,19 @@ msgstr "" msgid "Value of Goods" msgstr "" -#: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:623 +#: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:864 msgid "Value of New Capitalized Asset" msgstr "" -#: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:605 +#: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:846 msgid "Value of New Purchase" msgstr "" -#: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:617 +#: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:858 msgid "Value of Scrapped Asset" msgstr "" -#: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:611 +#: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:852 msgid "Value of Sold Asset" msgstr "" @@ -56394,7 +56501,7 @@ msgstr "" msgid "View Leads" msgstr "" -#: erpnext/accounts/doctype/account/account_tree.js:279 +#: erpnext/accounts/doctype/account/account_tree.js:274 #: erpnext/stock/doctype/batch/batch.js:18 msgid "View Ledger" msgstr "" @@ -56856,7 +56963,7 @@ msgid "Warehouse not found against the account {0}" msgstr "" #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1219 -#: erpnext/stock/doctype/delivery_note/delivery_note.py:441 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:445 msgid "Warehouse required for stock Item {0}" msgstr "" @@ -56990,7 +57097,7 @@ msgstr "" msgid "Warning - Row {0}: Billing Hours are more than Actual Hours" msgstr "" -#: erpnext/stock/stock_ledger.py:811 +#: erpnext/stock/stock_ledger.py:813 msgid "Warning on Negative Stock" msgstr "" @@ -56998,7 +57105,7 @@ msgstr "" msgid "Warning!" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1313 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1319 msgid "Warning: Another {0} # {1} exists against stock entry {2}" msgstr "" @@ -57165,13 +57272,6 @@ msgstr "" msgid "Weekly Time to send" msgstr "" -#. Label of the task_weight (Float) field in DocType 'Task' -#. Label of the weight (Float) field in DocType 'Task Type' -#: erpnext/projects/doctype/task/task.json -#: erpnext/projects/doctype/task_type/task_type.json -msgid "Weight" -msgstr "" - #. Label of the weight (Float) field in DocType 'Shipment Parcel' #. Label of the weight (Float) field in DocType 'Shipment Parcel Template' #: erpnext/stock/doctype/shipment_parcel/shipment_parcel.json @@ -57518,8 +57618,8 @@ msgstr "" msgid "Work Order cannot be raised against a Item Template" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2460 -#: erpnext/manufacturing/doctype/work_order/work_order.py:2540 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2461 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2541 msgid "Work Order has been {0}" msgstr "" @@ -57864,7 +57964,7 @@ msgstr "" msgid "You are not allowed to update as per the conditions set in {} Workflow." msgstr "" -#: erpnext/accounts/general_ledger.py:809 +#: erpnext/accounts/general_ledger.py:811 msgid "You are not authorized to add or update entries before {0}" msgstr "" @@ -57900,7 +58000,7 @@ msgstr "" msgid "You can either configure default depreciation accounts in the Company or set the required accounts in the following rows:

" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:704 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:710 msgid "You can not enter current voucher in 'Against Journal Entry' column" msgstr "" @@ -57929,7 +58029,7 @@ msgstr "" msgid "You can use {0} to reconcile against {1} later." msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1315 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1333 msgid "You can't make any changes to Job Card since Work Order is closed." msgstr "" @@ -57941,7 +58041,7 @@ msgstr "" msgid "You can't redeem Loyalty Points having more value than the Total Amount." msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.js:728 +#: erpnext/manufacturing/doctype/bom/bom.js:733 msgid "You cannot change the rate if BOM is mentioned against any Item." msgstr "" @@ -57953,11 +58053,11 @@ msgstr "" msgid "You cannot create or cancel any accounting entries with in the closed Accounting Period {0}" msgstr "" -#: erpnext/accounts/general_ledger.py:829 +#: erpnext/accounts/general_ledger.py:831 msgid "You cannot create/amend any accounting entries till this date." msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:937 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:943 msgid "You cannot credit and debit same account at the same time" msgstr "" @@ -58001,6 +58101,10 @@ 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:565 +msgid "You do not have permission to edit this document" +msgstr "" + #: erpnext/controllers/accounts_controller.py:3851 msgid "You do not have permissions to {} items in a {}." msgstr "" @@ -58017,7 +58121,7 @@ msgstr "" msgid "You had {} errors while creating opening invoices. Check {} for more details" msgstr "" -#: erpnext/public/js/utils.js:1020 +#: erpnext/public/js/utils.js:1026 msgid "You have already selected items from {0} {1}" msgstr "" @@ -58121,7 +58225,7 @@ msgstr "" msgid "`Allow Negative rates for Items`" msgstr "" -#: erpnext/stock/stock_ledger.py:2008 +#: erpnext/stock/stock_ledger.py:2010 msgid "after" msgstr "" @@ -58137,7 +58241,7 @@ msgstr "" msgid "as Title" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.js:996 +#: erpnext/manufacturing/doctype/bom/bom.js:976 msgid "as a percentage of finished item quantity" msgstr "" @@ -58290,7 +58394,7 @@ msgstr "" msgid "paid to" msgstr "" -#: erpnext/public/js/utils.js:437 +#: erpnext/public/js/utils.js:443 msgid "payments app is not installed. Please install it from {0} or {1}" msgstr "" @@ -58311,7 +58415,7 @@ msgstr "" msgid "per hour" msgstr "" -#: erpnext/stock/stock_ledger.py:2009 +#: erpnext/stock/stock_ledger.py:2011 msgid "performing either one below:" msgstr "" @@ -58469,15 +58573,15 @@ msgstr "" msgid "{0} Digest" msgstr "" -#: erpnext/accounts/utils.py:1509 +#: erpnext/accounts/utils.py:1581 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:528 +#: erpnext/manufacturing/doctype/work_order/work_order.js:556 msgid "{0} Operations: {1}" msgstr "" @@ -58489,7 +58593,7 @@ msgstr "" msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item" msgstr "" -#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:465 +#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:466 msgid "{0} Transaction(s) Reconciled" msgstr "" @@ -58505,19 +58609,19 @@ msgstr "" msgid "{0} account not found while submitting purchase receipt" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1057 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1063 msgid "{0} against Bill {1} dated {2}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1066 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1072 msgid "{0} against Purchase Order {1}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1033 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1039 msgid "{0} against Sales Invoice {1}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1040 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1046 msgid "{0} against Sales Order {1}" msgstr "" @@ -58646,7 +58750,7 @@ msgid "{0} is mandatory for Item {1}" msgstr "" #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:100 -#: erpnext/accounts/general_ledger.py:853 +#: erpnext/accounts/general_ledger.py:855 msgid "{0} is mandatory for account {1}" msgstr "" @@ -58658,6 +58762,10 @@ 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:1738 +msgid "{0} is not a CSV file." +msgstr "" + #: erpnext/selling/doctype/customer/customer.py:235 msgid "{0} is not a company bank account" msgstr "" @@ -58694,7 +58802,7 @@ msgstr "" msgid "{0} is not the default supplier for any items." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2959 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2954 msgid "{0} is on hold till {1}" msgstr "" @@ -58702,18 +58810,30 @@ 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:483 +#: erpnext/manufacturing/doctype/work_order/work_order.js:521 +msgid "{0} items disassembled" +msgstr "" + +#: erpnext/manufacturing/doctype/work_order/work_order.js:485 msgid "{0} items in progress" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:494 +#: erpnext/manufacturing/doctype/work_order/work_order.js:509 msgid "{0} items lost during process." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:464 +#: erpnext/manufacturing/doctype/work_order/work_order.js:466 msgid "{0} items produced" msgstr "" +#: erpnext/manufacturing/doctype/work_order/work_order.js:489 +msgid "{0} items returned" +msgstr "" + +#: erpnext/manufacturing/doctype/work_order/work_order.js:492 +msgid "{0} items to return" +msgstr "" + #: erpnext/controllers/sales_and_purchase_return.py:218 msgid "{0} must be negative in return document" msgstr "" @@ -58722,7 +58842,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:574 +#: erpnext/manufacturing/doctype/bom/bom.py:612 msgid "{0} not found for item {1}" msgstr "" @@ -58754,16 +58874,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:1681 erpnext/stock/stock_ledger.py:2158 -#: erpnext/stock/stock_ledger.py:2172 +#: erpnext/stock/stock_ledger.py:1683 erpnext/stock/stock_ledger.py:2160 +#: erpnext/stock/stock_ledger.py:2174 msgid "{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction." msgstr "" -#: erpnext/stock/stock_ledger.py:2259 erpnext/stock/stock_ledger.py:2304 +#: erpnext/stock/stock_ledger.py:2261 erpnext/stock/stock_ledger.py:2306 msgid "{0} units of {1} needed in {2} on {3} {4} to complete this transaction." msgstr "" -#: erpnext/stock/stock_ledger.py:1675 +#: erpnext/stock/stock_ledger.py:1677 msgid "{0} units of {1} needed in {2} to complete this transaction." msgstr "" @@ -58791,7 +58911,7 @@ msgstr "" msgid "{0} will be set as the {1} in subsequently scanned items" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:988 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1006 msgid "{0} {1}" msgstr "" @@ -58799,7 +58919,7 @@ msgstr "" msgid "{0} {1} Manually" msgstr "" -#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:469 +#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:470 msgid "{0} {1} Partially Reconciled" msgstr "" @@ -58813,7 +58933,7 @@ msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.py:613 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:666 -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2697 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2692 msgid "{0} {1} does not exist" msgstr "" @@ -58864,7 +58984,7 @@ msgstr "" msgid "{0} {1} is cancelled so the action cannot be completed" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:852 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:858 msgid "{0} {1} is closed" msgstr "" @@ -58876,7 +58996,7 @@ msgstr "" msgid "{0} {1} is frozen" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:849 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:855 msgid "{0} {1} is fully billed" msgstr "" @@ -58892,8 +59012,8 @@ msgstr "" msgid "{0} {1} is not in any active Fiscal Year" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:846 -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:885 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:852 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:891 msgid "{0} {1} is not submitted" msgstr "" @@ -58989,8 +59109,8 @@ msgstr "" msgid "{0}'s {1} cannot be after {2}'s Expected End Date." msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1287 -#: erpnext/manufacturing/doctype/job_card/job_card.py:1295 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1305 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1313 msgid "{0}, complete the operation {1} before the operation {2}." msgstr ""